Commit Graph

6900 Commits

Author SHA1 Message Date
Rolzad73 fb91726c35 Merge pull request #915 from WagicProject/test_suite_function_fix
- fixed small compiling error for a function in testsuite
2017-01-31 13:10:19 -05:00
Anthony Calosa a97a7edca6 minor refactor 2017-01-31 22:01:19 +08:00
Anthony Calosa 92b4909fc8 add some cards 2017-01-31 21:19:34 +08:00
Anthony Calosa 3998c21178 fix persist on copied card 2017-01-31 20:11:59 +08:00
Anthony Calosa 41d925d7c9 add support for activated copier
thespian stage etc...
2017-01-31 20:11:09 +08:00
Anthony Calosa 7029636291 some corrections 2017-01-31 04:16:47 +08:00
Rolzad73 a916c1067f - fixed small compiling error for a function in testsuite
- indentation formatting on DebugRoutines
2017-01-30 14:02:25 -05:00
Anthony Calosa 7322d4da8b fix castcard opponent spell
the casted non-permanent card from opponent will now move to its owner
graveyard...
2017-01-30 07:09:21 +08:00
Anthony Calosa 31f15b12cb Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-01-29 20:16:09 +08:00
Anthony Calosa 4d3e463aba Merge pull request #913 from kevlahnota/master
Revised AACopier and Fix Legend Rule
2017-01-29 17:17:04 +08:00
Anthony Calosa 166526dbbe Fix Legend Rule
Should fix the the move to graveyard effect with targetchooser
ability...
2017-01-29 16:30:13 +08:00
Anthony Calosa 348ada3f0d revised aacopier
I think we still need to change legend to a trigger once it detects
multiple legends in play then trigger it at once with targetchooser to
select which cards to sacrifice as state based... vector of  unique
names or id or mtgcardinstance?
2017-01-29 16:09:49 +08:00
Anthony Calosa 2c5f6d8332 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-01-29 10:29:10 +08:00
Anthony Calosa e128d548f4 disable andAbility for aacopier
so it will not conflict with original legend rule...
2017-01-29 10:27:18 +08:00
Rolzad73 bb2ab1c1fe Merge pull request #911 from Rolzad73/x11_fixes
X11 build fixes
2017-01-28 13:17:50 -05:00
Rolzad73 715bedb71a - Travis PSP build broke, attempt to fix 2017-01-28 05:05:35 -05:00
Rolzad73 8fed9e47d1 - Travis PSP build broke, attempt to fix 2017-01-28 04:50:07 -05:00
Rolzad73 89f8f7e25e Merge pull request #910 from WagicProject/travis_edit
Test travis QT build artifact zipped for upload
2017-01-28 04:43:06 -05:00
Rolzad73 7bbba293a6 - reverted Travis test 2017-01-28 04:42:42 -05:00
Rolzad73 d57a694d3c - last commit small clean 2017-01-28 04:32:39 -05:00
Rolzad73 f31d5c04c8 - revert android gamepad log change for mergable x11 fixes 2017-01-28 04:29:47 -05:00
Rolzad73 85f66a8fec X11 build fixups
- fixed -Werror=misleading-indentation warning
- fixed -Werror=nonnull-compare warning on xll and QT builds
- PNG_LIBPNG_VER backward compatibily changes
- giflib backward compatibily changes
- resolved some undefs for X11 build
- silenced some small compile warnings in JGE Makefile
- added -DTIXML_USE_STL to remaining build types (PSP had it added)
- fixed x11 Boost incompatibility issue part of #548
- reworked PrecompiledHeader.h platforms used
2017-01-28 04:19:46 -05:00
Rolzad73 48ec606bc5 - attempt to break build upload sequence 2017-01-28 04:09:03 -05:00
Rolzad73 75cc809b16 - travis QT build artifact zipped for upload 2017-01-28 02:16:03 -05:00
Anthony Calosa 2a27a491e7 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-01-28 13:23:44 +08:00
Anthony Calosa 3e75d70632 revert this
I introduce more bugs than helped. I think there's alternative method
for this,,,
2017-01-28 13:23:30 +08:00
Anthony Calosa cf2d094df6 Merge pull request #905 from kevlahnota/master
Added KLD primitives
2017-01-28 12:41:10 +08:00
Rolzad73 18a7955240 Merge pull request #907 from WagicProject/travis_edit
attempt to add release upload from Travis CI for QT Linux variant
2017-01-27 23:36:51 -05:00
Rolzad73 22ebc27997 - attempt to add release upload from Travis CI for QT Linux variant 2017-01-27 22:57:21 -05:00
Anthony Calosa c53ee24b5b Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-01-28 07:38:50 +08:00
Anthony Calosa 25e681c04a test fix ensnaring bridge 2017-01-28 07:38:45 +08:00
Anthony Calosa 365e0b49ae cleanup 2017-01-28 07:38:27 +08:00
Rolzad73 e3dc78b28e - created proper branch on separate fork for dev work 2017-01-27 11:58:59 -05:00
Rolzad73 e3319f6fe4 Merge pull request #2 from WagicProject/master
Pulling changes from original project to forked version
2017-01-27 11:34:01 -05:00
Rolzad73 0a9b006a94 Merge pull request #906 from Rolzad73/master
Merge pull request #1 from WagicProject/master
2017-01-27 11:28:28 -05:00
Anthony Calosa 5692be3b66 remove 2 duplicate
Stone Quarry & Woodland Stream
2017-01-27 23:25:48 +08:00
Anthony Calosa 6ea5dea849 Added KLD primitives 2017-01-27 23:19:01 +08:00
Anthony Calosa 8debcf0fa2 KLD missing cards 2017-01-27 23:18:28 +08:00
Anthony Calosa 1cf4845cb2 added KLD set 2017-01-27 23:17:15 +08:00
Anthony Calosa b9d1292add Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-01-27 22:15:27 +08:00
Anthony Calosa 19063fd8db some refactor
change some card from using "all" to "lord"
2017-01-27 22:15:03 +08:00
Rolzad73 76cf732100 Merge pull request #904 from WagicProject/build_clean
Simple build.xml cleanup
2017-01-26 23:17:13 -05:00
Anthony Calosa 30a7eef611 some corrections 2017-01-27 11:01:28 +08:00
Rolzad73 99f0020583 fix build.xml wrap error 2017-01-26 20:48:38 -05:00
Rolzad73 f2e0da47ed - minor whitespace and duplicate task (build.meego.changelog) cleanup of mtg ant build file 2017-01-26 20:05:19 -05:00
Anthony Calosa ca66a428d8 C16 missing list 2017-01-27 06:18:36 +08:00
Anthony Calosa f077a4e074 Merge pull request #903 from kevlahnota/master
KLD & AER support
2017-01-27 06:00:58 +08:00
Anthony Calosa e46631a960 Merge branch 'master' of https://github.com/kevlahnota/wagic 2017-01-26 23:18:43 +08:00
Anthony Calosa 2da1957c70 Added C16 primitives 2017-01-26 23:18:37 +08:00
Anthony Calosa ad6c48688d Added C16 set 2017-01-26 23:18:34 +08:00