Commit Graph

24690 Commits

Author SHA1 Message Date
Anthony Calosa
eac869f389 Merge branch 'master' into newmaster2 2023-03-15 00:42:37 +08:00
Anthony Calosa
a41a3916de update Achievement Trophies
- use PaperCard images as overlay if available for Achievement Trophies
2023-03-15 00:27:49 +08:00
paulsnoops
424e16da50 Formats: Fix Explorer and Arena Standard 2023-03-14 14:10:31 +00:00
Anthony Calosa
ed8728f921 Merge pull request #2677 from Card-Forge/mulligan-bypass
Speed up London Mulligan when you just want to mulligan again.
2023-03-14 18:20:49 +08:00
Anthony Calosa
3909050415 update 2023-03-14 17:56:51 +08:00
Anthony Calosa
7de13c38cf Merge pull request #2675 from kevlahnota/newmaster2
update deck award
2023-03-14 07:17:25 +08:00
Anthony Calosa
c80929663e update deck award 2023-03-14 07:15:56 +08:00
paulsnoops
507a1a0b57 LTR: nothing to see here (or maybe a typo) 2023-03-13 17:41:01 +00:00
paulsnoops
04dcdf524b New edition: LTR 2023-03-13 17:33:01 +00:00
tool4ever
6eb724c2f4 Fix illegal target (#2670)
Co-authored-by: TRT <>
2023-03-13 15:11:28 +03:00
Simisays
bbb42f5546 Update tawnoss_tinkering.txt (#2671) 2023-03-13 12:19:54 +01:00
Anthony Calosa
8c0cc9468e Merge pull request #2662 from tool4ever/undocheat
Anti-Cheat: fix refunding wrong mana
2023-03-13 11:06:32 +08:00
Simisays
39f3a57e96 three alchemy fixes (#2667) 2023-03-12 22:08:01 +00:00
pfirpfel
0045905e15 Fallaji Antiquarian: Fix trigger 2023-03-12 20:10:23 +01:00
tool4EvEr
3f79414431 Fix script 2023-03-12 17:10:29 +01:00
Anthony Calosa
97bb4d0fbb update PlayerStatisticScene
- add toggable Achievements buttons (Shared with Constructed GameType except variants)
- set avatar to stretch (to match different scaling)
- fix Ooze avatar region
2023-03-12 21:07:56 +08:00
tool4EvEr
f59ad77a4d Maven: relocate platform-specific dependency 2023-03-11 09:13:51 +01:00
Anthony Calosa
a807d74744 refactor texture loading
- move loading of textures directly to assetmanager
- move textratypist to gui-mobile
2023-03-11 04:00:15 +08:00
jjayers99
a6530249c9 Merge branch 'master' of https://github.com/jjayers99/forge 2023-03-09 22:56:08 -05:00
jjayers99
5ef4c37cb8 Adv: Additional Challenger enemy decks 2023-03-09 22:55:57 -05:00
Anthony Calosa
a8733ed6a5 Merge pull request #2650 from jjayers99/master
Adventure updates
2023-03-10 09:55:56 +08:00
Anthony Calosa
cd3a14d9ad Merge pull request #2648 from Simisays/KIORABRANCH
Kiora Island Collision Fix
2023-03-10 09:54:01 +08:00
Anthony Calosa
7de1495049 Merge pull request #2649 from tool4ever/clean93
Some cleanup
2023-03-10 09:53:04 +08:00
jjayers99
8675affd01 Sprite fix 2023-03-09 17:50:29 -05:00
jjayers99
5e1d6da8db Adv: New enemies, sprite corrections 2023-03-09 17:18:37 -05:00
tool4EvEr
b7105e1ee9 Some cleanup 2023-03-09 22:43:50 +01:00
jjayers99
791270575a Adventure mode: new enemy sprite 2023-03-09 16:02:49 -05:00
Simisays
d5a15fb14e update 2023-03-09 20:07:55 +01:00
tool4ever
439cb39c96 Update zopandrel_hunger_dominus.txt 2023-03-09 15:34:31 +00:00
Simisays
7018d415c2 update 2023-03-09 15:42:07 +01:00
Michael Kuenzli
69272b963c Add alchemy draft formats (#2628)
* Add new rarity slot used by Alchemy sets

* Make Alchemy: New Capenna draftable

* Make Alchemy: Phyrexia draftable

* Make Alchemy: The Brothers' War draftable

* Make Alchemy: Kamigawa draftable

* Make Alchemy: Dominaria draftable
2023-03-09 12:40:55 +03:00
Hans Mackowiak
e786b4bed5 Update kinzu_of_the_bleak_coven.txt
Fix AddKeywords
2023-03-09 08:28:51 +01:00
friarsol
53957d5abf Speed up London Mulligan when you just want to mulligan again. 2023-03-08 23:07:18 -05:00
Anthony Calosa
ff2fe7fcb9 downscale XLHQ custom cards
- prevent crashes for mobile devices with weak GPU or low RAM
2023-03-09 06:48:19 +08:00
Anthony Calosa
7c9982f8eb Merge pull request #2644 from tool4ever/makeanexample
Fix Make an Example
2023-03-09 06:10:09 +08:00
jjayers99
5977cc2e83 Collision fixes
Added new tileset for buildings.png, buildings-nocollide.tsx. This tileset will automatically use the same buildings.png image, but the intent is to never add collision mapping to this tileset so that all tiles are fully passable for background images.
2023-03-08 15:32:11 -05:00
jjayers99
b0afe27fdd Revert "Adventure: moving empty houses out of collision layers"
This reverts commit 98a89a638d.
2023-03-08 10:35:35 -05:00
TabletopGeneral
e03c871701 Merge branch 'Card-Forge:master' into master 2023-03-08 09:59:54 -05:00
jjayers99
98a89a638d Adventure: moving empty houses out of collision layers 2023-03-08 09:59:06 -05:00
Anthony Calosa
6a173f688f update scrollable tables
- can use mouse wheel if availble to scroll
2023-03-08 21:04:03 +08:00
jjayers99
2cf3f508fb Merge branch 'master' of https://github.com/jjayers99/forge 2023-03-08 07:11:35 -05:00
tool4EvEr
798bce389c Fix Make an Example 2023-03-08 11:54:58 +01:00
Paul Hammerton
6f5475d9e0 Merge pull request #2642 from JohnWilliams77/patch-80
Update Secret Lair Drop Series.txt
2023-03-08 10:00:05 +00:00
Anthony Calosa
64c920421b update SaveLoadScene, InventoryScene
- fix layout, add table header and scrollable content
- update textratypist
2023-03-08 17:20:58 +08:00
JohnWilliams77
f56580598e Update Secret Lair Drop Series.txt 2023-03-08 09:03:44 +00:00
jjayers99
24f585f0a8 Adventure - New red boss dungeon, waypoint tools
A few further changes are planned for new dungeon, but needed to actually do a check-in at some point...
2023-03-07 22:11:33 -05:00
Anthony Calosa
7994ca1aaa Merge pull request #2639 from EldritchBimbo/Gwyn-Master
Playable Phyrexians Update
2023-03-08 07:24:05 +08:00
Alwayssnarky
b279d9f127 Playable Phyrexians Update
SIMPLE CHANGES
.Adds playable Phyrexian race. (On parity with existing. 20 portraits, 2 sprite animation sets.)

DETAILED CHANGES
.Adds 4 files for png and atlas of new sprites.
.Adds 20 portraits to avatar.png
.Alters avatar.atlas and heroes.json to utilize new files.
2023-03-07 17:56:21 -05:00
Simisays
6b5f77040f Update scarecrowcaptain.png 2023-03-07 23:13:34 +01:00
Simisays
09d8665b5b update 2023-03-07 23:10:02 +01:00