Commit Graph

6715 Commits

Author SHA1 Message Date
Anthony Calosa
9bb63a68f5 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-02-08 21:34:15 +08:00
Rolzad73
77d20e89c8 - fixed upload-binaries error from bad debug trace 2017-02-07 20:58:32 -05:00
Anthony Calosa
66f664207a Merge pull request #931 from kevlahnota/master
Changes
2017-02-07 22:12:39 +08:00
Anthony Calosa
bac69f95d8 some changes
change keyword "makecardt" alternative token creator to "create" keyword
add lifeleech - gain life lost with target
2017-02-07 21:22:49 +08:00
Anthony Calosa
75e372ac9b adjust enstack attackers
so we have small room for the phase wheel for touch enabled device
2017-02-07 17:00:37 +08:00
Anthony Calosa
ef31192f33 modified flickleft for android
if you flick/swipe left or right when the closedhand option is visible
in Android, you simulate scroll up/down.
example scenario at opponent's turn with a spell on the stack, swipe
down to interrupt then do something, if you open a zone like library or
graveyard or exile and you want to interract from the zone there (like
casting spell or doing ability from that zone, you can flick left or
right to close that zone so you can tap for mana or any other extra
costs for that spell, you can open the zone if possible just by tapping
it like it used to.)
2017-02-07 16:59:19 +08:00
Anthony Calosa
fde707b726 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-02-07 16:52:04 +08:00
Anthony Calosa
e158e95245 Merge pull request #930 from kevlahnota/master
auto close
2017-02-07 14:08:54 +08:00
Anthony Calosa
5b23cc2e33 auto close 2017-02-07 13:10:58 +08:00
Anthony Calosa
c72cdff0f1 Merge pull request #929 from kevlahnota/master
Some Bug Fixes
2017-02-06 22:25:59 +08:00
Anthony Calosa
831c8f73b0 some bug fixes
fix where the copier is treated as the same copied card, also fixes the
display ability of momir (forced), disabled reveal for AI if aicode is
not found (should add alternate for ai).
2017-02-06 21:48:41 +08:00
Anthony Calosa
2dc6c62acb Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-02-06 21:47:48 +08:00
Anthony Calosa
9e1d1a056c Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-02-06 05:56:00 +08:00
Rolzad73
9a32ae2c6d Merge pull request #928 from WagicProject/appveyor_testing
Just adding some console output to Appveyor build
2017-02-05 16:23:10 -05:00
Anthony Calosa
b1a2003a84 Merge pull request #927 from kevlahnota/master
Modified Momir
2017-02-05 22:57:38 +08:00
Anthony Calosa
e2c1d62552 modified Momir 2017-02-05 22:14:20 +08:00
Anthony Calosa
db0f6d6c0b Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-02-05 21:08:37 +08:00
Xawotihs
bc44ee8056 And again 2017-02-05 11:48:30 +01:00
Xawotihs
65a9bd55d8 Tries to fix iOS/MacOSX builds 2017-02-05 11:03:51 +01:00
Anthony Calosa
2aa0668c28 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-02-05 16:45:13 +08:00
Rolzad73
9f5e37a03c - added even more meaning to release upload script case 2017-02-05 01:13:38 -05:00
Rolzad73
f27763870c Merge pull request #926 from WagicProject/qt_test_crash_fix
small QT build CI fix
2017-02-05 01:00:52 -05:00
Rolzad73
ab22e02db8 - cleaned up error msg bug 2017-02-05 00:38:37 -05:00
Rolzad73
257afd3525 - added more meaning to release upload script case 2017-02-05 00:29:00 -05:00
Rolzad73
eec38de558 - testing appveyor env vars 2017-02-05 00:04:47 -05:00
Rolzad73
35de677999 - stop mysterious ~QNetworkConfiguration() SIGSEGV issue at end of console testsuite run 2017-02-04 23:09:13 -05:00
Anthony Calosa
8b9dfdf96d bug fix 2017-02-05 08:07:12 +08:00
Anthony Calosa
c830ef88ca Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-02-05 07:11:05 +08:00
Anthony Calosa
ba0daed776 Merge pull request #924 from kevlahnota/master
Refactor countManaProducedby
2017-02-05 06:38:05 +08:00
Anthony Calosa
f37d946b4e Removed unused variable 2017-02-04 23:33:08 +08:00
Anthony Calosa
477419cc32 Refactor countManaProducedby
cards that uses this should not crash anymore with lorded mana producer
from instants like rain of filth...
2017-02-04 22:37:21 +08:00
Anthony Calosa
70e8d1c4b3 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-02-04 20:47:05 +08:00
Rolzad73
732f795be4 - fixing last commit broke no QT builds 2017-02-03 21:05:14 -05:00
Rolzad73
00536fa3d9 - Qthread include fix for console QT build method and QT TESTSUITE target 2017-02-03 19:42:55 -05:00
Anthony Calosa
042f00cc58 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-02-03 22:31:33 +08:00
Anthony Calosa
acef89ea03 Merge pull request #923 from kevlahnota/master
Revert Functionality
2017-02-03 21:46:21 +08:00
Anthony Calosa
d7770d285f not needed anymore 2017-02-03 20:55:32 +08:00
Anthony Calosa
7932941a01 Revert Functionality
AACopier and AACloner should work with andAbility now...
2017-02-03 20:45:46 +08:00
Anthony Calosa
c4eac5e62b Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-02-03 15:55:27 +08:00
Anthony Calosa
763bd60e74 Merge pull request #922 from kevlahnota/master
Some Fixes
2017-02-03 15:12:17 +08:00
Anthony Calosa
3fa52e7ac5 corrections 2017-02-03 14:26:26 +08:00
Anthony Calosa
9104afdef7 Cleanup 2017-02-03 10:39:45 +08:00
Anthony Calosa
942c95e736 revised copier copied abilities
the clone should copy original abilities only
2017-02-03 10:31:10 +08:00
Anthony Calosa
dc696a0f45 fix random segmentation fault
should fix the crash -> rain of filth in test suite
2017-02-03 10:30:14 +08:00
Anthony Calosa
d26e9da6c4 add some restrictions 2017-02-03 07:59:13 +08:00
Anthony Calosa
ea09b1f6bc Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-02-03 02:35:24 +08:00
Rolzad73
da033eb28e Merge pull request #919 from WagicProject/key_bind_changes
key binding related
2017-02-02 11:18:46 -05:00
Rolzad73
b2a0ccba05 - removed leftover trace log 2017-02-02 10:08:58 -05:00
Anthony Calosa
3f146c94e5 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-02-02 13:46:21 +08:00
Anthony Calosa
9d92bdcd75 Merge pull request #918 from kevlahnota/master
Refactor PW Rule & some bug fixes
2017-02-02 13:21:57 +08:00