Commit Graph

63578 Commits

Author SHA1 Message Date
Anthony Calosa
6676d3bcd3 Merge pull request #2764 from kevlahnota/newmaster2
prevent NPE
2023-03-27 13:52:33 +08:00
Anthony Calosa
b9d55a9afa Merge branch 'master' into newmaster2 2023-03-27 13:51:32 +08:00
Anthony Calosa
0b3d2e8567 prevent NPE 2023-03-27 13:50:06 +08:00
Anthony Calosa
a656c60394 Merge pull request #2762 from rikimbo/adventure_printings_update
Adventure Mode: Update printings in decks
2023-03-27 13:33:03 +08:00
Anthony Calosa
0edc297334 Merge pull request #2761 from tool4ever/madfix
Madness fix
2023-03-27 13:32:52 +08:00
Anthony Calosa
a451cc8b54 Merge pull request #2763 from kevlahnota/newmaster2
fix blackscreen
2023-03-27 13:27:13 +08:00
Anthony Calosa
e5607167bb remove unused 2023-03-27 13:16:52 +08:00
Anthony Calosa
2b3042197d fix blackscreen
- some poi initial data are null so refactor how it parses the poi data to prevent blackscreen when the biome chunks are loaded
2023-03-27 13:07:09 +08:00
Eric Himbeault
79f268a6e9 Adventure: Update printings in decks to avoid online-only editions (if possible) and standardize frames. 2023-03-26 22:21:17 -05:00
tool4EvEr
9eb7f591dd Just let the KW handle it 2023-03-26 23:22:19 +02:00
Simisays
23bf195711 update 2023-03-26 22:08:43 +02:00
Simisays
60b0c6f660 update 2023-03-26 19:51:27 +02:00
Simisays
da890b1f43 update 2023-03-26 16:02:37 +02:00
Simisays
bb073f1d12 update 2023-03-26 16:00:34 +02:00
Anthony Calosa
c81d342382 Merge pull request #2746 from EldritchBimbo/Gwyn-Master
Gitaxian Dungeon, 2 Enemies
2023-03-26 21:35:03 +08:00
Anthony Calosa
2e27cf2388 Merge pull request #2759 from kevlahnota/newmaster2
update ManaShards event
2023-03-26 21:28:26 +08:00
Anthony Calosa
7a0732ca7a Merge pull request #2733 from Simisays/adventureupdatee
A bunch of new enemies + removal of giant crab + fix Kiora Island (squash merge)
2023-03-26 21:24:34 +08:00
Anthony Calosa
71a6d82d61 update ManaShards event 2023-03-26 21:17:38 +08:00
Anthony Calosa
35f6250843 Merge pull request #2758 from kevlahnota/newmaster2
refactor ManaShards
2023-03-26 19:46:33 +08:00
Anthony Calosa
68dc1fdce9 refactor ManaShards
- remove Mana Shards as countertype
2023-03-26 19:36:41 +08:00
Hans Mackowiak
1c510bac21 Update kuldotha_cackler.txt 2023-03-26 12:44:55 +02:00
Simisays
98805f9603 SLD 6 new DND cards (#2742)
* update

* update

* Update xenk_paladin_unbroken.txt

* Update doric_natures_warden_doric_owlbear_avenger.txt

* Update doric_natures_warden_doric_owlbear_avenger.txt

* update
2023-03-26 13:03:44 +03:00
Anthony Calosa
6c02c8033e Merge pull request #2757 from kevlahnota/newmaster2
prevent proliferate affecting manashards
2023-03-26 14:29:23 +08:00
Anthony Calosa
f18c525fe1 prevent proliferate affecting manashards 2023-03-26 14:22:54 +08:00
Anthony Calosa
f5ec35fe97 Update cavalier_of_thorns.txt 2023-03-26 13:36:53 +08:00
Anthony Calosa
0000ee13bb Update academy_rector.txt
typo
2023-03-26 13:35:11 +08:00
Anthony Calosa
2a0c36eaa1 Update TokenEffectBase.java
fix ConcurrentModificationException (anointed procession and divine visitation in play, then cast benevolent offering, then choose replacement effect divine visitation, hit ok)
2023-03-26 10:45:13 +08:00
Anthony Calosa
67bc3e1f98 Merge pull request #2756 from kevlahnota/newmaster2
dispose framebuffer
2023-03-26 08:16:07 +08:00
Anthony Calosa
c820e1c781 dispose framebuffer 2023-03-26 08:05:39 +08:00
Paul Hammerton
206d16ba74 Merge pull request #2754 from MikeS-NZ/forge_mom1
MOM: Wrenn and Realmbreaker
2023-03-25 23:26:05 +00:00
Mike S
6c266cda3e Update wrenn_and_realmbreaker.txt 2023-03-25 17:56:10 -05:00
Simisays
8d4e4b78cc Merge remote-tracking branch 'upstream/master' into adventureupdatee 2023-03-25 21:44:23 +01:00
Simisays
5129575b32 Update boar.atlas 2023-03-25 21:40:56 +01:00
Simisays
dfad28bf69 Update enemies.json 2023-03-25 21:37:08 +01:00
Simisays
c1bb2fad4b update 2023-03-25 21:36:07 +01:00
Anthony Calosa
e72c48afad Merge pull request #2755 from kevlahnota/newmaster2
refactor RewardActor
2023-03-26 04:33:53 +08:00
Suthro
ac2df214a3 MOM: Wrenn and Realmbreaker
MOM: Add script for showcased card Wrenn and Realmbreaker.

- Wrenn and Realmbreaker
2023-03-25 15:20:28 -05:00
Anthony Calosa
3ef54f55cb refactor RewardActor
- removed DrawOnPixmap
- use framebuffer to generate texture from item, gold, life, shards
2023-03-26 04:20:26 +08:00
Simisays
aa8fd48cd8 update 2023-03-25 20:51:11 +01:00
Anthony Calosa
d0dfc85d18 Merge pull request #2753 from kevlahnota/newmaster2
update PlayerStatisticScene, update filters
2023-03-26 03:00:37 +08:00
Anthony Calosa
dbbd0e21cc Merge branch 'master' into newmaster2 2023-03-26 02:56:21 +08:00
Anthony Calosa
c02c20851a remove duplicated code 2023-03-26 02:50:43 +08:00
Anthony Calosa
3de08f0308 update PlayerStatisticScene, update filters
- add active planaswalker achievements
- add Shards count
- use Textralabel region icon to render
- update textratypist
- update filter for hud elements, splash for adventure
2023-03-26 02:40:17 +08:00
Alwayssnarky
80cb519364 Fix to dungeon wall collision 2023-03-25 12:57:41 -04:00
Anthony Calosa
927e066179 Merge pull request #2752 from kevlahnota/newmaster2
add dungeon/cave indicator
2023-03-26 00:20:48 +08:00
Anthony Calosa
4b696957c7 Merge pull request #2748 from Simisays/anothertibaltfix
further improvements to tibalt dungeon
2023-03-26 00:13:49 +08:00
Anthony Calosa
0ff53ac197 Merge pull request #2751 from tool4ever/cleanup25
Fix some cards via cleanup
2023-03-26 00:13:05 +08:00
Anthony Calosa
ddd493f324 rename 2023-03-26 00:00:29 +08:00
Anthony Calosa
36572ac36d update position 2023-03-25 23:57:32 +08:00
Anthony Calosa
da082c0335 add dungeon/cave indicator
- adds signpost with magnifying glass indicates unexplored/unchanged poi
2023-03-25 23:37:53 +08:00