Commit Graph

58674 Commits

Author SHA1 Message Date
Anthony Calosa
c4fd16a67f Merge pull request #1140 from kevlahnota/master
refactor Assets
2022-07-19 12:34:32 +08:00
Anthony Calosa
7cc6ee18fd Update ImageCache.java 2022-07-19 12:17:44 +08:00
Anthony Calosa
e14afcc1aa unused import 2022-07-19 12:08:54 +08:00
Anthony Calosa
80a48b7c2c refactor Assets
- modify fps display to show card images re/loaded
- also restore basicland rewards
2022-07-19 11:36:00 +08:00
Anthony Calosa
5f4c2fbf12 Merge pull request #1130 from tool4ever/untilHostLeavesPlay
Simultaneous untilHostLeavesPlay trigger
2022-07-19 11:11:45 +08:00
Anthony Calosa
8ce3b8921b Merge pull request #1139 from Card-Forge/saveInTowns
Allow saving from towns.
2022-07-19 11:11:21 +08:00
Paul Hammerton
a184035391 Merge pull request #704 from Suthro/master
CLB: Nine-Fingers Keene
2022-07-18 07:52:24 +01:00
friarsol
121f7d8012 Allow saving from towns.
If you save from a town, make sure to restore the town as the current scene
2022-07-17 22:48:26 -04:00
Anthony Calosa
001bd07c94 Merge pull request #1135 from tool4ever/cleancards
Cleanup cards
2022-07-18 06:07:08 +08:00
Anthony Calosa
cc935575d2 Merge pull request #1133 from Card-Forge/kevlahnota-patch-3
Create storm_kings_thunder.txt
2022-07-18 05:55:26 +08:00
Anthony Calosa
523c3da134 Merge pull request #1132 from Card-Forge/kevlahnota-patch-2
Create mahadi_emporium_master.txt
2022-07-18 05:55:07 +08:00
Suthro
fadabfa8f9 Update tasha_unholy_archmage.txt 2022-07-17 15:16:43 -05:00
tool4EvEr
c307cab789 Elminster fix 2022-07-17 22:10:06 +02:00
tool4EvEr
f940a24805 Cleanup cards 2022-07-17 21:38:48 +02:00
Anthony Calosa
729a81aab6 Update mahadi_emporium_master.txt 2022-07-18 00:04:46 +08:00
Anthony Calosa
9a6e1a886f Create storm_kings_thunder.txt 2022-07-17 18:46:42 +08:00
Anthony Calosa
7ec729fa08 Create mahadi_emporium_master.txt
closes #687
2022-07-17 18:24:36 +08:00
Suthro
a31fa11e42 Delete cliffgate.txt 2022-07-16 09:52:30 -05:00
Suthro
5524b5919c Delete citadel_gate.txt 2022-07-16 09:52:18 -05:00
tool4ever
809e2f256e Fix NPE (#1131)
* Fix NPE

* Cleanup
2022-07-16 08:56:31 +00:00
Suthro
4ab1b17bf6 Update tasha_unholy_archmage.txt 2022-07-15 16:40:40 -05:00
Suthro
6a8522767b Update tasha_unholy_archmage.txt 2022-07-15 16:00:26 -05:00
Suthro
3f789e76fe Update navigation_orb.txt 2022-07-15 12:40:00 -05:00
Suthro
b0e04da69c Update navigation_orb.txt 2022-07-15 12:38:20 -05:00
Suthro
e71c1571c3 Update tasha_unholy_archmage.txt 2022-07-15 12:28:39 -05:00
TRT
ae1861691a Simultaneous untilHostLeavesPlay trigger 2022-07-15 18:12:15 +02:00
Agetian
f44bb44e0f - Added puzzles PS_SNC3 - PS_SNC5. (#1129) 2022-07-15 18:12:15 +03:00
Anthony Calosa
4fc25d57a0 Merge pull request #1126 from tool4ever/stateTrig
Fix multiple state trigger
2022-07-15 17:43:51 +08:00
tool4EvEr
4fb84a1045 Fix multiple state trigger 2022-07-15 08:48:58 +02:00
Anthony Calosa
d8519d372c Merge pull request #1127 from churrufli/master
Net Deck Archive Updates
2022-07-15 11:35:55 +08:00
Churrufli
7cc5b51000 Merge branch 'master' of https://github.com/Card-Forge/forge 2022-07-15 00:33:02 +02:00
Churrufli
5bba608965 Net Deck Archive Updates 2022-07-15 00:29:52 +02:00
Anthony Calosa
da7f63d951 Merge pull request #1087 from Northmoc/clb_9
CLB: 9 July
2022-07-15 03:37:31 +08:00
Anthony Calosa
612714aca5 Update jade_orb_of_dragonkind.txt 2022-07-15 03:28:41 +08:00
Anthony Calosa
2a37888748 Update jade_orb_of_dragonkind.txt 2022-07-15 03:10:44 +08:00
Anthony Calosa
3532cbec3f Merge pull request #1123 from tool4ever/trigfix
Fix copied trigger not resetting numberTurnActivations
2022-07-15 01:47:29 +08:00
Anthony Calosa
5b39471fe6 Merge pull request #1124 from kevlahnota/master
(Adventure) Double Tap Avatar to show Menu buttons
2022-07-15 01:46:16 +08:00
Anthony Calosa
c05ea97822 update controls 2022-07-15 01:01:41 +08:00
Anthony Calosa
02f7b7f383 make avatar semi transparent inside tiledmap 2022-07-15 00:48:02 +08:00
Anthony Calosa
462c20af86 (Adventure) Double Tap Avatar to show Menu buttons
- useful for Android devices without navigation buttons (back key to show menu by default)
(Gesture detections like Edge detection needs AppCompatActivity which is missing on Forge Android)
2022-07-15 00:35:44 +08:00
tool4EvEr
acf0670b76 Use ActivationTable for triggers with Limit 2022-07-14 17:55:39 +02:00
tool4EvEr
30819f2ad1 Fix copied trigger not resetting numberTurnActivations 2022-07-14 16:28:49 +02:00
Anthony Calosa
d962d20fd9 Merge pull request #1076 from tool4ever/charming
Make charm choices of triggers for each while it gets added to stack, not before
2022-07-14 14:33:42 +08:00
Anthony Calosa
e0e95c689e Merge pull request #1106 from tool4ever/REfix
LastState: pass through from GameAction into ReplacementHandler & performance fixes
2022-07-14 14:30:09 +08:00
Anthony Calosa
f379fb7725 Merge pull request #1120 from CCTV-1/master
Updated simplified chinese translation
2022-07-14 14:24:21 +08:00
Anthony Calosa
50b9a04caf Merge pull request #1121 from kevlahnota/master
Support for preferred Skin sleeves
2022-07-14 14:23:58 +08:00
Anthony Calosa
26d906a89a Support for preferred Skin sleeves 2022-07-14 14:12:45 +08:00
CCTV-1
b4751cdc61 translate new setting texts. 2022-07-14 12:12:09 +08:00
Anthony Calosa
70fe578262 Merge pull request #1112 from xaviermd/CardScript--CLB--Marching-Duodrone--and--Lantern-of-Revealing
Card scripts for Lantern of Revealing and Marching Duodrone
2022-07-14 08:27:54 +08:00
tool4ever
14d7c0fb11 Fix NPE when copying spell with failed targeting (#1118)
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
2022-07-13 20:56:48 +03:00