Commit Graph

63459 Commits

Author SHA1 Message Date
Simisays
39f3a57e96 three alchemy fixes (#2667) 2023-03-12 22:08:01 +00:00
Simisays
be2a8ad8e0 update 2023-03-12 22:41:26 +01: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
Simisays
1c12d79f52 update 2023-03-11 19:53:27 +01: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
Simisays
112284f495 update 2023-03-11 09:30:58 +01: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
Simisays
d1dbe7924f Merge remote-tracking branch 'upstream/master' into XIRAA 2023-03-10 13:19:15 +01:00
Simisays
70e65a8619 update 2023-03-10 13:16:50 +01: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
Anthony Calosa
1ac2b9aa9f Merge pull request #2652 from jjayers99/master
Adventure - Additional Challenger decks
2023-03-10 13:08:45 +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
c97489fedf Merge pull request #2651 from kevlahnota/newmaster2
fix particle effect initial position
2023-03-10 09:59:31 +08: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
Anthony Calosa
5748d09b54 fix particle effect initial position
- move the offset calculation inside MapActor
2023-03-10 09:18:43 +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
Simisays
4418f79f97 update 2023-03-09 15:32:30 +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
51942b276c Merge pull request #2647 from kevlahnota/newmaster2
downscale XLHQ custom cards
2023-03-09 06:56:12 +08:00