external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
59,534 Commits 33 Branches 187 Tags
257dbc6b51aaf96edb38796bfa08d0e81257a658
Commit Graph

59534 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tool4ever
b10fe427d5 Creature.Self -> Card.Self for Myrkul ETBs (#1225) 
* Creature.Self -> Card.Self for Myrkul ETBs

* Clean up

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
 2022-07-28 17:33:06 +03:00
Northmoc
8994f3d44b Merge pull request #1221 from Suthro/master 
DMU + DMC: Temporal Firestorm; Ramirez DePietro, Pillager; Tor Wauki the Younger
 2022-07-28 09:54:19 -04:00
tool4EvEr
d8826bb1c4 Performance 2022-07-28 15:49:00 +02:00
Grimm
42ae9dda06 wavefunction collapse first integration 2022-07-28 11:55:05 +02:00
Grimm
dc06bab331 AdventureEditor: added editors 2022-07-28 11:54:35 +02:00
Suthro
3b8d6b2bb3 Update temporal_firestorm.txt 2022-07-27 22:32:23 -05:00
Suthro
8d739cdb32 Update ramirez_depietro_pillager.txt 2022-07-27 22:31:54 -05:00
Suthro
c11a4d69c5 Update jasmine_boreal_of_the_seven.txt 2022-07-27 22:31:32 -05:00
Anthony Calosa
e24259b500 Merge pull request #1222 from kevlahnota/master 
fix onfetched for RewardActor
 2022-07-28 10:30:42 +08:00
Anthony Calosa
720afb044d fix onfetched for RewardActor 
- should fix the issue of not loading the images downloaded. This should method should get directly from the assetmanager.
 2022-07-28 10:24:39 +08:00
friarsol
2a12f830aa Update inn portrait with false life 2022-07-27 22:17:15 -04:00
friarsol
c9aa5baa83 Improve messaging for costs 2022-07-27 22:16:00 -04:00
friarsol
a42cb4f273 Convert heal to temp HP bonus for $200+ gold 2022-07-27 22:15:59 -04:00
Grimm
7b680c8692 Merge remote-tracking branch 'origin/adventure' into adventure 
# Conflicts:
#	forge-gui-mobile/src/forge/adventure/util/RewardActor.java
 2022-07-28 04:15:21 +02:00
Grimm
97b2fe505f wavefunction collapse first integration 2022-07-28 04:13:26 +02:00
Grimm
dbbc065ead AdventureEditor: added editors 2022-07-28 04:12:51 +02:00
Grimm
cfd2e3723e Merge remote-tracking branch 'origin/adventure' into adventure 2022-07-28 04:12:36 +02:00
Grimm
cee28bb62a wavefunction collapse first integration 2022-07-28 04:12:17 +02:00
Anthony Calosa
2396e7d1d0 Merge pull request #1220 from Northmoc/tweaks 
Card tweaks (recently added and related)
 2022-07-28 08:15:30 +08:00
Anthony Calosa
8fa383b0d4 Merge pull request #1207 from Northmoc/showdown 
CLB: Spectacular Showdown and support
 2022-07-28 08:14:34 +08:00
Suthro
bd55792bdf Update jasmine_boreal_of_the_seven.txt 2022-07-27 14:12:15 -05:00
Suthro
67b7407836 Merge branch 'master' of https://github.com/Suthro/forge_scripttesting 2022-07-27 13:47:30 -05:00
Suthro
ea0ae56fe2 DMC: Jasmine Boreal of the Seven 
DMC: Add script for Jasmine Boreal of the Seven
 2022-07-27 13:47:12 -05:00
Suthro
626c7853ab Update temporal_firestorm.txt 
Fixed awkward StackDescription
 2022-07-27 13:37:45 -05:00
Suthro
2f2fa15f30 Merge branch 'Card-Forge:master' into master 2022-07-27 13:23:33 -05:00
Suthro
c36346eb81 DMU + DMC: Temporal Firestorm; Ramirez DePietro, Pillager; Tor Wauki the Younger 
DMU + DMC: Add scripts for one DMU card, two DMC cards:

- Temporal Firestorm
- Ramirez DePietro, Pillager
- Tor Wauki the Younger
 2022-07-27 13:21:57 -05:00
tool4ever
452f4e26f7 Durnan fix (#1219) 
Co-authored-by: TRT <>
 2022-07-27 19:13:34 +03:00
Northmoc
ac6347c94b GameEntityCounterTable.replaceCounterEffect dodge NPE 2022-07-27 11:48:42 -04:00
Northmoc
21da14e5cf agitator_ant.txt spectacular_showdown.txt refactor to "RememberPut" 2022-07-27 11:33:38 -04:00
Northmoc
2717862ca7 GameEntityCounterTable.replaceCounterEffect support "RememberPut" 2022-07-27 11:33:04 -04:00
Northmoc
b6bf1097bd clarify usage in CountersPutEffect and CountersPutAllEffect 2022-07-27 11:32:44 -04:00
Northmoc
498d6892ab druidic_ritual.txt remove unneeded 2022-07-27 10:59:06 -04:00
Northmoc
22dfd94818 Dominaria United.txt add monk token 2022-07-27 10:58:55 -04:00
Northmoc
74f4e7f4b4 jaya_fiery_negotiator.txt better cleanups for -1 2022-07-27 09:05:15 -04:00
Northmoc
b4ef91dab3 jaya_fiery_negotiator.txt clean up 2022-07-27 08:57:00 -04:00
Northmoc
c23129155f channel_harm.txt fix bad placeholder 2022-07-27 08:38:47 -04:00
Northmoc
e77cc20da9 skyline_savior.txt tighten up 2022-07-27 08:30:48 -04:00
Northmoc
37f7265199 evolved_sleeper.txt AI hint 2022-07-27 08:30:15 -04:00
Northmoc
28625790b8 crystal_dragon_rob_the_hoard.txt AI hint 2022-07-27 08:30:04 -04:00
Anthony Calosa
e9f330d514 Create forge-adventure-mac.sh 
startup command for mac users
 2022-07-27 17:27:05 +08:00
Anthony Calosa
2de4c3daed Merge pull request #1218 from kevlahnota/master 
fix android tooltip after fetching card image
 2022-07-27 17:09:13 +08:00
Anthony Calosa
b1bb24add7 fix android tooltip after fetching card image 2022-07-27 16:38:32 +08:00
Anthony Calosa
d974d2ba08 Merge pull request #1208 from Northmoc/planetar 
CLB: Windshaper Planetar and support
 2022-07-27 15:02:31 +08:00
Anthony Calosa
f61228f985 Merge pull request #1210 from Suthro/master 
CLB: 5 scripts, incl. 2 backgrounds
 2022-07-27 14:59:52 +08:00
Suthro
9e8179a778 Merge branch 'master' of https://github.com/Suthro/forge_scripttesting 2022-07-27 01:47:11 -05:00
Suthro
3f6d3180c8 DMU: Jaya, Fiery Negotiator + Token, + Evolved Sleeper 
DMU: Added scripts for newly spoiled cards

- Jaya, Fiery Negotiator
- 1/1 red Monk creature token with prowess
- Evolved Sleeper
 2022-07-27 01:47:09 -05:00
Northmoc
ecbc4ffdc8 Sarevok's Tome (CLB) and related tweaks (#1205) 
* sarevoks_tome.txt

* DigUntilEffect.getStackDescription use exile verb when appropriate, better untilAmount parse

* DigUntilEffect.getStackDescription support "NoPutDesc"

* somewhat related old card tweaks

* DigUntilEffect.getStackDescription missing ')'

* sarevoks_tome.txt add DefinedDesc
 2022-07-27 08:47:00 +02:00
Northmoc
2312dc27b8 TwoPiles streamline (+ CLB Split the Spoils) (#1200) 
* remove cleanups from old TwoPiles cards

* TwoPilesEffect.resolve clear remembered after each pile sub

* split_the_spoils.txt

* split_the_spoils.txt fix

* epiphany_at_the_drownyard.txt too

* stand_or_fall.txt tighten up more

* TwoPilesEffect.resolve add "RememberChosen" as shortcut past ChosenPile -> Pump remember/imprint

* make_an_example.txt and stand_or_fall.txt with "RememberChosen"

* split_the_spoils.txt Defined -> Chooser
 2022-07-27 08:45:10 +02:00
Anthony Calosa
b747edfa9f Merge pull request #1214 from kevlahnota/master 
refactor RewardActor
 2022-07-27 14:41:47 +08:00
Anthony Calosa
8f691f05d8 remove unnecesary loop 2022-07-27 14:33:18 +08:00