4d3e463aba
Merge pull request #913 from kevlahnota/master
...
Revised AACopier and Fix Legend Rule
2017-01-29 17:17:04 +08:00
166526dbbe
Fix Legend Rule
...
Should fix the the move to graveyard effect with targetchooser
ability...
2017-01-29 16:30:13 +08:00
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
2c5f6d8332
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
2017-01-29 10:29:10 +08:00
e128d548f4
disable andAbility for aacopier
...
so it will not conflict with original legend rule...
2017-01-29 10:27:18 +08:00
bb2ab1c1fe
Merge pull request #911 from Rolzad73/x11_fixes
...
X11 build fixes
2017-01-28 13:17:50 -05:00
715bedb71a
- Travis PSP build broke, attempt to fix
2017-01-28 05:05:35 -05:00
8fed9e47d1
- Travis PSP build broke, attempt to fix
2017-01-28 04:50:07 -05:00
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
7bbba293a6
- reverted Travis test
2017-01-28 04:42:42 -05:00
d57a694d3c
- last commit small clean
2017-01-28 04:32:39 -05:00
f31d5c04c8
- revert android gamepad log change for mergable x11 fixes
2017-01-28 04:29:47 -05:00
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
48ec606bc5
- attempt to break build upload sequence
2017-01-28 04:09:03 -05:00
75cc809b16
- travis QT build artifact zipped for upload
2017-01-28 02:16:03 -05:00
2a27a491e7
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
2017-01-28 13:23:44 +08:00
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
cf2d094df6
Merge pull request #905 from kevlahnota/master
...
Added KLD primitives
2017-01-28 12:41:10 +08:00
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
22ebc27997
- attempt to add release upload from Travis CI for QT Linux variant
2017-01-27 22:57:21 -05:00
c53ee24b5b
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
2017-01-28 07:38:50 +08:00
25e681c04a
test fix ensnaring bridge
2017-01-28 07:38:45 +08:00
365e0b49ae
cleanup
2017-01-28 07:38:27 +08:00
e3dc78b28e
- created proper branch on separate fork for dev work
2017-01-27 11:58:59 -05:00
e3319f6fe4
Merge pull request #2 from WagicProject/master
...
Pulling changes from original project to forked version
2017-01-27 11:34:01 -05:00
0a9b006a94
Merge pull request #906 from Rolzad73/master
...
Merge pull request #1 from WagicProject/master
2017-01-27 11:28:28 -05:00
5692be3b66
remove 2 duplicate
...
Stone Quarry & Woodland Stream
2017-01-27 23:25:48 +08:00
6ea5dea849
Added KLD primitives
2017-01-27 23:19:01 +08:00
8debcf0fa2
KLD missing cards
2017-01-27 23:18:28 +08:00
1cf4845cb2
added KLD set
2017-01-27 23:17:15 +08:00
b9d1292add
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
2017-01-27 22:15:27 +08:00
19063fd8db
some refactor
...
change some card from using "all" to "lord"
2017-01-27 22:15:03 +08:00
76cf732100
Merge pull request #904 from WagicProject/build_clean
...
Simple build.xml cleanup
2017-01-26 23:17:13 -05:00
30a7eef611
some corrections
2017-01-27 11:01:28 +08:00
99f0020583
fix build.xml wrap error
2017-01-26 20:48:38 -05:00
f2e0da47ed
- minor whitespace and duplicate task (build.meego.changelog) cleanup of mtg ant build file
2017-01-26 20:05:19 -05:00
ca66a428d8
C16 missing list
2017-01-27 06:18:36 +08:00
f077a4e074
Merge pull request #903 from kevlahnota/master
...
KLD & AER support
2017-01-27 06:00:58 +08:00
e46631a960
Merge branch 'master' of https://github.com/kevlahnota/wagic
2017-01-26 23:18:43 +08:00
2da1957c70
Added C16 primitives
2017-01-26 23:18:37 +08:00
ad6c48688d
Added C16 set
2017-01-26 23:18:34 +08:00
71da7fb384
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
2017-01-26 23:11:52 +08:00
0159e0e41e
added some fixes
2017-01-26 22:34:07 +08:00
457a3fdc7a
Merge pull request #902 from WagicProject/travis_java_build_fix
...
Travis java build fix
2017-01-26 21:28:17 +08:00
8507c0138d
crash fix
...
when loading collection and shop
2017-01-26 21:02:12 +08:00
4f7901b946
minor refactor
2017-01-26 21:01:45 +08:00
e239dc039b
fix phaseinfo/fakebar graphics
...
it should look nice now.. :)
2017-01-26 18:33:04 +08:00
1428eeba06
fix copier token image
2017-01-26 15:32:17 +08:00
adcf6fb86d
refactor some equipments
2017-01-26 09:45:18 +08:00
de2d663968
unattach animated equipment
...
another bug found is when the equipment becomes a creature, its ability
is granted to itself...
2017-01-26 02:12:02 +08:00
Anthony Calosa
Rolzad73