Commit Graph

57403 Commits

Author SHA1 Message Date
Northmoc
66bcff8eea Merge branch 'master' of https://github.com/Card-Forge/forge 2022-05-08 09:07:14 -04:00
Agetian
e14ae15c70 Merge pull request #294 from Agetian/ai-witnessthefuture
Make Witness the Future AI playable.
2022-05-08 12:41:29 +03:00
Michael Kamensky
75a974165d - Make Witness the Future AI playable. 2022-05-08 12:31:32 +03:00
Anthony Calosa
21fca37c7d Merge pull request #292 from kevlahnota/master
[Adventure] Fix Layout and add Preview Date Time
2022-05-08 14:14:32 +08:00
Anthony Calosa
e88c25ce7c Merge branch 'master' into newmaster 2022-05-08 14:08:19 +08:00
Anthony Calosa
8708b6300c [Adventure] Fix Layout and add Preview Date Time 2022-05-08 14:06:09 +08:00
Anthony Calosa
b4a0f673f6 Merge pull request #289 from kevlahnota/master
[Adventure] Refactor GameHud
2022-05-08 06:50:56 +08:00
Anthony Calosa
ace4ba4aea Merge branch 'master' into newmaster 2022-05-08 05:58:42 +08:00
Anthony Calosa
3c9cabfb7b [Adventure] Refactor GameHud
Make GameHud controls/layout for Android landscape mode identical to Android portrait mode. Desktop Adventure mode retains previous layout and controls.
2022-05-08 05:57:36 +08:00
Anthony Calosa
c039f238d0 Merge pull request #283 from tool4ever/caststuff
Fix casting card copies not being added to stack correctly
2022-05-08 05:53:50 +08:00
Anthony Calosa
864d2caa12 Merge pull request #287 from JohnWilliams77/patch-5
Update Secret Lair Drop Series.txt
2022-05-08 05:53:01 +08:00
Anthony Calosa
dce75c9578 Merge pull request #282 from Northmoc/nccBribeTaker
NCC: Bribe Taker and support
2022-05-08 05:52:33 +08:00
Anthony Calosa
8828003333 Merge pull request #288 from kevlahnota/master
[Mobile] Add Auto AI Deck option
2022-05-08 05:43:08 +08:00
Northmoc
5e8587d786 sewer_crocodile.txt remove bad NonStackingEffect line (#286) 2022-05-07 20:02:49 +00:00
Anthony Calosa
409d18aa06 fix translation 2022-05-08 02:19:46 +08:00
Anthony Calosa
a318749a78 [Mobile] Add Auto AI Deck option 2022-05-08 02:16:36 +08:00
JohnWilliams77
8a05179a74 Update Secret Lair Drop Series.txt 2022-05-07 18:15:43 +01:00
Agetian
1f0c2d4a82 Merge pull request #268 from Northmoc/nccContractual
NCC: Contractual Safeguard, Aven Courier and support
2022-05-07 17:15:54 +03:00
Northmoc
e60b6d00c7 Merge pull request #281 from AvacynAngel/master
Create citadel_gate.txt
2022-05-07 09:56:24 -04:00
AvacynAngel
eb0e97e0d7 Create summon_undead.txt (#255)
* Create summon_undead
2022-05-07 13:55:51 +00:00
Northmoc
e4e0edc217 sewer_crocodile.txt remove bad NonStackingEffect line 2022-05-07 09:50:57 -04:00
TheBlackMarvel
01e8f8e2f2 NCC Park Heights Maverick (#221) 2022-05-07 13:47:46 +00:00
Northmoc
ab2ea6554f bribe_taker.txt fix typo 2022-05-07 09:43:16 -04:00
tool4EvEr
9db791d875 Fix casting card copies not being added to stack correctly 2022-05-07 10:18:19 +02:00
Anthony Calosa
721b284b1b revert 2022-05-07 13:02:20 +08:00
Agetian
e576656d7c Merge pull request #276 from Northmoc/ncc6a
Shield Broker (NCC) and AI for Sewer Crocodile
2022-05-07 07:30:45 +03:00
Northmoc
efb713405f CountersPutEffect support "AltChoiceForEach" 2022-05-06 23:20:13 -04:00
Northmoc
b5267d5a64 bribe_taker.txt 2022-05-06 23:19:35 -04:00
Northmoc
0e203c3327 storm_of_forms.txt 2022-05-06 23:18:20 -04:00
Anthony Calosa
1536c0e589 remove extra code 2022-05-07 11:17:54 +08:00
Anthony Calosa
268b1ea823 prevent NPE 2022-05-07 11:15:26 +08:00
AvacynAngel
774c4ff62d Create citadel_gate.txt 2022-05-06 22:07:04 -04:00
Anthony Calosa
a16fbf15bc add check on selectedDeckType 2022-05-07 10:00:18 +08:00
Anthony Calosa
88adf6a99e Merge pull request #279 from Card-Forge/kevlahnota-patch-1
cleanup
2022-05-07 07:29:34 +08:00
Anthony Calosa
f2fb22328a unused import 2022-05-07 07:22:20 +08:00
Anthony Calosa
472b0b8329 Update RandomDeckGenerator.java 2022-05-07 07:20:19 +08:00
Anthony Calosa
2ecc88cada cleanup 2022-05-07 07:18:17 +08:00
Anthony Calosa
4972823b27 Merge pull request #267 from kevlahnota/diffPlus
[Adventure] difficulty selector on NewGame Plus
2022-05-07 06:49:57 +08:00
Anthony Calosa
af51f1f5a5 Merge pull request #263 from Northmoc/hiddenCZ
various getStackDescription improvements
2022-05-07 06:48:46 +08:00
Anthony Calosa
64cbb0badd Merge pull request #265 from Northmoc/stackDesc
TokenEffect > getStackDescription() try to catch more possibilities
2022-05-07 06:39:31 +08:00
Northmoc
8af0a03ebb sewer_crocodile.txt with NonStackingEffect 2022-05-06 18:37:49 -04:00
Northmoc
2b886345b2 shield_broker.txt 2022-05-06 18:37:31 -04:00
Anthony Calosa
4aca310370 update button text 2022-05-07 06:34:48 +08:00
Anthony Calosa
9cd23e6639 Merge pull request #273 from Northmoc/ncc6
NCC: 6 April
2022-05-07 06:23:13 +08:00
Anthony Calosa
1ceed9e52e Merge pull request #264 from kevlahnota/master
refactor aideck selection
2022-05-07 06:07:00 +08:00
Northmoc
470e3d4a64 CountersPutEffect support "PutOnDefined" and "OnlyNewKind" 2022-05-06 16:35:35 -04:00
Northmoc
2cdb17f437 aven_courier.txt 2022-05-06 16:33:33 -04:00
Northmoc
c3e6da0d35 NCC AI updates 2022-05-06 15:09:15 -04:00
Northmoc
e7a4dcf394 skyboon_evangelist.txt 2022-05-06 15:08:40 -04:00
Northmoc
3698472ca7 damning_verdict.txt 2022-05-06 15:07:01 -04:00