Anthony Calosa
ff88a2b940
Merge pull request #2722 from kevlahnota/newmaster2
...
Fix Android Music, Add flip_card sfx
2023-03-21 22:20:44 +08:00
Anthony Calosa
442699380c
Update GameEventCardStatsChanged.java
2023-03-21 22:16:41 +08:00
Anthony Calosa
94be6a7e48
..
2023-03-21 22:09:45 +08:00
Anthony Calosa
865d228cb2
Fix Android Music, Add flip_card sfx
...
- fix secondary music not playing on Android (let assetmanager unload them on exit)
- fix MapDialog audio bgm fade
- add Flip sfx on RewardActor flip and transform setstate effect
2023-03-21 21:56:41 +08:00
Paul Hammerton
9bbed6df08
Merge pull request #2721 from paulsnoops/fix_mom
...
Editions: Small fixes for MOM & MOC
2023-03-21 10:21:44 +00:00
paulsnoops
ab0d9a13f0
Editions: Small fixes
2023-03-21 10:17:15 +00:00
Anthony Calosa
08c69562e5
Merge pull request #2720 from kevlahnota/newmaster2
...
update check
2023-03-21 17:40:55 +08:00
Anthony Calosa
92c6bd1365
update check
2023-03-21 17:39:00 +08:00
Anthony Calosa
3632e37acc
Merge pull request #2719 from kevlahnota/newmaster2
...
update match loudness, fix playing music after match
2023-03-21 17:17:40 +08:00
Anthony Calosa
f9a347a68d
update match loudness, fix playing music after match
2023-03-21 17:15:55 +08:00
Northmoc
b4d2742f66
Seek effect + SeekAll trigger for new Arena stuff ( #2590 )
...
* trove_mage.txt refactor + support
* SeekEffect + SeekAll trigger initial
* SeekEffect better
* SeekEffect.getStackDescription basic
* more refactored
* gitrog_horror_of_zhava.txt needs ImprintFound
* 10 more refactors
* more
* SeekEffect fix bad imprint line
* SeekEffect fix better remember/imprint
* gitrog_horror_of_zhava.txt with Branch
* more cards
* last ones?
* SeekEffect tighten up based on Hanmac ver
* optimize imports
* fix param discrepancies
* SeekEffect tighten up
2023-03-21 11:58:23 +03:00
Anthony Calosa
d8356f61cb
Merge pull request #2718 from kevlahnota/newmaster2
...
prevent NPE
2023-03-21 16:16:08 +08:00
Anthony Calosa
bbd8e2eb61
prevent NPE
2023-03-21 16:15:18 +08:00
Anthony Calosa
0bdc435110
Update nahiris_boss_effect.txt
2023-03-21 15:55:42 +08:00
Anthony Calosa
155c197347
Merge pull request #2714 from kevlahnota/newmaster2
...
update BGM detection, update Arena Challenges for Hard/Insane
2023-03-21 15:32:04 +08:00
Anthony Calosa
b72d4abde6
Merge pull request #2717 from Card-Forge/MaxFromEffect
...
GameEntityCounterTable: respect MaxFromEffect for Clockwork
2023-03-21 15:25:07 +08:00
Anthony Calosa
51f1545722
update add boss battle BGM
2023-03-21 15:17:59 +08:00
tool4ever
1f13ce190e
Update faith_unbroken.txt
2023-03-21 07:55:49 +01:00
Hans Mackowiak
f166394db0
GameEntityCounterTable: respect MaxFromEffect for Clockwork
2023-03-21 07:39:19 +01:00
Anthony Calosa
a0e3949aab
update pause timing
2023-03-21 13:17:06 +08:00
Anthony Calosa
1190f40b55
update playlist selection
2023-03-21 07:20:21 +08:00
Anthony Calosa
bdaed72d2d
Merge branch 'master' into newmaster2
2023-03-21 07:09:10 +08:00
Anthony Calosa
e0493f1556
Merge pull request #2715 from Simisays/adventurebis
...
Xira's Hive collision improvements + removal horse overworld
2023-03-21 07:04:53 +08:00
Anthony Calosa
1ecede7726
Merge pull request #2716 from tool4ever/charmFix
...
Fix NPE when trying to build Charm description
2023-03-21 07:03:55 +08:00
Northmoc
acce156205
Merge pull request #2704 from paulsnoops/sir_draft
...
Booster Draft: SIR
2023-03-20 17:22:29 -04:00
tool4EvEr
348670776e
Clean up
2023-03-20 18:25:03 +01:00
tool4EvEr
84aef29d69
Fix NPE when trying to build Charm description
2023-03-20 18:24:32 +01:00
Simisays
652f799ec3
update
2023-03-20 18:23:34 +01:00
Anthony Calosa
2a22be944b
update BGM detection, update Arena Challenges for Hard/Insane
...
- still have the layer bug for the BGM since it's not boundary based, but tolerable atm, it must get the colored boundaries for accuracy
2023-03-20 20:24:26 +08:00
Hans Mackowiak
c5e52aab7d
AbilityUtils: add Convoked as DefinedCards ( #2710 )
2023-03-20 06:20:35 +01:00
Anthony Calosa
6978733fb0
Merge pull request #2712 from kevlahnota/newmaster2
...
fix JSON typos
2023-03-20 12:25:31 +08:00
Anthony Calosa
38a11a8bac
fix JSON typos
2023-03-20 12:24:56 +08:00
Anthony Calosa
85d549cb86
Merge pull request #2711 from kevlahnota/newmaster2
...
update missing music and rename custom card
2023-03-20 12:02:47 +08:00
Anthony Calosa
de300f9c00
update missing music and rename custom card
2023-03-20 12:01:55 +08:00
Anthony Calosa
33189271b1
Merge pull request #2709 from tool4ever/defile
...
Fix Defilers applying twice with MayPlay
2023-03-20 11:50:22 +08:00
Anthony Calosa
7600ec5492
Merge pull request #2705 from kevlahnota/newmaster2
...
update adventure BGM..
2023-03-20 11:50:03 +08:00
Anthony Calosa
b95226b031
Merge pull request #2698 from EldritchBimbo/Gwyn-Master
...
Adds 1 dungeon, 2 enemies based on the Machine Orthodoxy
2023-03-20 11:46:15 +08:00
Anthony Calosa
8fc22b9d02
Merge pull request #2692 from Simisays/XIRAA
...
Large Adventure update
2023-03-20 11:25:34 +08:00
Anthony Calosa
af88585695
Update tibalts_bag_of_tricks.txt
2023-03-20 11:14:14 +08:00
tool4EvEr
714baa47ee
Fix Defilers applying twice with MayPlay
2023-03-19 21:13:27 +01:00
tool4ever
25d2aa82b6
Bunch of fixes ( #2706 )
...
* Fix Tawnos's Coffin not using ETB counters
* Cost fix
* Saga tweaks
---------
Co-authored-by: tool4EvEr <tool4EvEr@192.168 .0.59>
2023-03-19 22:07:03 +03:00
tool4ever
7b78a2052d
Update karumonix_the_rat_king.txt
2023-03-19 18:58:57 +00:00
Hans Mackowiak
6b61d7fc7e
CardFactoryUtil: Read Ahead use DisableTriggers ( #2703 )
2023-03-19 18:34:47 +03:00
Hans Mackowiak
a4b52b4b40
Merge pull request #2699 from tool4ever/copycleanup
...
CardFactory: remove redundant copying
2023-03-19 15:14:12 +01:00
Anthony Calosa
1b7180a0f2
prevent NPE
2023-03-19 21:36:34 +08:00
Anthony Calosa
a91845c444
update
2023-03-19 21:03:51 +08:00
Simisays
149dc720f1
update
2023-03-19 13:42:30 +01:00
Anthony Calosa
1bc8abf7e1
update adventure BGM..
2023-03-19 19:16:51 +08:00
Simisays
40d4d9381b
sprite fixes for editor
2023-03-19 11:45:30 +01:00
paulsnoops
7962d0bfca
Booster Draft: SIR
2023-03-19 09:52:49 +00:00
