Commit Graph

59720 Commits

Author SHA1 Message Date
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
Northmoc
39db05f97a spelldrain_assassin.txt add AI hints 2022-08-09 19:18:32 -04:00
Northmoc
b2364ccce8 StaticAbilityPanharmonicon.applyPanharmoniconAbility support ValidCause for Wulfgar 2022-08-09 17:46:35 -04:00
Northmoc
231a85847e herald_of_vengeance.txt 2022-08-09 17:15:40 -04:00
Northmoc
da5d61307d brokers_safeguard.txt fix StackDesc 2022-08-09 17:12:14 -04:00
Northmoc
a7666c1c51 brokers_safeguard.txt 2022-08-09 17:08:58 -04:00
Northmoc
c921371667 teyo_aegis_adept.txt add Perpetual Effect name 2022-08-09 14:48:49 -04:00
Northmoc
d52ce4b810 diviner_of_fates.txt 2022-08-09 14:46:46 -04:00
tool4EvEr
3abd532216 Update TgtPrompt 2022-08-09 20:18:24 +02:00
Grimm
4bb9c37b92 removed unused list 2022-08-09 18:48:42 +02:00
Grimm
d1d65c7d57 removed unused list 2022-08-09 18:46:10 +02:00
Grimm
2ad0d598eb Added multiplayer fights 2022-08-09 18:38:43 +02:00
tool4ever
bed7321d65 Merge pull request #1296 from JohnWilliams77/patch-31
Update Love Your LGS 2022.txt
2022-08-09 18:32:00 +02:00
tool4ever
0b09a953a9 Merge pull request #1300 from Northmoc/tidy
Tidy up some old cards
2022-08-09 18:18:58 +02:00
Northmoc
5dac35ed66 winds_of_qal_sisma.txt streamline 2022-08-09 11:57:23 -04:00
Northmoc
0a900a5dbe dark_temper.txt remove weird TgtPrompt 2022-08-09 11:57:11 -04:00
Northmoc
fe57c69096 improve cards that care about certain planeswalker type 2022-08-09 11:56:25 -04:00
Northmoc
9b5115dd75 streamline sanctuary cycle 2022-08-09 11:55:24 -04:00
Grimm
eb33540143 Merge branch 'master' of https://github.com/Card-Forge/forge into adventure 2022-08-09 16:05:02 +02:00
Grimm
9402a15502 Adventure player reworked colorid to support multicolor 2022-08-09 16:04:30 +02:00
Grimm
af10670060 Merge branch 'master' of https://github.com/Card-Forge/forge into adventure
 Conflicts:
	forge-gui-mobile/src/forge/adventure/world/WorldSave.java
2022-08-09 13:50:01 +02:00
Anthony Calosa
8def90cd58 Merge pull request #1297 from kevlahnota/master
update newgame+
2022-08-09 19:48:11 +08:00
Grimm
70ef2a13a0 reworked starting deck to jumpstart, constructed or chaos
support localization in UIData and removed it from code (only NewGameScene for now)
2022-08-09 13:46:56 +02:00
Anthony Calosa
f93db8ce92 unused import 2022-08-09 19:43:18 +08:00
Anthony Calosa
cf1385666a update newgame+
- add highlight to difficulty selector
2022-08-09 19:37:52 +08:00
Grimm
c1a6313b1e reworked starting deck to jumpstart, constructed or chaos
support localization in UIData and removed it from code (only NewGameScene for now)
2022-08-09 13:33:06 +02:00
JohnWilliams77
b7657c60f4 Update Love Your LGS 2022.txt 2022-08-09 10:09:28 +01:00
Suthro
c3609fe625 Merge branch 'Card-Forge:master' into master 2022-08-08 22:55:18 -05:00
Suthro
ef74f5e288 HBG: Snowborn Simulacra 2022-08-08 22:54:37 -05:00
Northmoc
3c7d993982 big_spender.txt (#1294) 2022-08-09 06:54:00 +03:00
Anthony Calosa
e8745c3da2 Merge pull request #1293 from kevlahnota/master
reformat code
2022-08-09 09:27:44 +08:00
Anthony Calosa
c8073a333c reformat code
- fix color identity
- service pool is working good on android now so use it on generating map
2022-08-09 09:17:19 +08:00
Anthony Calosa
8f9e14cc05 Merge pull request #1292 from kevlahnota/master
fix loading world in android
2022-08-08 21:48:45 +08:00
Anthony Calosa
36e7687034 unused import 2022-08-08 21:43:11 +08:00
Anthony Calosa
790db23367 fix loading world in android 2022-08-08 21:40:13 +08:00