c4eac5e62b
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
2017-02-03 15:55:27 +08:00
763bd60e74
Merge pull request #922 from kevlahnota/master
...
Some Fixes
2017-02-03 15:12:17 +08:00
3fa52e7ac5
corrections
2017-02-03 14:26:26 +08:00
9104afdef7
Cleanup
2017-02-03 10:39:45 +08:00
942c95e736
revised copier copied abilities
...
the clone should copy original abilities only
2017-02-03 10:31:10 +08:00
dc696a0f45
fix random segmentation fault
...
should fix the crash -> rain of filth in test suite
2017-02-03 10:30:14 +08:00
d26e9da6c4
add some restrictions
2017-02-03 07:59:13 +08:00
ea09b1f6bc
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
2017-02-03 02:35:24 +08:00
da033eb28e
Merge pull request #919 from WagicProject/key_bind_changes
...
key binding related
2017-02-02 11:18:46 -05:00
b2a0ccba05
- removed leftover trace log
2017-02-02 10:08:58 -05:00
3f146c94e5
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
2017-02-02 13:46:21 +08:00
9d92bdcd75
Merge pull request #918 from kevlahnota/master
...
Refactor PW Rule & some bug fixes
2017-02-02 13:21:57 +08:00
6354d8ccca
revised pw rule
...
also fixed where planeswalker can use its ability after it was
transformed/flipped by activation ex. Garruk Relentless... You can’t
activate a loyalty ability of Garruk Relentless and later that turn
after he transforms activate a loyalty ability of Garruk, the
Veil-Cursed.
2017-02-02 11:58:51 +08:00
1d0237f15d
- added ability to reload default key bindings
...
- reverted keybindings display back to action names instead of PSP key equivalent (see commit commit 168154b52d
2017-02-01 22:53:01 -05:00
c535d033ec
fix Dark Depths
...
there should a window for the triggered sacrifice and legend rule.
2017-02-02 11:08:17 +08:00
fcf900c5e0
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
2017-02-02 11:05:20 +08:00
c265ce8222
Bug Correction
...
PermanentAbility to ListMaintainerAbility in Legend Rule, it seems It's
finally fixed even with a lot of targetchooser and copy effects.
2017-02-02 09:58:38 +08:00
658b90067a
Merge pull request #917 from kevlahnota/master
...
Crew Bonus & Bug Fix
2017-02-02 03:09:11 +08:00
80b6496780
bug fix
2017-02-01 22:37:00 +08:00
711934a249
Crew Corrections
2017-02-01 18:40:09 +08:00
ea5e397595
Crew Ability Cost & Crewbonus
...
Revised cards to use {crew(targetchooser)} (modified taptargetcost) so
it can use crewbonus ability from other creatures.
2017-02-01 17:11:55 +08:00
c8dc416071
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
2017-02-01 17:08:02 +08:00
30026fc307
Merge pull request #916 from kevlahnota/master
...
refactor Legend Rule and other Bug fixes
2017-02-01 10:40:02 +08:00
7b0fdcd721
refactor Legendary Rule
2017-02-01 09:49:36 +08:00
c0afb3b95e
added WEventGameStateBasedChecked
2017-02-01 09:48:40 +08:00
5504bf23d1
corrected dimir doppelganger
2017-02-01 09:47:31 +08:00
28b51d3335
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
2017-02-01 09:33:35 +08:00
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
a97a7edca6
minor refactor
2017-01-31 22:01:19 +08:00
92b4909fc8
add some cards
2017-01-31 21:19:34 +08:00
3998c21178
fix persist on copied card
2017-01-31 20:11:59 +08:00
41d925d7c9
add support for activated copier
...
thespian stage etc...
2017-01-31 20:11:09 +08:00
7029636291
some corrections
2017-01-31 04:16:47 +08:00
a916c1067f
- fixed small compiling error for a function in testsuite
...
- indentation formatting on DebugRoutines
2017-01-30 14:02:25 -05:00
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
31f15b12cb
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
2017-01-29 20:16:09 +08:00
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
Anthony Calosa
Rolzad73