Anthony Calosa
|
3228061405
|
Merge branch 'master' into 'master'
[Mobile] Add dialog to restart Forge
See merge request core-developers/forge!3488
|
2020-12-05 12:52:31 +00:00 |
|
John
|
c0a8abcb3f
|
Update Secret Lair Drop Series.txt
|
2020-12-05 12:40:53 +00:00 |
|
Anthony Calosa
|
72b756aa8e
|
[Mobile] Add dialog to restart Forge
|
2020-12-05 20:35:59 +08:00 |
|
Hans Mackowiak
|
f0f6f70b28
|
StaticAbilityCastWithFlash: refactor that it can be checked before targets
|
2020-12-05 11:34:00 +01:00 |
|
Hans Mackowiak
|
db77e2861c
|
CardDb: dont keep allCards list just use values collection
|
2020-12-05 10:08:41 +01:00 |
|
Anthony Calosa
|
112b2badd2
|
Merge branch 'master' into 'master'
[Mobile] Update Quest buttons
See merge request core-developers/forge!3486
|
2020-12-05 06:19:03 +00:00 |
|
Anthony Calosa
|
1bc9fb08d6
|
[Mobile] Update Quest buttons
|
2020-12-05 14:16:22 +08:00 |
|
Anthony Calosa
|
9a65341a04
|
Merge branch 'master' into 'master'
[Mobile] Update Quests
See merge request core-developers/forge!3485
|
2020-12-05 05:52:08 +00:00 |
|
Anthony Calosa
|
8b93e38274
|
[Mobile] Loading Overlay for Generated Random Quest
|
2020-12-05 13:49:14 +08:00 |
|
Anthony Calosa
|
74b3e2697e
|
update borderlessCardList.txt
|
2020-12-05 13:48:04 +08:00 |
|
Michael Kamensky
|
f02f47a212
|
Merge branch 'patch-12' into 'master'
Update Secret Lair Ultimate Edition.txt (Pathways)
See merge request core-developers/forge!3484
|
2020-12-05 04:48:40 +00:00 |
|
Michael Kamensky
|
7755a5955a
|
Merge branch 'fixes' into 'master'
A few quick fixes
See merge request core-developers/forge!3483
|
2020-12-05 04:48:34 +00:00 |
|
John
|
e9e6dc934d
|
Update Secret Lair Ultimate Edition.txt
|
2020-12-04 22:10:33 +00:00 |
|
Northmoc
|
c3f60b4764
|
fix Statics that care about if you're the Monarch
|
2020-12-04 14:44:32 -05:00 |
|
Northmoc
|
6935adc39f
|
fix rockslide_sorcerer.txt type
|
2020-12-04 14:28:39 -05:00 |
|
Anthony Calosa
|
3328502e84
|
Merge branch 'master' into 'master'
update Quest Commander mode
See merge request core-developers/forge!3482
|
2020-12-04 04:50:19 +00:00 |
|
Anthony Calosa
|
6df146d313
|
update Quest Commander mode
|
2020-12-04 12:49:15 +08:00 |
|
Sol
|
e3cb318967
|
Merge branch 'update-edition-tracker' into 'master'
Handle new edition print sheets properly for tracking script
See merge request core-developers/forge!3481
|
2020-12-04 04:17:30 +00:00 |
|
friarsol
|
b2b46176c7
|
Handle new edition print sheets properly
|
2020-12-03 22:32:45 -05:00 |
|
klaxnek
|
de507af178
|
Merge remote-tracking branch 'core-developers/master'
|
2020-12-03 15:33:29 +01:00 |
|
Hans Mackowiak
|
ecb010ed41
|
GUI: fixed memory leak on gui-desktop
|
2020-12-03 10:44:20 +01:00 |
|
Michael Kamensky
|
772b0c4eae
|
Merge branch 'effect' into 'master'
Effects/Emblems with set code/rarity to match host
See merge request core-developers/forge!3480
|
2020-12-03 04:40:44 +00:00 |
|
Michael Kamensky
|
b946ecabf6
|
Merge branch 'monarch' into 'master'
Monarch command zone effect: support multiple arts/sets
See merge request core-developers/forge!3479
|
2020-12-03 04:40:29 +00:00 |
|
Michael Kamensky
|
ba7fcb7515
|
Merge branch 'war_token_refactor' into 'master'
WAR token refactor
See merge request core-developers/forge!3478
|
2020-12-03 04:40:05 +00:00 |
|
Hans Mackowiak
|
ce0875b8ce
|
MVN: update miglayout-swing fixing Memory Leak
|
2020-12-03 03:13:00 +01:00 |
|
Anthony Calosa
|
014899f755
|
Merge branch 'QuestCommander' into 'master'
[Mobile] Quest Mode with Commander
Closes #1655
See merge request core-developers/forge!3477
|
2020-12-02 21:58:36 +00:00 |
|
Anthony Calosa
|
2230319f5e
|
Merge remote-tracking branch 'core/master' into QuestCommander
|
2020-12-03 05:51:10 +08:00 |
|
Anthony Calosa
|
30edd6c9ff
|
fix save Quest Commander
|
2020-12-03 05:48:47 +08:00 |
|
Northmoc
|
2228da9406
|
Effects/Emblems with set code/rarity to match host
|
2020-12-02 14:50:26 -05:00 |
|
Hans Mackowiak
|
f8996d8853
|
AiController: only temporally set LastState for checking, and reset later
|
2020-12-02 18:26:50 +01:00 |
|
Northmoc
|
4b5027a86e
|
Monarch command zone effect: support multiple arts/sets
|
2020-12-02 11:02:46 -05:00 |
|
Hans Mackowiak
|
ee27081a09
|
Merge branch 'master' into 'master'
CMR: Wrong Turn
See merge request core-developers/forge!3475
|
2020-12-02 15:58:45 +00:00 |
|
Hythonia
|
6ae1545a2f
|
CMR: Wrong Turn
|
2020-12-02 15:58:44 +00:00 |
|
Hans Mackowiak
|
cd69b2da2a
|
SpellAbility: set LastStateBattlefield only into CastSA lki copy
|
2020-12-02 16:51:04 +01:00 |
|
Northmoc
|
b03f8b637a
|
WAR token refactor
|
2020-12-02 09:54:25 -05:00 |
|
Anthony Calosa
|
8c530ba384
|
WIP: Quest Mode with Commander
|
2020-12-02 22:04:03 +08:00 |
|
Hans Mackowiak
|
9e53fdbad1
|
Merge branch 'master' into 'master'
Rot Wolf fix
See merge request core-developers/forge!3473
|
2020-12-02 12:02:52 +00:00 |
|
Hans Mackowiak
|
b284aea6fa
|
Merge branch '1643-thousand-year-storm' into 'master'
Resolve "Thousand Year Storm"
Closes #1643
See merge request core-developers/forge!3474
|
2020-12-02 12:01:59 +00:00 |
|
Hans Mackowiak
|
ea48f28882
|
CurrentCastSpells: dont use CardCollection on them
|
2020-12-02 13:00:56 +01:00 |
|
Hans Mackowiak
|
b74bbf1801
|
SpellAbility: remove the need to store mayPlayOriginal
|
2020-12-02 11:17:22 +01:00 |
|
Hythonia
|
d47510367a
|
Update rot_wolf.txt
|
2020-12-02 08:54:04 +00:00 |
|
Michael Kamensky
|
4193858ad4
|
Merge branch 'cleanup' into 'master'
Tidying a few old cards
See merge request core-developers/forge!3471
|
2020-12-02 04:52:20 +00:00 |
|
Sol
|
19a14e4745
|
Fix Tuya Bearclaw
|
2020-12-02 04:05:37 +00:00 |
|
Anthony Calosa
|
dc10e3b678
|
Merge branch 'master' into 'master'
remove unused import
See merge request core-developers/forge!3472
|
2020-12-02 02:16:08 +00:00 |
|
Anthony Calosa
|
f132b894ff
|
remove unused import
|
2020-12-02 10:15:19 +08:00 |
|
Northmoc
|
e003c0a141
|
cleanup magus_of_the_abyss.txt
|
2020-12-01 20:35:03 -05:00 |
|
Northmoc
|
275c0cd681
|
remove useless Mandatory param from Destroy abilities
|
2020-12-01 20:33:40 -05:00 |
|
Anthony Calosa
|
bca6cbc1e8
|
Merge branch 'master' into 'master'
[Android] Manual update instruction.
See merge request core-developers/forge!3470
|
2020-12-01 22:36:27 +00:00 |
|
Anthony Calosa
|
0f05620dc9
|
[Android] Manual update instruction.
|
2020-12-02 06:33:52 +08:00 |
|
Hans Mackowiak
|
b765f7bb20
|
PlayerCollection: min and max can return null
Conflicts:
forge-game/src/main/java/forge/game/ability/AbilityUtils.java
forge-game/src/main/java/forge/game/player/PlayerCollection.java
|
2020-12-01 11:52:36 +01:00 |
|