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

62228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
9ba3875e50 Update blitzwing_cruel_tormentor_blitzwing_adaptive_assailant.txt 2022-11-23 19:47:10 +08:00
Northmoc
106166734e J22: Nov 22 (#1954) 
* disciple_of_perdition.txt

* minor fixes

* alandra_sky_dreamer.txt

* coalborn_entity.txt

* elkin_bottle.txt fix typo
 2022-11-23 13:44:39 +03:00
Anthony Calosa
202c440797 Update CharmEffect.java 
@TRT please check further, just added NPE check so it will not crash
 2022-11-23 15:43:48 +08:00
Anthony Calosa
5e1b9db4a6 Merge pull request #1956 from CCTV-1/master 
updated simplified chinese translation
 2022-11-23 15:41:34 +08:00
CCTV-1
0f86ba9003 Merge branch 'Card-Forge:master' into master 2022-11-23 14:53:51 +08:00
CCTV-1
826b54b3fc translate new texts. 2022-11-23 14:52:09 +08:00
Anthony Calosa
da50f1f1f6 Update rodolf_duskbringer.txt 
fix crash
 2022-11-23 13:14:58 +08:00
Northmoc
92df823dd1 EffectEffect support "UntilEndOfYourNextCombat" 2022-11-22 23:13:42 -05:00
Northmoc
9a2ed3bfab brazen_cannonade.txt 2022-11-22 23:13:09 -05:00
Anthony Calosa
ec01c3d4cb Merge pull request #1953 from kevlahnota/newmaster2 
update AdventureDeckEditor tab icons
 2022-11-23 10:59:38 +08:00
Anthony Calosa
b1c3960b97 Merge branch 'master' into newmaster2 2022-11-23 10:52:11 +08:00
Anthony Calosa
a4277a6c5b update AdventureDeckEditor tab icons 2022-11-23 10:49:28 +08:00
Anthony Calosa
2cd7a85872 Merge branch 'master' into newmaster2 2022-11-23 09:14:21 +08:00
Northmoc
18d8bc0c3a GameAction.dealDamage support "RememberAmount" 2022-11-22 18:45:44 -05:00
Anthony Calosa
de5e2d2773 Merge pull request #1952 from kevlahnota/newmaster2 
update SaveLoadScene
 2022-11-23 07:20:00 +08:00
Anthony Calosa
0ff5b94923 update previewdate 2022-11-23 07:15:18 +08:00
Anthony Calosa
966a951a5e update SaveLoadScene 
- save player location name
 2022-11-23 06:43:55 +08:00
Anthony Calosa
8a236c4efb Merge pull request #1945 from Simisays/J22 
J22 10 Cards
 2022-11-23 06:24:07 +08:00
Simisays
022f5f57f7 Update zask_skittering_swarmlord.txt 2022-11-22 20:11:57 +01:00
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