external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 10:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
61,809 Commits 31 Branches 187 Tags
24e32e7af6dc91a6c3a2800479a36d732a62d7cc
Commit Graph

61809 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tool4ever
2e504db20e Merge pull request #1951 from tool4ever/cleanStuff 
Clean stuff
 2022-11-22 19:36:29 +01:00
tool4EvEr
85398f1273 Fix Debt of Loyalty triggering non-static 2022-11-22 19:31:38 +01:00
Paul Hammerton
b698debd2b Merge pull request #1950 from paulsnoops/j22_edition 
J22 edition update
 2022-11-22 18:27:48 +00:00
paulsnoops
8626b30ac1 J22 edition update 2022-11-22 18:21:24 +00:00
JohnWilliams77
99004c3227 Update Secret Lair 30th Anniversary Countdown Kit.txt (#1948) 2022-11-22 19:41:03 +03:00
Northmoc
5d9bba959d J22: 21 Nov (#1949) 
* conductor_of_cacophony.txt

* deathbringer_thoctar.txt tidy

* rumbling_slum_avatar.txt tidy

* dutiful_replicator.txt

* hold_for_questioning.txt
 2022-11-22 19:27:43 +03:00
Simisays
858db55ca3 update 2022-11-22 17:24:27 +01:00
Simisays
ddc7a80786 update 2022-11-22 16:51:28 +01:00
Anthony Calosa
fe619543e6 Merge pull request #1947 from kevlahnota/newmaster2 
fix itemfilter
 2022-11-22 23:10:50 +08:00
Anthony Calosa
12349f9e82 unused import 2022-11-22 22:29:54 +08:00
Anthony Calosa
c16a4700a9 fix itemfilter 2022-11-22 22:23:50 +08:00
Northmoc
9d6569d531 creeping_bloodsucker.txt 2022-11-22 09:19:45 -05:00
Anthony Calosa
cc667cda30 Merge pull request #1944 from kevlahnota/newmaster2 
update ClosingScreen & GameHud
 2022-11-22 21:08:54 +08:00
tool4EvEr
d45a962faa Cleanup SpellDescription from some Triggers that don't need it 2022-11-22 13:37:48 +01:00
tool4EvEr
a10f8f4cb7 Cleanup 2022-11-22 12:26:29 +01:00
Simisays
7227feeb98 Update runadi_behemoth_caller.txt 2022-11-22 11:43:04 +01:00
Simisays
beb0f1bef5 Update read_the_soul.txt 2022-11-22 11:01:47 +01:00
Simisays
b4213759b1 update 2022-11-22 10:59:41 +01:00
Anthony Calosa
46effccfec update AdventureDeckEditor Catalog icon 2022-11-22 16:24:30 +08:00
Paul Hammerton
f004280791 Merge pull request #1942 from Simisays/JUMPSTART 
J22 4 cards + zeppelin token
 2022-11-22 08:21:22 +00:00
Anthony Calosa
d9a0770640 update imports 2022-11-22 14:56:18 +08:00
Anthony Calosa
2875988adc update ClosingScreen & GameHud 
- fix ClosingScreen logo after update process
- scaledown GameHud text for lifepoints, mana and gold
 2022-11-22 14:38:55 +08:00
Anthony Calosa
b8ea883259 Merge pull request #1902 from Northmoc/spaceb 
UNF: space_beleren.txt and support
 2022-11-22 08:54:01 +08:00
Anthony Calosa
f3966ecfef Merge pull request #1906 from Northmoc/ticket 
UNF: Tickets initial implementation
 2022-11-22 08:50:31 +08:00
Simisays
21e7a3be02 Update distinguished_conjurer.txt 2022-11-21 22:02:41 +01:00
Simisays
dfb5ed2b24 update 2022-11-21 21:59:00 +01:00
JakeLoustone
bf905d8234 fix toughness typo keeper_of_the_cadence.txt (#1943) 
Changed "PT:2/2" to "PT:2/5" to match card scan.
 2022-11-21 20:37:53 +00:00
tool4ever
ac3d9ce8ee Misc cleanup (#1940) 
* Misc cleanup

* Fix check passing with no own creatures

* Improve StackDescription for Unsubstantiate
 2022-11-21 20:37:24 +00:00
Northmoc
35365c0893 Solve issue 1472 (#1528) 
* ManaEffect.resolve add runTriggers boolean

* AbilityManaPart.produceMana incorporate runTriggers boolean

* caged_sun.txt refactor

* AbilityManaPart.produceMana split to add TriggerManaAdded

* TriggerManaAdded.java

* TriggerTapsForMana.java refactor out unneeded

* TriggerType.ManaAdded

* Adjust checks for new Trigger

* Caged Sun fix

* Fix False Dawn only affecting mana abilities

* Rework tapsForMana call

* Clean up

* Support default rules value

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
Co-authored-by: tool4ever <therealtoolkit@hotmail.com>
 2022-11-21 20:37:01 +00:00
Simisays
76c485286f update 2022-11-21 20:51:21 +01:00
Anthony Calosa
d57794b31d Merge pull request #1941 from kevlahnota/newmaster2 
update Transitionscreen, RewardScene & Hud
 2022-11-22 02:25:32 +08:00
Anthony Calosa
14e1f42164 update Transitionscreen, RewardScene & Hud 2022-11-22 02:15:38 +08:00
Simisays
5f5703ef7b J22 Ashcoat of the Shadow Swarm (#1938) 
* Create ashcoat_of_the_shadow_swarm.txt

* Update ashcoat_of_the_shadow_swarm.txt

* Update ashcoat_of_the_shadow_swarm.txt

* Update ashcoat_of_the_shadow_swarm.txt
 2022-11-21 10:19:53 -05:00
Anthony Calosa
75cb7d43b0 Merge pull request #1937 from kevlahnota/newmaster2 
update SplashScreen NPE
 2022-11-21 15:47:06 +08:00
Anthony Calosa
e2fb34f0d1 update SplashScreen NPE 2022-11-21 15:46:35 +08:00
Anthony Calosa
17039ee4ef Merge pull request #1936 from kevlahnota/newmaster2 
update FSkin file check
 2022-11-21 15:43:20 +08:00
Anthony Calosa
79e5b29b81 update FSkin file check 2022-11-21 15:41:30 +08:00
Anthony Calosa
37c8623082 Merge pull request #1935 from kevlahnota/newmaster2 
update SplashScreen
 2022-11-21 14:56:34 +08:00
Anthony Calosa
3db079d8e3 update SplashScreen 
- Adventure Splashscreen will be used if default startup is Adventure Mode.
 2022-11-21 14:51:16 +08:00
Anthony Calosa
08b72fdc3c update adventure bg 2022-11-21 08:44:12 +08:00
Anthony Calosa
6baf0be760 Merge pull request #1934 from kevlahnota/newmaster2 
update fallback_skin
 2022-11-21 07:16:15 +08:00
Anthony Calosa
6b3cf252b7 Merge pull request #1913 from Northmoc/comet 
UNF: Comet, Stellar Pup and support
 2022-11-21 07:15:49 +08:00
Anthony Calosa
f0f3cb7d08 update fallback_skin 2022-11-21 07:02:20 +08:00
Anthony Calosa
3031e2f942 fix combat arrows on desktop 2022-11-21 06:40:07 +08:00
tool4ever
025070ce97 Update vodalian_hexcatcher.txt 2022-11-20 20:54:56 +00:00
tool4ever
6f4d80ccb9 Update subdue.txt 2022-11-20 13:32:41 +00:00
Anthony Calosa
214a60dead Merge pull request #1931 from Card-Forge/kevlahnota-patch-7 
Show combat arrow for attacked player on desktop
 2022-11-20 21:27:43 +08:00
Anthony Calosa
f81178c82e Merge pull request #1933 from kevlahnota/newmaster2 
update some Adventure UI and BG
 2022-11-20 21:27:21 +08:00
Anthony Calosa
636a0d4a25 Merge branch 'master' into newmaster2 2022-11-20 21:24:29 +08:00
Anthony Calosa
8d5627f02d remove unused import 2022-11-20 21:23:48 +08:00