external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,850 Commits 31 Branches 187 Tags
08e84cb15ddf6f3e9024adaca832c39800c8f7f6
Commit Graph

46850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
81954d658c Merge branch 'fixes' into 'master' 
Fixes

See merge request core-developers/forge!3492
 2020-12-07 20:29:39 +00:00
Michael Kamensky
3e07f5ac56 Merge branch '1659-npe-at-forge-game-ability-abilityutils-getdefinedplayers-abilityutils-java-1084' into 'master' 
Resolve "NPE at forge.game.ability.AbilityUtils.getDefinedPlayers(AbilityUtils.java:1084)"

Closes #1659

See merge request core-developers/forge!3491
 2020-12-07 20:28:02 +00:00
Anthony Calosa
a22bc635b2 Merge branch 'master' into 'master' 
Fix Parallax Wave

Closes #207

See merge request core-developers/forge!3496
 2020-12-07 19:45:25 +00:00
Anthony Calosa
321787298e Fix Parallax Wave 
- fix combo with Opalescence
 2020-12-08 03:42:55 +08:00
Anthony Calosa
2eb1dd89d2 Merge branch 'master' into 'master' 
try to fix StackOverflow

See merge request core-developers/forge!3495
 2020-12-07 15:02:29 +00:00
Anthony Calosa
f1767a57a3 try to fix StackOverflow 2020-12-07 23:01:15 +08:00
Northmoc
0082bb9c77 congregation_at_dawn.txt typo fix 2020-12-07 09:31:51 -05:00
Northmoc
0216b52d1c add logic 2020-12-07 09:07:35 -05:00
Northmoc
f9a601893c preferred_selection.txt 2020-12-07 09:00:54 -05:00
Anthony Calosa
28dbf55c82 Merge branch 'master' into 'master' 
[Mobile] Fix annoying overlay between Quest Commander matches

See merge request core-developers/forge!3494
 2020-12-07 04:16:16 +00:00
Northmoc
37461aa3e5 raiding_party.txt and support 2020-12-06 23:15:38 -05:00
Anthony Calosa
ff7638e2fc [Mobile] Fix annoying overlay between Quest Commander matches 
- Only load the overlay when generating the Quest outside the match/duels
 2020-12-07 12:14:16 +08:00
Northmoc
3a7e3cb993 maze_of_ith.txt cleanup 2020-12-06 23:13:18 -05:00
Northmoc
c5ec4994c0 plague_reaver.txt +DelayTriggerDefinedPlayer$ 2020-12-06 23:13:18 -05:00
Northmoc
9907150d8a thief_of_blood.txt needs ETB$ True 2020-12-06 23:13:17 -05:00
Hans Mackowiak
c9500859fe RelaceDamage: fix DamageTarget check using Replaced values 2020-12-06 18:27:04 +01:00
Hans Mackowiak
8076682d1b AbstractGuiGame: only create Timer when needed, and destroy again after game end 2020-12-06 09:49:57 +01:00
Anthony Calosa
0e2f8eb71c Merge branch 'master' into 'master' 
[Mobile] Add Landwalk and Commander Icons

See merge request core-developers/forge!3490
 2020-12-06 08:43:57 +00:00
Anthony Calosa
3ba79ea606 [Mobile] Add Landwalk and Commander Icons 2020-12-06 16:39:51 +08:00
Michael Kamensky
311be33896 Merge branch '1667-npe-at-forge-game-zone-zonetype-listvalueof-zonetype-java-56' into 'master' 
Resolve "NPE at forge.game.zone.ZoneType.listValueOf(ZoneType.java:56)"

Closes #1667

See merge request core-developers/forge!3489
 2020-12-06 05:29:24 +00:00
Hans Mackowiak
1da617424f ChangeZoneAi: fix AI if no Origin Zone, use zones from TargetRestrictions 2020-12-05 17:25:08 +01:00
Hans Mackowiak
d67b1595bc move wrong_turn.txt 2020-12-05 16:36:55 +01:00
Michael Kamensky
e671eac173 Merge branch 'patch-12' into 'master' 
Update Secret Lair Drop Series.txt Bob Ross Evolving Wilds

See merge request core-developers/forge!3487
 2020-12-05 15:15:27 +00:00
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