Commit Graph

7118 Commits

Author SHA1 Message Date
Anthony Calosa fe8fbd058b Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-02-28 06:50:13 +08:00
Anthony Calosa c4529a0949 Merge pull request #943 from kevlahnota/master
Filter View
2017-02-28 06:23:21 +08:00
Anthony Calosa 6ec3a68f0a update some cards 2017-02-27 22:52:33 +08:00
Anthony Calosa 458731778d add options show tokens
you can display tokens in editor (show tokens and choose 0 manacost) but
you can't add them, useful for tracking missing images...
2017-02-27 21:50:15 +08:00
Anthony Calosa 64547271dc Filter View
Tokens are excluded in deck editor, filter and adjust filter menu
2017-02-27 13:21:35 +08:00
Anthony Calosa 9e584951ac Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-02-27 06:50:31 +08:00
Anthony Calosa c859fdd08e Merge pull request #942 from kevlahnota/master
Crash fix and some card update
2017-02-27 00:34:16 +08:00
Anthony Calosa 1380ee6f20 equal
typo fix
2017-02-26 23:21:23 +08:00
Anthony Calosa 2da2272a53 update some cards 2017-02-26 23:13:45 +08:00
Anthony Calosa 17b6996ae4 tokens
cant buy and/or add tokens in deck editor and shop...
also adjust filter menu
2017-02-26 21:21:11 +08:00
Anthony Calosa 0f82b6efba crash fix mana ability filter 2017-02-26 15:22:16 +08:00
Anthony Calosa 178fcb9717 update some cycled cards 2017-02-26 09:38:11 +08:00
Anthony Calosa 19f0c653d1 add 1k to steal credits
maxglee profile
2017-02-26 09:36:32 +08:00
Anthony Calosa 7dc76876e4 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-02-25 20:48:07 +08:00
Anthony Calosa 60457886cc Merge pull request #941 from kevlahnota/master
Customlen
2017-02-25 12:19:25 +08:00
Anthony Calosa ec078b6ccc customLen
for formatting text on booster shop, we pass the desired length from
getformatted text with noremove(no removal of {}) enabled, if its not
enabled then default the value to zero(passing zero means use the
default values)
2017-02-25 07:27:57 +08:00
Anthony Calosa ec730a4383 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-02-25 07:22:27 +08:00
Anthony Calosa b2b3255f59 Merge pull request #940 from kevlahnota/master
Booster Shop
2017-02-24 22:21:22 +08:00
Anthony Calosa df925cfcb0 booster shop enhancement 2017-02-24 21:45:43 +08:00
Anthony Calosa 5b96f30b1a reversed 2017-02-24 18:22:01 +08:00
Anthony Calosa 8feb870c8f shop enhancements 2017-02-24 17:29:59 +08:00
Anthony Calosa d0b2340a73 crash fix in buying booster
this should be in game only
2017-02-24 15:04:12 +08:00
Anthony Calosa efac298eb0 revert jtypes 2017-02-24 15:03:28 +08:00
Anthony Calosa 453c5b0d6e Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-02-24 10:06:00 +08:00
Anthony Calosa 816010582a Merge pull request #939 from kevlahnota/master
Update some cards
2017-02-24 08:55:00 +08:00
Anthony Calosa a260eb11a8 crash fix 2017-02-24 07:25:38 +08:00
Anthony Calosa b1d271f1c2 add forced interrupt 2017-02-24 07:25:19 +08:00
Anthony Calosa 3faa959c09 updated some cards 2017-02-24 06:02:00 +08:00
Anthony Calosa a12a5e1637 test swap 2017-02-23 19:05:37 +08:00
Anthony Calosa 7c6d59a292 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-02-23 19:04:15 +08:00
Anthony Calosa 9836d8595c Merge pull request #938 from kevlahnota/master
Refactor efficiency
2017-02-23 18:17:15 +08:00
Anthony Calosa c9d5dfaf1b minor adjustments 2017-02-23 18:16:23 +08:00
Anthony Calosa 028f6cbb4e u32 2017-02-23 17:11:42 +08:00
Anthony Calosa c56d1b0bec pixel type
psp
2017-02-23 16:33:38 +08:00
Anthony Calosa 2e61f6c13d test pixel_type 2017-02-23 16:08:04 +08:00
Anthony Calosa 8437467320 refactor revealed efficiency
it's based now on actual aicode if it's available.
2017-02-23 14:10:27 +08:00
Anthony Calosa 039be43c2b set the current controller to do action
let the controller of the action do the abilty, also fix casted cards
that's been casted using castcard and be put into its owner's graveyard
2017-02-23 14:04:16 +08:00
Anthony Calosa a1af7d9b9f add black border option
if enabled, all cards will have black border
2017-02-23 08:38:15 +08:00
Anthony Calosa 4ce37964f4 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-02-22 22:26:28 +08:00
Anthony Calosa c1cdfa78d3 Merge pull request #937 from kevlahnota/master
update some cards
2017-02-22 22:06:31 +08:00
Anthony Calosa ff4911116c update some cards
removed phasedout trigger
add phasedoutbonus - ability
2017-02-22 18:25:39 +08:00
Anthony Calosa bb9d98cc0c AI ignore sphinx of jwar isle 2017-02-20 23:23:13 +08:00
Anthony Calosa 2d93d9b3cc moved this block for PSP
maybe we can fix the GUI for psp, low priority for now
2017-02-20 22:08:09 +08:00
Anthony Calosa 1c60ba6e7f crash fix
when you generate a castcard, then exit the game, an exception occurs to
SAFE_DELETE(cards[i]->previous) && SAFE_DELETE(cards[i]) in
mtggamezones.cpp line 548 and 549.
2017-02-20 22:06:56 +08:00
Anthony Calosa 11b3989615 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-02-20 10:08:28 +08:00
Anthony Calosa c9f26a48c7 Merge pull request #936 from kevlahnota/master
update some cards
2017-02-19 23:23:06 +08:00
Anthony Calosa 75cbaf0f06 update mana producer
change && to andability
2017-02-19 22:44:33 +08:00
Anthony Calosa de1dc6828d try to fix phase name
sometimes its invalid phase name
2017-02-19 22:11:54 +08:00
Anthony Calosa e6bf23e536 add saclands cost
sacrifice all lands {saclands} cost
2017-02-19 22:11:16 +08:00
Anthony Calosa 5b16ff4a69 bypass update when reveal display is still active 2017-02-19 21:11:24 +08:00