Commit Graph

46877 Commits

Author SHA1 Message Date
Northmoc
3584099883 sengir_the_dark_baron.txt +TriggerZones +AI 2020-12-14 18:09:39 -05:00
Sol
54c16d995f Merge branch 'patch-8' into 'master'
Update worlds.txt

See merge request core-developers/forge!3510
2020-12-14 13:47:54 +00:00
Gabriel Franco
479e4be56e Update worlds.txt 2020-12-12 17:37:37 +00:00
Anthony Calosa
e8ee0f32bf Merge branch 'master' into 'master'
Updated deckgen data

See merge request core-developers/forge!3509
2020-12-10 13:57:58 +00:00
Anthony Calosa
c4fb241cce Updated deckgen data
-Austinio7116
2020-12-10 21:53:51 +08:00
Hans Mackowiak
56b5d53208 Cheat: fix cast cheat 2020-12-10 11:55:32 +01:00
Michael Kamensky
ef43f9307b Merge branch 'booster-updates' into 'master'
Update edition files to only use Set cards sheets

See merge request core-developers/forge!3508
2020-12-10 04:48:22 +00:00
friarsol
b96c974d3a Update edition files to only use Set cards sheets 2020-12-09 23:04:25 -05:00
Anthony Calosa
c9fc6dbc92 Merge branch 'colorsCtrlFix' into 'master'
CardFactoryUtil: make ColorsCtrl only check the players battlefield

See merge request core-developers/forge!3507
2020-12-09 13:06:50 +00:00
Hans Mackowiak
3d55e4704a CardFactoryUtil: make ColorsCtrl only check the players battlefield 2020-12-09 13:08:43 +01:00
Michael Kamensky
68508f9456 Merge branch 'lathril' into 'master'
KHM: lathril_blade_of_the_elves.txt

See merge request core-developers/forge!3504
2020-12-09 04:54:21 +00:00
Michael Kamensky
beb214b0a2 Merge branch 'chosennumber' into 'master'
add chosen number to card detail pane

Closes #1668

See merge request core-developers/forge!3505
2020-12-09 04:54:04 +00:00
Hans Mackowiak
a401a35bec Merge branch 'fix' into 'master'
living_hive.txt add CombatDamage$ True

See merge request core-developers/forge!3503
2020-12-08 17:50:00 +00:00
Northmoc
f6ddda9b38 add chosen number to card detail pane 2020-12-08 08:30:12 -05:00
Northmoc
ff9b21c1e5 lathril_blade_of_the_elves.txt 2020-12-08 07:31:27 -05:00
Northmoc
b26bba5b03 living_hive.txt add CombatDamage$ True 2020-12-08 07:30:18 -05:00
Anthony Calosa
d78327383d Merge branch 'master' into 'master'
Fix ChangeZoneAllEffect LTB triggers

Closes #887

See merge request core-developers/forge!3502
2020-12-08 11:21:59 +00:00
Anthony Calosa
c9dab9c1d0 Fix ChangeZoneAllEffect LTB triggers
- fix Animate Dead + Worldgorger Dragon Combo

Closes #887
2020-12-08 19:21:01 +08:00
Michael Kamensky
635bb53f11 Merge branch 'master' into 'master'
Fix imports.

See merge request core-developers/forge!3501
2020-12-08 07:58:19 +00:00
Michael Kamensky
04ccb1d106 - Fix imports. 2020-12-08 10:57:34 +03:00
Michael Kamensky
f5b7d6d893 Merge branch 'master' into 'master'
Basic AI logic components for Raiding Party.

See merge request core-developers/forge!3500
2020-12-08 07:53:24 +00:00
Michael Kamensky
63beb045f9 - Basic AI logic components for Raiding Party. 2020-12-08 10:51:39 +03:00
Michael Kamensky
37149d43e9 Merge branch 'raiding' into 'master'
Raiding Party! Preferred Selection!

Closes #92 and #98

See merge request core-developers/forge!3493
2020-12-08 07:04:10 +00:00
Michael Kamensky
9a6f084fe7 Merge branch 'downgrade-miglayout' into 'master'
Miglayout 5+ breaks quest WinLoseView

See merge request core-developers/forge!3499
2020-12-08 06:57:24 +00:00
friarsol
3eaf694ca9 Miglayout 5+ breaks quest WinLoseView 2020-12-07 22:05:28 -05:00
Tim Mocny
6fff0ffb02 Merge branch 'migratecmr' into 'master'
migrate CMR (and un stuff that was put in Upcoming)

See merge request core-developers/forge!3497
2020-12-08 00:55:17 +00:00
Northmoc
8e40a9dd23 migrate CMR and un stuff that was put in Upcoming 2020-12-07 19:54:11 -05:00
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