external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
59,816 Commits 33 Branches 187 Tags
fc57bdc3cb15ac3df3595b3d396dea54e746b90a
Commit Graph

59816 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tool4EvEr
ed48bc027e Fix Emblem targeting 2022-08-08 12:48:38 +02:00
tool4EvEr
fe6ccc0f31 Fix Epic + Stifle 2022-08-08 12:44:04 +02:00
tool4EvEr
b96365e6da Rework DelayedTrigger controller 2022-08-08 12:43:23 +02:00
Anthony Calosa
d1cb4c3825 Merge pull request #1289 from TrueFuFLeaderG/adventure 
threaded WaveFunctionCollapse
 2022-08-08 18:04:19 +08:00
Anthony Calosa
ade04c2290 Merge pull request #1288 from kevlahnota/master 
catch unloaded card images
 2022-08-08 18:03:27 +08:00
Anthony Calosa
08f61bc891 Update World.java 2022-08-08 18:03:06 +08:00
Anthony Calosa
670f35ddec use threadutil servicepool 2022-08-08 17:38:12 +08:00
Grimm
c382555261 adventure Editor rework 2022-08-08 11:10:18 +02:00
Anthony Calosa
fb18f59586 update check 2022-08-08 16:35:01 +08:00
Anthony Calosa
91e89c6c97 catch unloaded images 
- either due to being corrupted, invalid header or libgdx failed to load dependency (wrong path, etc..)
 2022-08-08 16:28:15 +08:00
Anthony Calosa
d1f06e0353 Merge pull request #1284 from TrueFuFLeaderG/adventure 
Adventure
 2022-08-08 11:34:27 +08:00
Anthony Calosa
0b2075d1d3 Update ImageCache.java 
revert
 2022-08-08 11:25:45 +08:00
Anthony Calosa
cc78dee5b5 Update VCardDisplayArea.java 
revert
 2022-08-08 11:25:18 +08:00
Anthony Calosa
e1c33dd589 Update CardView.java 
revert
 2022-08-08 11:22:52 +08:00
Anthony Calosa
2c326f8ff9 Update CardView.java 
revert
 2022-08-08 11:21:49 +08:00
Anthony Calosa
3093d9f617 Update GuiChoose.java 
revert
 2022-08-08 11:18:40 +08:00
Anthony Calosa
138068e087 Update frost_bite.txt 
revert
 2022-08-08 11:16:12 +08:00
Anthony Calosa
abe0d82a3f Delete loose_in_the_park.txt 
revert
 2022-08-08 11:15:23 +08:00
Anthony Calosa
2a748d0e73 Delete menagerie_curator.txt 
revert
 2022-08-08 11:14:51 +08:00
Anthony Calosa
3d381687a9 Update HumanCostDecision.java 
revert
 2022-08-08 11:13:44 +08:00
Anthony Calosa
1e0ff83082 Update Forge.java 2022-08-08 11:10:39 +08:00
Anthony Calosa
244c611c97 Update SplashScreen.java 2022-08-08 11:06:47 +08:00
Anthony Calosa
6827a83596 Update SplashScreen.java 
to override the startup you don't need to modify the splashscreen, it should be afterdbloaded
 2022-08-08 11:05:20 +08:00
Grimm
19feb55641 merged kev change by hand 2022-08-07 23:20:03 +02:00
Grimm
79e85bda06 Adventure 
removed BufferdImage dependency
  rolled back import changes
 2022-08-07 23:14:08 +02:00
