external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
59,955 Commits 31 Branches 187 Tags
b51fe4b1421d42b3f56aae628fc00590150d6c31
Commit Graph

59955 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
74f5bb6999 Merge pull request #1237 from JohnWilliams77/patch-30 
Update Secret Lair Drop Series.txt
 2022-07-29 21:20:26 +08:00
Anthony Calosa
31bd2ff572 fix plural ends with "ds" 2022-07-29 21:07:48 +08:00
JohnWilliams77
c087a23ec0 Update Secret Lair Drop Series.txt 2022-07-29 13:26:34 +01:00
Paul Hammerton
64468db40d Merge pull request #1236 from JohnWilliams77/patch-29 
Regional Championship Qualifiers 2022 Promos
 2022-07-29 11:41:30 +01:00
JohnWilliams77
497103dd10 Create Regional Championship Qualifiers 2022.txt 2022-07-29 11:29:21 +01:00
Anthony Calosa
8f111680b1 Merge pull request #1234 from kevlahnota/master 
add switchbutton on HoldTooltip
 2022-07-29 18:25:39 +08:00
Anthony Calosa
4532320545 Merge pull request #1235 from JohnWilliams77/patch-28 
Update Secret Lair Drop Series.txt
 2022-07-29 18:25:24 +08:00
JohnWilliams77
ab66afd63d Update Secret Lair Drop Series.txt 2022-07-29 10:31:57 +01:00
Anthony Calosa
368abbf0b4 add switchbutton on HoldTooltip 
- also update coloridentity based on selected deck
- highlight deck text for empty deck
 2022-07-29 16:40:33 +08:00
Anthony Calosa
0de036b932 Merge pull request #1232 from kevlahnota/master 
fix memory tracking computation
 2022-07-29 13:12:02 +08:00
Anthony Calosa
aa61fc1031 add starterdecks to res 2022-07-29 13:10:56 +08:00
Anthony Calosa
cb7c9eee6e fix memory tracking computation 
compute the probable Texture usaga
 2022-07-29 12:50:03 +08:00
friarsol
fb8f1fdeb9 Remove some useless comments 2022-07-28 23:15:25 -04:00
Anthony Calosa
d77bba0f05 Merge pull request #1231 from kevlahnota/master 
Starter deck for AdventurePlayer
 2022-07-29 04:55:38 +08:00
Anthony Calosa
2be8d83304 Starter deck for AdventurePlayer 2022-07-29 04:42:55 +08:00
Anthony Calosa
d5ec0632f5 Merge pull request #1227 from tool4ever/blockAI 
AiBlockController: Performance
 2022-07-29 00:05:07 +08:00
Anthony Calosa
0aa93a25a6 Merge pull request #1230 from kevlahnota/master 
support showing back face on shops and loot on adventure mode
 2022-07-29 00:01:39 +08:00
Anthony Calosa
70bd8bddf8 support showing back face on shops and loot on adventure mode 
- for mobile backport, hover the card and left click to switch the tooltip
- for android, double tap the image before holdtouching to switch tooltip
 2022-07-28 23:52:12 +08:00
Northmoc
41ab7d840e CLB: 26 Jul (#1206) 
* sculpted_sunburst.txt

* ChooseCardEffect.getStackDescription tweak for weird case

* sigil_of_myrkul.txt

* stonespeaker_crystal.txt

* thunderwave.txt remove bad param

* tlincalli_hunter_retrieve_prey.txt

* topaz_dragon_entropic_cloud.txt
 2022-07-28 18:15:28 +03:00
Northmoc
62ebee0130 Merge pull request #1209 from Northmoc/clb_26b 
CLB: 26 Jul (more)
 2022-07-28 10:59:54 -04:00
Northmoc
7bedcf8483 back_alley_gardener.txt 2022-07-28 10:49:42 -04:00
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