Commit Graph

62683 Commits

Author SHA1 Message Date
Anthony Calosa
58f852076c Merge pull request #2449 from Card-Forge/flashbackCastKeyword
Flashback: use castKeyword
2023-02-13 08:37:38 +08:00
Anthony Calosa
b000ba19da fix playerpanel not applying name to slot 2023-02-13 08:28:27 +08:00
Simisays
6a8f80d2c7 update 2023-02-12 23:21:39 +01:00
Anthony Calosa
702075769a Merge pull request #2460 from kevlahnota/newmaster2
Minor adjustments
2023-02-13 06:00:43 +08:00
Anthony Calosa
9eafccf1d2 update deckaward icons 2023-02-13 05:50:18 +08:00
tool4EvEr
26bcf9bb5e Fix pay while phased out (e.g Reality Ripple after Junk Golem trigger) 2023-02-12 22:45:58 +01:00
Anthony Calosa
23fc8e1c93 fix item tooltip shard spacing 2023-02-13 05:39:56 +08:00
tool4EvEr
bd7dfb8a27 Clean script 2023-02-12 21:21:58 +01:00
Hans Mackowiak
4734b02c02 ReplacementHandler: found better way to Prevent StackOverflow for Riot 2023-02-12 20:03:11 +01:00
Anthony Calosa
c907f98ce6 Merge pull request #2459 from kevlahnota/newmaster2
update exit to worldmap
2023-02-13 01:40:32 +08:00
Anthony Calosa
8e0de8f4ba update Item tooltips 2023-02-13 01:35:50 +08:00
Anthony Calosa
30aeac257c unused import 2023-02-13 01:04:52 +08:00
Anthony Calosa
4489549a7b Merge branch 'master' into newmaster2 2023-02-13 01:04:29 +08:00
Anthony Calosa
c07697bdae update exit to worldmap 2023-02-13 00:51:58 +08:00
Hans Mackowiak
77dc1a9356 ~ Fix handle Bestow 2023-02-12 17:11:30 +01:00
Hans Mackowiak
a9d95d55ee Revert setChangedCardKeywords 2023-02-12 15:21:53 +01:00
Hans Mackowiak
9d2ecfdeaa GameAction: Remove unneeded code 2023-02-12 15:20:08 +01:00
Simisays
db06e94ed6 update 2023-02-12 14:30:37 +01:00
Hans Mackowiak
3f7dc8db98 Card: setChangedCardKeywords should not copy when adding to stack 2023-02-12 13:09:30 +01:00
tool4EvEr
19b0365ab0 Support position 2023-02-12 12:33:23 +01:00
tool4EvEr
58fb2ba650 Clean up 2023-02-12 12:32:36 +01:00
tool4EvEr
71c14c00f0 Fix crash with Armory Automaton 2023-02-12 12:32:04 +01:00
Simisays
3faa64f290 Update ria_ivor_bane_of_bladehold.txt 2023-02-12 10:58:21 +01:00
Simisays
309f9b9cbf Update ria_ivor_bane_of_bladehold.txt 2023-02-12 10:50:01 +01:00
Simisays
5851dc984b Update ria_ivor_bane_of_bladehold.txt 2023-02-12 10:10:13 +01:00
Simisays
e065c2c6c6 update 2023-02-12 09:47:44 +01:00
Anthony Calosa
250f26c17b Merge pull request #2454 from kevlahnota/newmaster2
update map dialog
2023-02-12 09:32:59 +08:00
Anthony Calosa
822093ad51 update map dialog 2023-02-12 09:22:41 +08:00
Simisays
3a1a7e77c4 Update norns_decree.txt (#2453) 2023-02-11 21:17:28 +00:00
Simisays
0e666759be update 2023-02-11 22:12:20 +01:00
Anthony Calosa
edeb0b4a51 Merge pull request #2451 from Simisays/SLIMEFOOTBIS
Slimefoot miniboss adventure
2023-02-11 22:32:07 +08:00
Anthony Calosa
5bcc581d92 Update items.json 2023-02-11 22:29:22 +08:00
Anthony Calosa
f17ed7d472 Update enemies.json 2023-02-11 22:28:36 +08:00
Anthony Calosa
bb30cd767c Merge pull request #2452 from kevlahnota/newmaster2
fix text/effect/map layout
2023-02-11 22:26:38 +08:00
Anthony Calosa
98cffcd796 fix text/effect/map layout
- revert textratypist to 0.7.2 to fix effect/map dialog
- update GameHUD
2023-02-11 22:20:54 +08:00
Anthony Calosa
c513ad7b0a Merge pull request #2450 from Simisays/fix
Update forgehammer_centurion.txt
2023-02-11 22:19:44 +08:00
Simisays
0c6a4a0ce2 update 2023-02-11 13:40:55 +01:00
Simisays
f67bfee707 Update forgehammer_centurion.txt 2023-02-11 13:38:55 +01:00
Simisays
eab8b51cdd update 2023-02-11 13:15:24 +01:00
Simisays
f91e2676a7 update 2023-02-11 12:44:23 +01:00
Hans Mackowiak
c0a0da6604 TriggerEnlist: add Param for Goblin Morale Sergeant 2023-02-11 11:45:11 +01:00
Paul Hammerton
f7abbdd359 Migrate upcoming scripts in preparation for ONE release (#2448) 2023-02-11 13:15:45 +03:00
Hans Mackowiak
007f9dc880 Flashback: use castKeyword 2023-02-11 10:07:39 +01:00
Anthony Calosa
faea804e08 Merge pull request #2447 from Agetian/ai-conduitofworlds
Improve AI handling for Conduit of Worlds
2023-02-11 14:43:11 +08:00
Michael Kamensky
082babdc14 - Improve AI handling for Conduit of Worlds. 2023-02-11 08:41:00 +03:00
Anthony Calosa
d7b79507dd Update chiss_goria_forge_tyrant.txt 2023-02-11 13:40:03 +08:00
Anthony Calosa
ee49363a6e Merge pull request #2446 from kevlahnota/newmaster2
update TextraTypist
2023-02-11 12:32:17 +08:00
Anthony Calosa
e3426d15f2 update TextraTypist 2023-02-11 12:26:52 +08:00
Anthony Calosa
a96827a807 Merge pull request #2445 from kevlahnota/newmaster2
add toxic icon
2023-02-11 09:48:18 +08:00
Anthony Calosa
61b659294a add toxic icon 2023-02-11 09:42:21 +08:00