Simisays
8d76e23585 YSNC Menagerie Curator (#1280) 
* Create menagerie_curator.txt

* Update menagerie_curator.txt
 2022-08-07 22:52:33 +02:00
Anthony Calosa
a5caf970ed Update frost_bite.txt 2022-08-07 22:52:33 +02:00
Anthony Calosa
5204c735ac fix black texture on adventure mode list view 
- needs to clear card art cache when unloading card textures
- minor speedup on startup on selector adventure settings
 2022-08-07 22:52:33 +02:00
Simisays
f8188e851d YSNC Loose in the Park (#1265) 
* Create loose_in_the_park.txt

Card script for the card Loose in the Park from New Capenna Alchemy
https://scryfall.com/card/ysnc/14/loose-in-the-park

* Update loose_in_the_park.txt

* Update loose_in_the_park.txt

* Update loose_in_the_park.txt

* Update loose_in_the_park.txt

* Update loose_in_the_park.txt

* Update loose_in_the_park.txt

* Update loose_in_the_park.txt
 2022-08-07 22:52:33 +02:00
tool4EvEr
5569a5619a display expected P/T for unanimated vehicles 2022-08-07 22:52:32 +02:00
Simisays
a05e9951ac YSNC Menagerie Curator (#1280) 
* Create menagerie_curator.txt

* Update menagerie_curator.txt
 2022-08-07 22:04:35 +03:00
Anthony Calosa
112f7d15ce Merge pull request #1286 from Card-Forge/kevlahnota-patch-4 
Update frost_bite.txt
 2022-08-07 22:21:31 +08:00
Anthony Calosa
ffe451246c Merge pull request #1287 from kevlahnota/master 
fix black texture on card list view
 2022-08-07 22:20:53 +08:00
Anthony Calosa
7cea9c3973 fix black texture on adventure mode list view 
- needs to clear card art cache when unloading card textures
- minor speedup on startup on selector adventure settings
 2022-08-07 22:14:58 +08:00
Anthony Calosa
7803a54857 Update frost_bite.txt 2022-08-07 21:05:19 +08:00
Simisays
b77464622b YSNC Loose in the Park (#1265) 
* Create loose_in_the_park.txt

Card script for the card Loose in the Park from New Capenna Alchemy
https://scryfall.com/card/ysnc/14/loose-in-the-park

* Update loose_in_the_park.txt

* Update loose_in_the_park.txt

* Update loose_in_the_park.txt

* Update loose_in_the_park.txt

* Update loose_in_the_park.txt

* Update loose_in_the_park.txt

* Update loose_in_the_park.txt
 2022-08-07 08:08:27 +03:00
Anthony Calosa
d584b4195d Merge branch 'master' into newmaster 2022-08-07 07:42:10 +08:00
Anthony Calosa
acd06a2d94 Merge pull request #1285 from tool4ever/viewPT 
CardView: display expected P/T for unanimated vehicles
 2022-08-07 07:39:18 +08:00
tool4EvEr
f3949a7177 display expected P/T for unanimated vehicles 2022-08-07 00:17:29 +02:00
Grimm
f9be819925 Adventure 
removed debug log
  adjusted some terrain
 2022-08-06 22:40:26 +02:00
Grimm
f45555686e changed road algo 
added WaveFunctionCollapse to create biome structures
changed world generation.
added overworld collision for enemies.
 2022-08-06 21:46:54 +02:00
Grimm
7dd79768e4 adventure Editor rework 2022-08-06 21:46:54 +02:00
Anthony Calosa
6ae171f7fc fix dual choices and alternate view on confirm action 2022-08-06 21:45:57 +02:00
Grimm
bc16d30ce5 Merge remote-tracking branch 'origin/adventure' into adventure 
# Conflicts:
#	forge-adventure/src/main/java/forge/adventure/editor/BiomeEdit.java
#	forge-adventure/src/main/java/forge/adventure/editor/BiomeStructureEdit.java
#	forge-adventure/src/main/java/forge/adventure/editor/BiomeTerrainEdit.java
#	forge-adventure/src/main/java/forge/adventure/editor/EditorMainWindow.java
#	forge-adventure/src/main/java/forge/adventure/editor/PointOfInterestEdit.java
#	forge-adventure/src/main/java/forge/adventure/editor/RewardEdit.java
#	forge-adventure/src/main/java/forge/adventure/editor/StructureEditor.java
#	forge-adventure/src/main/java/forge/adventure/editor/SwingAtlas.java
#	forge-adventure/src/main/java/forge/adventure/editor/SwingAtlasPreview.java
#	forge-adventure/src/main/java/forge/adventure/editor/WorldEditor.java
#	forge-gui-mobile/src/forge/adventure/data/BiomeData.java
#	forge-gui-mobile/src/forge/adventure/data/BiomeStructureData.java
#	forge-gui-mobile/src/forge/adventure/data/WorldData.java
#	forge-gui-mobile/src/forge/adventure/util/RewardActor.java
#	forge-gui-mobile/src/forge/adventure/world/BiomeStructure.java
#	forge-gui-mobile/src/forge/adventure/world/BiomeTexture.java
#	forge-gui-mobile/src/forge/adventure/world/World.java
#	forge-gui/res/adventure/Shandalar/world/green.json
#	forge-gui/res/adventure/Shandalar/world/tilesets/forest.png
 2022-08-06 21:11:56 +02:00
Grimm
f6bec79a28 changed road algo 
added WaveFunctionCollapse to create biome structures
changed world generation.
added overworld collision for enemies.
 2022-08-06 21:10:18 +02:00
Anthony Calosa
235d357844 Merge branch 'master' into newmaster 2022-08-07 00:13:12 +08:00
Anthony Calosa
4d9c357962 Merge pull request #1278 from kevlahnota/master 
fix dual choices and alternate view on confirm action
 2022-08-06 21:16:54 +08:00
Anthony Calosa
d963a3e13c Merge branch 'master' into newmaster 2022-08-06 13:02:15 +08:00
Anthony Calosa
4cdf7829c2 fix dual choices and alternate view on confirm action 2022-08-06 12:32:43 +08:00
Grimm
03aac93b26 Merge branch 'master' of https://github.com/TrueFuFLeaderG/forge into adventure 
 Conflicts:
	forge-adventure/src/main/java/forge/adventure/editor/BiomeEdit.java
	forge-adventure/src/main/java/forge/adventure/editor/BiomeStructureEdit.java
	forge-adventure/src/main/java/forge/adventure/editor/BiomeTerrainEdit.java
	forge-adventure/src/main/java/forge/adventure/editor/EditorMainWindow.java
	forge-adventure/src/main/java/forge/adventure/editor/PointOfInterestEdit.java
	forge-adventure/src/main/java/forge/adventure/editor/RewardEdit.java
	forge-adventure/src/main/java/forge/adventure/editor/StructureEditor.java
	forge-adventure/src/main/java/forge/adventure/editor/SwingAtlasPreview.java
	forge-adventure/src/main/java/forge/adventure/editor/WorldEditor.java
	forge-gui-mobile/src/forge/adventure/data/BiomeData.java
	forge-gui-mobile/src/forge/adventure/data/BiomeStructureData.java
	forge-gui-mobile/src/forge/adventure/data/WorldData.java
	forge-gui-mobile/src/forge/adventure/stage/GameHUD.java
	forge-gui-mobile/src/forge/adventure/world/BiomeStructure.java
	forge-gui-mobile/src/forge/adventure/world/BiomeTexture.java
	forge-gui-mobile/src/forge/adventure/world/World.java
	forge-gui/res/adventure/Shandalar/world/green.json
 2022-08-05 22:47:31 +02:00