Bug Hunter
|
5ea5b59d94
|
Merge branch 'fixtypo' into 'master'
Fix script typo
See merge request core-developers/forge!4230
|
2021-03-20 10:19:26 +00:00 |
|
tool4EvEr
|
384f4892d5
|
Fix typo
|
2021-03-20 11:17:40 +01:00 |
|
Hans Mackowiak
|
2785388e76
|
Merge branch 'fix_piracy' into 'master'
Fix Piracy mana restriction
See merge request core-developers/forge!4227
|
2021-03-20 08:37:59 +00:00 |
|
Alumi
|
9c11c90f48
|
Fix Piracy mana restriction
|
2021-03-20 08:37:59 +00:00 |
|
Anthony Calosa
|
cd3a4da41d
|
Merge branch 'kevlahnota-master-patch-55889' into 'master'
Update CMatchUI.java
See merge request core-developers/forge!4229
|
2021-03-20 07:55:55 +00:00 |
|
Anthony Calosa
|
d00530700b
|
Update CMatchUI.java
removed unused imports
|
2021-03-20 07:55:08 +00:00 |
|
Anthony Calosa
|
f6a87b813b
|
Merge branch 'master' into 'master'
[Mobile] minor improvements
See merge request core-developers/forge!4228
|
2021-03-20 07:33:26 +00:00 |
|
Anthony Calosa
|
5cc2aaa07a
|
Merge branch 'customCards_Folder' into 'master'
Support loading Custom Cards & Editions from User Folder
See merge request core-developers/forge!4222
|
2021-03-20 07:28:26 +00:00 |
|
Anthony Calosa
|
1e766b8662
|
[Mobile] minor improvements
|
2021-03-20 15:21:15 +08:00 |
|
Michael Kamensky
|
29bf2970f3
|
Merge branch 'rollback_Phase_dev' into 'master'
[Mobile] add Experimental Rollback Phase
See merge request core-developers/forge!4195
|
2021-03-20 04:31:57 +00:00 |
|
Michael Kamensky
|
dfd5b984e3
|
Merge branch 'hallow' into 'master'
Fix cards
See merge request core-developers/forge!4225
|
2021-03-20 03:43:13 +00:00 |
|
Bug Hunter
|
be9de2cc09
|
Fix cards
|
2021-03-20 03:43:12 +00:00 |
|
tool4EvEr
|
0c1ca71f93
|
Fix Spell targets
|
2021-03-19 23:13:11 +01:00 |
|
Anthony Calosa
|
3995a20a81
|
limit usage
|
2021-03-20 04:26:16 +08:00 |
|
Anthony Calosa
|
9ce1ce14d3
|
Merge remote-tracking branch 'core/master' into rollback_Phase_dev
|
2021-03-20 02:42:14 +08:00 |
|
Anthony Calosa
|
59c2b36df7
|
Merge remote-tracking branch 'core/master' into customCards_Folder
|
2021-03-20 02:20:00 +08:00 |
|
Anthony Calosa
|
7fde89dcd7
|
allow devmode to find custom cards
|
2021-03-20 02:18:16 +08:00 |
|
Michael Kamensky
|
b94f40c7c4
|
Merge branch 'master' into 'master'
NPE prevention in getAllNonPromoCards.
See merge request core-developers/forge!4224
|
2021-03-19 17:53:20 +00:00 |
|
Michael Kamensky
|
00b5d40de7
|
- NPE prevention in getAllNonPromoCards.
|
2021-03-19 20:52:44 +03:00 |
|
Hans Mackowiak
|
b59f92e5dd
|
Merge branch 'imoti' into 'master'
Imoti: Cascade by looking at spell cmc
See merge request core-developers/forge!4221
|
2021-03-19 17:39:46 +00:00 |
|
Bug Hunter
|
1dfbc7638a
|
Imoti: Cascade by looking at spell cmc
|
2021-03-19 17:39:46 +00:00 |
|
Leandro Doctors
|
993fb3b518
|
refactor: rename 'assets' package to 'skin'
|
2021-03-19 14:27:10 -03:00 |
|
Anthony Calosa
|
a9135b6df4
|
Merge remote-tracking branch 'core/master' into customCards_Folder
|
2021-03-20 00:40:39 +08:00 |
|
Michael Kamensky
|
46718ff96a
|
Merge branch 'ertais_meddling' into 'master'
Add Ertai's Meddling
See merge request core-developers/forge!4218
|
2021-03-19 16:11:46 +00:00 |
|
Alumi
|
903b0130c7
|
Add Ertai's Meddling
|
2021-03-19 16:11:46 +00:00 |
|
Michael Kamensky
|
61fd54f82e
|
Merge branch 'drawAI' into 'master'
DrawAI: spend more life when Aggro
See merge request core-developers/forge!4220
|
2021-03-19 16:11:26 +00:00 |
|
Anthony Calosa
|
41b9bd3e06
|
Support loading Custom Cards & Editions from User Folder
|
2021-03-20 00:01:15 +08:00 |
|
tool4EvEr
|
799c24728f
|
Draw more cards when Aggro AI
|
2021-03-19 15:40:17 +01:00 |
|
Leandro Doctors
|
f9bdf6e181
|
Delete obsolete 'developers' tags
That information is obsolete. The up to date version can always be obtained form version control.
|
2021-03-19 11:38:30 -03:00 |
|
Michael Kamensky
|
ef3e91e8a8
|
Merge branch 'fix_scheme_trigger' into 'master'
Fix scheme triggers are registered twice issue.
See merge request core-developers/forge!4216
|
2021-03-19 07:10:55 +00:00 |
|
Michael Kamensky
|
a5254be74a
|
Merge branch 'master' into 'master'
update simplified chinese translation
See merge request core-developers/forge!4217
|
2021-03-19 07:10:48 +00:00 |
|
CCTV-1
|
4bb7b2f5fc
|
update simplified chinese translation
|
2021-03-19 10:35:41 +08:00 |
|
Lyu Zong-Hong
|
6b4878776d
|
Fix scheme triggers are registered twice issue.
|
2021-03-19 11:01:14 +09:00 |
|
Michael Kamensky
|
3d9daa91e0
|
Merge branch 'kefnet' into 'master'
God-Eternal Kefnet: Fix NPE
See merge request core-developers/forge!4215
|
2021-03-18 19:16:23 +00:00 |
|
tool4EvEr
|
0ac2c06dd1
|
Fix NPE
|
2021-03-18 19:27:27 +01:00 |
|
Hans Mackowiak
|
0d81961325
|
AbilityUtils: don't crash when CardTrait is null
|
2021-03-18 13:37:05 +01:00 |
|
Anthony Calosa
|
0501ac9735
|
update imports
|
2021-03-18 17:24:44 +08:00 |
|
Anthony Calosa
|
f71e31c3a8
|
Merge remote-tracking branch 'core/master' into rollback_Phase_dev
# Conflicts:
# forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
# forge-gui-mobile/src/forge/screens/match/MatchController.java
# forge-gui/src/main/java/forge/gamemodes/net/server/NetGuiGame.java
# forge-gui/src/main/java/forge/gui/interfaces/IGuiGame.java
|
2021-03-18 17:19:08 +08:00 |
|
Michael Kamensky
|
fc5557a137
|
Merge branch 'refactor_add_phase' into 'master'
Refactor AddPhase effect and add World at War
Closes #1606
See merge request core-developers/forge!4214
|
2021-03-18 05:01:17 +00:00 |
|
Michael Kamensky
|
058cdb6c3b
|
Merge branch 'karn' into 'master'
RestartGameEffect: refactor resets
See merge request core-developers/forge!4208
|
2021-03-18 05:01:12 +00:00 |
|
Bug Hunter
|
19a8c821fe
|
RestartGameEffect: refactor resets
|
2021-03-18 05:01:12 +00:00 |
|
Lyu Zong-Hong
|
69c17586aa
|
Refactor AddPhase effect and add World at War
|
2021-03-18 13:26:15 +09:00 |
|
Anthony Calosa
|
4d133a1966
|
Merge branch 'kevlahnota-master-patch-40940' into 'master'
update achievements images list
See merge request core-developers/forge!4213
|
2021-03-17 22:22:55 +00:00 |
|
Anthony Calosa
|
1d874760f1
|
cleanup
|
2021-03-17 22:19:36 +00:00 |
|
Anthony Calosa
|
9c59ed75be
|
Update achievement-images.txt
- planeswalker achievements updated up to kaldheim
|
2021-03-17 22:18:49 +00:00 |
|
Hans Mackowiak
|
d0e0b11186
|
better alias for XStream IO
|
2021-03-17 19:20:56 +01:00 |
|
Hans Mackowiak
|
9dca989b76
|
fixes QuestIO and GauntletIO
|
2021-03-17 18:27:56 +01:00 |
|
Leandro Doctors
|
b0a2095d5b
|
Merge branch 'fix-hannac' into 'master'
fixup! add forge.quest.data.QuestData to fix old quests
See merge request core-developers/forge!4212
|
2021-03-17 17:05:31 +00:00 |
|
Leandro Doctors
|
539d4c5939
|
fixup! fixup! add forge.quest.data.QuestData to fix old quests
|
2021-03-17 14:04:44 -03:00 |
|
Leandro Doctors
|
3199c74abe
|
Merge branch 'fix-hannac' into 'master'
fixup! add forge.quest.data.QuestData to fix old quests
See merge request core-developers/forge!4211
|
2021-03-17 17:01:29 +00:00 |
|