external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,769 Commits 32 Branches 187 Tags
08ae04ab8b0de0778f3b8043fd4b5cb1acaf57cc
Commit Graph

62769 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
6f93dab1e7 Merge pull request #2456 from Simisays/branchy 
Kiora miniboss Adventure + some cleanup of two previous dungeons
 2023-02-14 17:31:11 +08:00
Anthony Calosa
3d4b7376c2 Merge pull request #2466 from tool4ever/guardianbeastfixes 
Fixes related to Guardian Beast
 2023-02-14 17:28:30 +08:00
Anthony Calosa
512267c680 Merge branch 'master' into guardianbeastfixes 2023-02-14 17:22:42 +08:00
Simisays
94d6b5f67b update 2023-02-14 10:22:11 +01:00
tool4ever
bf34dae4f9 Hotfix for Transmute crash (#2471) 2023-02-14 08:32:50 +00:00
Simisays
68079ac908 update 2023-02-14 09:26:31 +01:00
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
Simisays
ecd72c6444 Update EnemySprite.java 2023-02-13 22:49:44 +01:00
Simisays
cb50bb2994 update 2023-02-13 22:48:12 +01: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
tool4EvEr
1184aaf0fd Fix NPE when CantAttach applies 2023-02-13 18:19:32 +01:00
tool4EvEr
938b4c50e1 Fix ignoring CantAttach 2023-02-13 18:18:47 +01:00
tool4EvEr
e48ac2e623 Fix ignoring Guardian Beast 2023-02-13 18:18:29 +01:00
tool4EvEr
3733983874 Fix affecting phased out 2023-02-13 18:18:00 +01:00
Simisays
5704b81524 update 2023-02-13 18:04:53 +01:00
Simisays
dfee4d40ab Update EnemySprite.java 2023-02-13 17:39:02 +01: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
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