Commit Graph

63078 Commits

Author SHA1 Message Date
Anthony Calosa
b88cd6c2e9 papercard images as fallback 2023-03-15 01:06:29 +08:00
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
Paul Hammerton
f5d046370f Merge pull request #2681 from paulsnoops/fix_formats
Formats: Fix Explorer and Arena Standard
2023-03-14 14:17:50 +00:00
paulsnoops
424e16da50 Formats: Fix Explorer and Arena Standard 2023-03-14 14:10:31 +00:00
Anthony Calosa
4576efc52f Merge pull request #2680 from Card-Forge/newmaster2
Fix old theme Splashscreen and Logo
2023-03-14 19:06:22 +08:00
Anthony Calosa
ecd8e4fd3d Merge pull request #2679 from kevlahnota/newmaster2
Fix old theme splashscreen and logo
2023-03-14 19:03:45 +08:00
Anthony Calosa
9d9103709d update check 2023-03-14 19:02:09 +08:00
Anthony Calosa
356cd2c908 fix old theme splashscreen and logo
- themes without hd skins should load fine now
2023-03-14 18:53:18 +08: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
adaae8d06e Merge pull request #2678 from kevlahnota/newmaster2
fix dialog voiceFile not playing on Android
2023-03-14 18:20:35 +08:00
Anthony Calosa
3909050415 update 2023-03-14 17:56:51 +08:00
Anthony Calosa
87f2b11341 fix dialog voiceFile not playing on Android 2023-03-14 15:59:23 +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
tool4ever
812f4062dd Fix undo when it gets cleared during payment (#2674) 2023-03-13 22:06:49 +00:00
Paul Hammerton
92b210b1da Merge pull request #2673 from paulsnoops/oops
LTR: nothing to see here (or maybe a typo)
2023-03-13 17:44:02 +00:00
paulsnoops
507a1a0b57 LTR: nothing to see here (or maybe a typo) 2023-03-13 17:41:01 +00:00
Paul Hammerton
a690234bab Merge pull request #2672 from paulsnoops/add_ltr_edition
New edition: LTR
2023-03-13 17:38:32 +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
50e15de07f Merge pull request #2668 from kevlahnota/newmaster2
update AudioClip, AudioMusic
2023-03-13 11:19:06 +08: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
Anthony Calosa
205fe95129 update AudioClip, AudioMusic
- let AssetManager handle game audio
- unload particles and music after playing it to save RAM
2023-03-13 10:29:25 +08:00
Simisays
39f3a57e96 three alchemy fixes (#2667) 2023-03-12 22:08:01 +00:00
Anthony Calosa
5e78431d18 Merge pull request #2665 from pfirpfel/fix-Fallaji-Antiquarian
Fallaji Antiquarian: Fix trigger
2023-03-13 03:44:34 +08:00
pfirpfel
0045905e15 Fallaji Antiquarian: Fix trigger 2023-03-12 20:10:23 +01:00
tool4EvEr
cf4f6f7f49 Clean up 2023-03-12 17:20:22 +01:00
tool4EvEr
3f79414431 Fix script 2023-03-12 17:10:29 +01:00
tool4EvEr
419c66daa5 Anti-Cheat: fix refunding wrong mana 2023-03-12 16:37:10 +01:00
Anthony Calosa
0b12cc5340 Merge pull request #2661 from kevlahnota/newmaster2
update PlayerStatisticScene
2023-03-12 21:11:54 +08: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
Anthony Calosa
453a704afa Merge pull request #2660 from kevlahnota/newmaster2
refactor FSkin Texture loading
2023-03-12 07:27:10 +08:00
Anthony Calosa
2a82a51fab move ParticleEffect load to AssetManager 2023-03-12 07:19:57 +08:00
Anthony Calosa
63fedcdd81 cleanup 2023-03-11 22:42:35 +08:00
Anthony Calosa
683f004f84 refactor FSkin Texture loading
- this should clear up unused texture
- fix startup on empty res/skins folder
2023-03-11 21:50:10 +08:00
Anthony Calosa
fa48fcd336 Merge pull request #2659 from tool4ever/poms
Maven: relocate platform-specific dependency
2023-03-11 18:15:21 +08:00
tool4EvEr
f59ad77a4d Maven: relocate platform-specific dependency 2023-03-11 09:13:51 +01:00
Anthony Calosa
c826a1c029 Merge pull request #2658 from Card-Forge/revert-2657-newmaster2
Revert "update initial skin texture load"
2023-03-11 14:25:20 +08:00
Anthony Calosa
ef1b089d49 Revert "update initial skin texture load" 2023-03-11 14:22:25 +08:00
Anthony Calosa
180ba40cc8 Merge pull request #2657 from kevlahnota/newmaster2
update initial skin texture load
2023-03-11 11:45:20 +08:00
Anthony Calosa
bc3185a0cc update initial skin texture load
- directly create texture if absolute path is not available
- dispose overridden texture
2023-03-11 11:39:55 +08:00
Anthony Calosa
c9602147b9 Merge pull request #2655 from kevlahnota/newmaster2
fix old themes without hdbuttons and hdstart
2023-03-11 05:45:35 +08:00
Anthony Calosa
2d4ec54562 fix old themes without hdbuttons and hdstart 2023-03-11 05:41:54 +08:00
Anthony Calosa
1f12b0dee8 Merge pull request #2654 from Card-Forge/refactorTexture
refactor texture loading
2023-03-11 04:17:22 +08: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
Anthony Calosa
5ce27717ac Merge pull request #2653 from kevlahnota/newmaster2
fix EnemyData loading issues
2023-03-10 14:18:19 +08:00
Anthony Calosa
3991b6d081 fix EnemyData loading issues 2023-03-10 14:12:02 +08:00
Anthony Calosa
1f908465d5 Merge pull request #2620 from Card-Forge/rebalancedFormatCheck
GameFormat: filter Rebalanced cards
2023-03-10 13:09:10 +08:00