Anthony Calosa
|
cde2e6a1bd
|
prevent NPE
|
2021-03-03 17:25:14 +08:00 |
|
Michael Kamensky
|
d51a518687
|
Merge branch 'master' into 'master'
Minor code cleanup
See merge request core-developers/forge!4082
|
2021-03-03 06:37:42 +00:00 |
|
Michael Kamensky
|
ce72ee0766
|
- Remove an unused parameter
|
2021-03-03 09:37:14 +03:00 |
|
Michael Kamensky
|
1fd32b8843
|
Merge branch 'master' into 'master'
Added an AI hint to Together Forever.
See merge request core-developers/forge!4081
|
2021-03-03 06:32:05 +00:00 |
|
Michael Kamensky
|
159d358725
|
- Added an AI hint to Together Forever.
|
2021-03-03 09:30:18 +03:00 |
|
Michael Kamensky
|
5f3929070a
|
Merge branch 'master' into 'master'
Comment out some currently unsupported cards in Commander precons.
See merge request core-developers/forge!4080
|
2021-03-03 05:52:21 +00:00 |
|
Michael Kamensky
|
1538e8bf14
|
- Comment out some currently unsupported cards in Commander precons.
|
2021-03-03 08:51:38 +03:00 |
|
Michael Kamensky
|
b122851dd8
|
Merge branch 'master' into 'master'
Refactor and improve the "exile any number" ChangeZoneAi logic, add RollDiceAi logic
See merge request core-developers/forge!4079
|
2021-03-03 05:45:45 +00:00 |
|
Michael Kamensky
|
54d2b4e488
|
- Refactor and improve the "exile any number" ChangeZoneAi logic
|
2021-03-03 08:43:54 +03:00 |
|
CCTV-1
|
31f9503af8
|
Merge remote-tracking branch 'upstream/master' into donot_translation_token
|
2021-03-03 12:31:55 +08:00 |
|
Michael Kamensky
|
641a0793b8
|
Merge branch 'master' into 'master'
Add basic AI support for RollDiceEffect
See merge request core-developers/forge!4078
|
2021-03-03 04:16:11 +00:00 |
|
Michael Kamensky
|
d841ecf1c7
|
Add basic AI support for RollDiceEffect
|
2021-03-03 04:16:11 +00:00 |
|
Michael Kamensky
|
7faf91161c
|
- NPE guard
|
2021-03-03 07:15:54 +03:00 |
|
Michael Kamensky
|
97237dbfdc
|
- Add basic AI support for RollDiceEffect
|
2021-03-03 07:13:31 +03:00 |
|
Michael Kamensky
|
a2d4fb3e81
|
Merge branch 'fixAkiri' into 'master'
Fix Akiri multiplayer
See merge request core-developers/forge!4051
|
2021-03-03 03:50:17 +00:00 |
|
Bug Hunter
|
1a1bd6077b
|
Fix Akiri multiplayer
|
2021-03-03 03:50:17 +00:00 |
|
Michael Kamensky
|
a51f28ce1d
|
Merge branch 'unset-cards' into 'master'
Add dice rolling, and Waste Land
See merge request core-developers/forge!4067
|
2021-03-03 03:49:42 +00:00 |
|
Michael Kamensky
|
8a34d26d54
|
Merge branch 'mnemon' into 'master'
add Cleanup to Mnemonic Deluge
See merge request core-developers/forge!4076
|
2021-03-03 03:49:37 +00:00 |
|
Michael Kamensky
|
3362c79844
|
Merge branch 'statecraft' into 'master'
statecraft.txt fix
See merge request core-developers/forge!4075
|
2021-03-03 03:49:24 +00:00 |
|
Michael Kamensky
|
6cdb04fa29
|
Merge branch 'japanese_localization_update' into 'master'
Update Japanese localization
See merge request core-developers/forge!4077
|
2021-03-03 03:48:45 +00:00 |
|
Lyu Zong-Hong
|
45f0bb987e
|
Update Japanese localization
|
2021-03-03 11:45:18 +09:00 |
|
Northmoc
|
867688fbde
|
add cleanup to mnemonic_deluge.txt
|
2021-03-02 19:49:01 -05:00 |
|
Northmoc
|
d5a1704f42
|
statecraft.txt fix
|
2021-03-02 18:10:58 -05:00 |
|
Michael Kamensky
|
fb0f245b34
|
Merge branch 'master' into 'master'
Net Deck Archive Categories fix
See merge request core-developers/forge!4071
|
2021-03-02 20:36:33 +00:00 |
|
Michael Kamensky
|
a12fd1d34a
|
Merge branch 'Williams-master-patch-84575' into 'master'
Tyrite Sanctum fix
See merge request core-developers/forge!4072
|
2021-03-02 20:36:17 +00:00 |
|
tool4EvEr
|
65fc79a746
|
Force player choice for mandatory costs
|
2021-03-02 19:33:40 +01:00 |
|
John
|
f38df2457e
|
Update tyrite_sanctum.txt
|
2021-03-02 17:58:21 +00:00 |
|
Churrufli
|
12ff52e051
|
Net Deck Archive Categories fix
|
2021-03-02 18:48:15 +01:00 |
|
Adam Pantel
|
4666dec0f8
|
Waste Land
|
2021-03-02 12:29:11 -05:00 |
|
Adam Pantel
|
a161d838ee
|
Add dice rolling
|
2021-03-02 12:29:11 -05:00 |
|
Anthony Calosa
|
03a63da029
|
Merge branch 'master' into 'master'
Add foretell token image as facedown cardback
See merge request core-developers/forge!4070
|
2021-03-02 13:25:40 +00:00 |
|
Anthony Calosa
|
59db0eef2c
|
Add foretell token image as facedown cardback
|
2021-03-02 21:08:04 +08:00 |
|
Michael Kamensky
|
c3d27224e7
|
Merge branch 'master' into 'master'
Net Deck Archive Categories (Android implementation)
See merge request core-developers/forge!4069
|
2021-03-02 10:48:56 +00:00 |
|
Churrufli
|
0219991703
|
Net Deck Archive Categories (Android implementation)
|
2021-03-02 10:08:15 +01:00 |
|
Michael Kamensky
|
9952e0ff88
|
Merge branch 'master' into 'master'
Net Deck Archive Vintage (Desktop implementation)
See merge request core-developers/forge!4068
|
2021-03-02 08:41:34 +00:00 |
|
Churrufli
|
f02a3c8786
|
Net Deck Archive Vintage (Desktop implementation)
|
2021-03-02 09:24:10 +01:00 |
|
Michael Kamensky
|
043e767c79
|
Merge branch 'master' into 'master'
Fix AI thinking that Kazuul Warlord trigger is not a good thing
See merge request core-developers/forge!4066
|
2021-03-02 04:25:13 +00:00 |
|
Michael Kamensky
|
b67acd9ef2
|
- CountersPutAllAi: check the standard API logic when calling from a non-mandatory trigger
|
2021-03-02 07:24:25 +03:00 |
|
Michael Kamensky
|
fba274c200
|
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
|
2021-03-02 07:14:03 +03:00 |
|
Michael Kamensky
|
2bf94b7403
|
Merge branch 'Williams-master-patch-88653' into 'master'
Tergrid fix
See merge request core-developers/forge!4063
|
2021-03-02 04:01:59 +00:00 |
|
Michael Kamensky
|
062332dbeb
|
Merge branch 'master' into 'master'
update simplified chinese translation
See merge request core-developers/forge!4065
|
2021-03-02 04:01:47 +00:00 |
|
CCTV-1
|
b8aab09789
|
update simplified chinese translation
|
2021-03-02 11:02:35 +08:00 |
|
Anthony Calosa
|
b3d763b181
|
Merge branch 'twosat-master-patch-20281' into 'master'
Update de-DE.properties
See merge request core-developers/forge!4062
|
2021-03-02 01:31:38 +00:00 |
|
Anthony Calosa
|
d2c568dc58
|
Merge branch 'edition_fixes' into 'master'
Promo edition fixes
See merge request core-developers/forge!4064
|
2021-03-02 01:30:12 +00:00 |
|
paul_snoops
|
44e38e5d13
|
Promo edition fixes
|
2021-03-01 21:44:08 +00:00 |
|
John
|
2e65640495
|
Update tergrid_god_of_fright_tergrids_lantern.txt
|
2021-03-01 20:28:34 +00:00 |
|
Andreas Bendel
|
81870b5b9b
|
Update de-DE.properties
MatchScrollIndicator lines
|
2021-03-01 19:50:33 +00:00 |
|
Michael Kamensky
|
d7e0fe08ce
|
Merge remote-tracking branch 'origin/master' into agetian-master
|
2021-03-01 21:11:20 +03:00 |
|
Michael Kamensky
|
800cceb6a8
|
Merge branch 'netdeckarchivelegacydesktop' into 'master'
Net Deck Archive Legacy (Desktop implementation)
See merge request core-developers/forge!4056
|
2021-03-01 17:18:47 +00:00 |
|
Churrufli
|
a37403d63d
|
Net Deck Archive Legacy (Desktop implementation)
|
2021-03-01 15:26:00 +01:00 |
|