external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,548 Commits 31 Branches 187 Tags
73b1cb15c39e57a8cb235127eeec30a4634c53d2
Commit Graph

62548 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
73b1cb15c3 Merge pull request #2467 from Northmoc/stackDesc 
More (hopefully better) StackDesc tweaks
 2023-02-14 16:22:05 +08:00
Anthony Calosa
20638c6017 Merge pull request #2470 from Card-Forge/henzieBlitzReplacementFix 
ReplacementHandler: fix adding CastSA Keyword again
 2023-02-14 14:46:53 +08:00
Hans Mackowiak
4505762707 ReplacementHandler: fix adding CastSA Keyword again 2023-02-14 06:58:57 +01:00
Anthony Calosa
49d819c46b Merge pull request #2469 from kevlahnota/newmaster2 
update deckaward dialog
 2023-02-14 07:04:03 +08:00
Anthony Calosa
dbd0cbea27 update label 2023-02-14 06:57:28 +08:00
Anthony Calosa
bd1c0d65f7 update deckaward dialog 2023-02-14 06:41:07 +08:00
Anthony Calosa
85a717249f Merge branch 'master' into newmaster2 2023-02-14 06:40:44 +08:00
Northmoc
1003f8272f improve Fight stuff 2023-02-13 16:47:10 -05:00
Northmoc
998eecc923 SpellAbilityEffect better 2023-02-13 16:47:09 -05:00
Simisays
99b1f72700 Update unctuss_retrofitter.txt (#2468) 2023-02-13 20:34:38 +00:00
Anthony Calosa
aeb9c85f7d fix gamehud life color 2023-02-13 19:39:20 +08:00
Anthony Calosa
d794b95eaa Merge pull request #2441 from Northmoc/stackDesc 
messing with StackDescription building
 2023-02-13 18:41:04 +08:00
Anthony Calosa
1e066918b6 Merge pull request #2463 from kevlahnota/newmaster2 
fix TransitionScreen runnable
 2023-02-13 18:40:06 +08:00
Anthony Calosa
ea13491203 center text 2023-02-13 18:26:13 +08:00
Anthony Calosa
66f5ef5ca2 Merge pull request #2465 from Simisays/morefixes 
Update blade_of_shared_souls.txt
 2023-02-13 18:24:39 +08:00
Simisays
29467188f2 Update blade_of_shared_souls.txt 2023-02-13 11:15:16 +01:00
Anthony Calosa
6172b2c21f show winloss stats on match transition 2023-02-13 18:14:34 +08:00
tool4ever
d0084c21b6 fixes phasing affecting delayed triggers (#2461) 2023-02-13 08:45:03 +00:00
Anthony Calosa
8e8afc1e50 fix TransitionScreen runnable 2023-02-13 15:57:22 +08:00
Anthony Calosa
f69e6f3913 Merge pull request #2462 from kevlahnota/newmaster2 
fix playerpanel not applying name to slot
 2023-02-13 08:49:50 +08:00
Anthony Calosa
f59e9f4d8d Merge pull request #2458 from tool4ever/fixes12 
Misc fixes
 2023-02-13 08:49:38 +08:00
Anthony Calosa
dc95135310 Merge pull request #2457 from Simisays/aiupdate 
Update ria_ivor_bane_of_bladehold.txt
 2023-02-13 08:38:41 +08:00
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
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
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
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
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