Commit Graph

59299 Commits

Author SHA1 Message Date
tool4EvEr
ecd3e66c5e Fixes 2022-08-11 19:15:01 +02:00
tool4EvEr
4ee0c40719 Clean up 2022-08-11 16:57:08 +02:00
tool4EvEr
772dfae275 payManaOptional fix 2022-08-11 16:56:45 +02:00
tool4ever
7e52459ed4 Merge pull request #1315 from Card-Forge/bondEffect
Bond effect cleanup
2022-08-11 16:52:41 +02:00
tool4ever
9478d7c3cd Merge pull request #1301 from Northmoc/ysnc_28
YSNC: back_alley_gardener.txt
2022-08-11 16:50:46 +02:00
tool4ever
538e9a48a4 Merge pull request #1302 from Northmoc/ysnc_9
YSNC - 9 Aug
2022-08-11 16:50:33 +02:00
Northmoc
7b507820ae Merge pull request #1295 from Suthro/master
HBG: Snowborn Simulacra
2022-08-11 10:06:28 -04:00
Anthony Calosa
4c356aa9f1 Merge pull request #1319 from TrueFuFLeaderG/adventure
Fixed chaosBattle doppelganger
2022-08-11 20:53:25 +08:00
Anthony Calosa
cc215499c5 cleanup 2022-08-11 20:47:49 +08:00
Anthony Calosa
3c186e38de Update DuelScene.java
fix avatar and player extra cards overwritten by blank effects.. (effect cards uses setcardsonbattlefields)
2022-08-11 20:43:05 +08:00
Grimm
acaec64078 Merge branch 'master' of https://github.com/Card-Forge/forge into adventure
 Conflicts:
	forge-gui-mobile/src/forge/adventure/scene/DuelScene.java
2022-08-11 13:15:57 +02:00
Grimm
618b272166 fixed Doppelgänger in chaos mode 2022-08-11 13:14:33 +02:00
Anthony Calosa
b2363f2cfb Merge pull request #1318 from kevlahnota/master
reverse check
2022-08-11 19:11:50 +08:00
Anthony Calosa
1d8dd61f26 reverse check
- prevent NPE
2022-08-11 18:51:06 +08:00
Anthony Calosa
158cd7760f Merge pull request #1317 from kevlahnota/master
revert multiplayer battle
2022-08-11 18:41:06 +08:00
Anthony Calosa
481d00bfc5 unused import 2022-08-11 18:37:16 +08:00
Anthony Calosa
05475a8339 revert multiplayer battle
- should fix crash when encountering doppelganger/copyplayerdeck AI
2022-08-11 18:30:55 +08:00
Anthony Calosa
93e18656c1 Update AiController.java (#1314)
- closes #1313
2022-08-11 11:57:41 +03:00
Suthro
83b58df1be Update snowborn_simulacra.txt 2022-08-11 00:44:38 -05:00
Hans Mackowiak
78ada14de6 More Options for AI 2022-08-11 06:57:27 +02:00
Hans Mackowiak
cd6e322c7c Player.isInGame 2022-08-11 06:57:27 +02:00
Hans Mackowiak
840bf26065 BondEffect: update 2022-08-11 06:57:27 +02:00
Anthony Calosa
7535a72ecd Merge pull request #1290 from tool4ever/delayTrig
Fix some bugs related to delayed triggers
2022-08-11 08:33:14 +08:00
Anthony Calosa
08f039fc65 Merge pull request #1304 from Northmoc/wulfgar
StaticAbilityPanharmonicon support ValidCause for Wulfgar
2022-08-11 08:27:42 +08:00
Anthony Calosa
9e554c466d Merge pull request #1305 from Northmoc/totem
grinning_totem.txt refactor
2022-08-11 08:26:43 +08:00
Anthony Calosa
2ed2147e33 Merge pull request #1306 from Northmoc/memories
Distant Memories refactor and related
2022-08-11 08:26:23 +08:00
Anthony Calosa
3cc7e79ec0 Merge pull request #1312 from Northmoc/waylay
waylay.txt fixup
2022-08-11 08:25:12 +08:00
Northmoc
a7cd792626 waylay.txt fixup 2022-08-10 15:43:11 -04:00
Northmoc
125f9d2567 use ReplacementResult$ Updated 2022-08-10 15:03:17 -04:00
Northmoc
c26d51e2fe StaticAbilityPanharmonicon remove unneeded checks 2022-08-10 14:53:29 -04:00
Northmoc
152418976a grinning_totem.txt fix the bad stuff 2022-08-10 13:05:50 -04:00
Paul Hammerton
98b836cee4 Merge pull request #1311 from paulsnoops/sld_update
SLD edition update
2022-08-10 15:21:53 +01:00
paulsnoops
2eb1bd0fe9 SLD edition update 2022-08-10 15:18:09 +01:00
Anthony Calosa
a20b2c2854 Merge pull request #1310 from kevlahnota/master
prevent startup crash adventure (ExceptionInInitializerError)
2022-08-10 21:35:32 +08:00
Anthony Calosa
e4560f3714 prevent startup crash adventure (ExceptionInInitializerError)
- if not using classpath, it will fail to get the fallback_skin hidden inside the jar, to prevent crash use dummy instead;
2022-08-10 21:29:20 +08:00
Anthony Calosa
0d699b9e83 Merge pull request #1309 from kevlahnota/master
Add progressbar on adventure loading transition
2022-08-10 19:58:54 +08:00
Anthony Calosa
112a2ce18f unused imports 2022-08-10 19:35:48 +08:00
Anthony Calosa
9209c64399 Add progressbar on adventure loading transition 2022-08-10 19:31:53 +08:00
Anthony Calosa
8653f57b04 Merge pull request #1308 from kevlahnota/master
match color identity for random deck in chaos mode
2022-08-10 12:45:26 +08:00
Anthony Calosa
d38b82867a unused imports 2022-08-10 12:34:40 +08:00
Anthony Calosa
e5a2d6a054 match color identity for random deck in chaos mode
- update colorid selector if chaos mode is chosen
2022-08-10 12:32:15 +08:00
Anthony Calosa
6d67e87903 Merge pull request #1307 from kevlahnota/master
update DeckProxy
2022-08-10 09:20:37 +08:00
Anthony Calosa
6762756f83 update DeckProxy
- replaced easystarter to custom since it is using definition from JSON now on adventure
2022-08-10 09:15:07 +08:00
Anthony Calosa
d96bbfe450 Merge pull request #1299 from TrueFuFLeaderG/adventure
Adventure starting deck rework
2022-08-10 08:55:27 +08:00
Northmoc
cb8c9694b5 ChooseGenericEffectAi match Sin Prodder logic to new UI 2022-08-09 19:55:27 -04:00
Northmoc
b04b1b89d3 sin_prodder.txt shouldn't use Mill 2022-08-09 19:51:40 -04:00
Northmoc
836ab10c90 nature_demands_an_offering.txt "UnImprint" > "Unimprint" 2022-08-09 19:47:38 -04:00
Northmoc
3b8d335023 sin_prodder.txt tighten up UI 2022-08-09 19:47:15 -04:00
Northmoc
555257c448 distant_memories.txt refactor like Sin Prodder 2022-08-09 19:46:59 -04:00
Northmoc
0ebb717057 grinning_totem.txt refactor 2022-08-09 19:21:06 -04:00