external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
63,578 Commits 32 Branches 187 Tags
2e24d43ab6216b51a7de75c71810f5fb5ce23b94
Commit Graph

3735 Commits

Author SHA1 Message Date
Anthony Calosa
e4560f3714 prevent startup crash adventure (ExceptionInInitializerError) 
- if not using classpath, it will fail to get the fallback_skin hidden inside the jar, to prevent crash use dummy instead;
 2022-08-10 21:29:20 +08:00
Anthony Calosa
112a2ce18f unused imports 2022-08-10 19:35:48 +08:00
Anthony Calosa
9209c64399 Add progressbar on adventure loading transition 2022-08-10 19:31:53 +08:00
Anthony Calosa
d38b82867a unused imports 2022-08-10 12:34:40 +08:00
Anthony Calosa
e5a2d6a054 match color identity for random deck in chaos mode 
- update colorid selector if chaos mode is chosen
 2022-08-10 12:32:15 +08:00
Grimm
4bb9c37b92 removed unused list 2022-08-09 18:48:42 +02:00
Grimm
d1d65c7d57 removed unused list 2022-08-09 18:46:10 +02:00
Grimm
2ad0d598eb Added multiplayer fights 2022-08-09 18:38:43 +02:00
Grimm
eb33540143 Merge branch 'master' of https://github.com/Card-Forge/forge into adventure 2022-08-09 16:05:02 +02:00
Grimm
9402a15502 Adventure player reworked colorid to support multicolor 2022-08-09 16:04:30 +02:00
Grimm
af10670060 Merge branch 'master' of https://github.com/Card-Forge/forge into adventure 
 Conflicts:
	forge-gui-mobile/src/forge/adventure/world/WorldSave.java
 2022-08-09 13:50:01 +02:00
Grimm
70ef2a13a0 reworked starting deck to jumpstart, constructed or chaos 
support localization in UIData and removed it from code (only NewGameScene for now)
 2022-08-09 13:46:56 +02:00
Anthony Calosa
f93db8ce92 unused import 2022-08-09 19:43:18 +08:00
Anthony Calosa
cf1385666a update newgame+ 
- add highlight to difficulty selector
 2022-08-09 19:37:52 +08:00
Grimm
c1a6313b1e reworked starting deck to jumpstart, constructed or chaos 
support localization in UIData and removed it from code (only NewGameScene for now)
 2022-08-09 13:33:06 +02:00
Anthony Calosa
c8073a333c reformat code 
- fix color identity
- service pool is working good on android now so use it on generating map
 2022-08-09 09:17:19 +08:00
Anthony Calosa
36e7687034 unused import 2022-08-08 21:43:11 +08:00
Anthony Calosa
790db23367 fix loading world in android 2022-08-08 21:40:13 +08:00
Grimm
2e9dc4791d Fixed enemy spawning in structures 
reduced segmented WaveFunctionCollapse calculation for better performance
added flying to enemies
 2022-08-08 15:08:02 +02:00
Anthony Calosa
d1cb4c3825 Merge pull request #1289 from TrueFuFLeaderG/adventure 
threaded WaveFunctionCollapse
 2022-08-08 18:04:19 +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
3093d9f617 Update GuiChoose.java 
revert
 2022-08-08 11:18:40 +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
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
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
Grimm
f9be819925 Adventure 
removed debug log
  adjusted some terrain
 2022-08-06 22:40:26 +02:00
Anthony Calosa
6ae171f7fc fix dual choices and alternate view on confirm action 2022-08-06 21:45:57 +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
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
Grimm
605c232dea wavefunction collapse first integration 2022-08-05 22:41:05 +02:00
Grimm
cdd72d138b AdventureEditor: added editors 2022-08-05 22:41:05 +02:00
Grimm
93ac9fd7fe adventure Editor rework 2022-08-05 18:14:51 +02:00
Anthony Calosa
4e2435ebf7 try to fix bug getting default font not correctly setting the scale to 1 2022-08-05 20:50:01 +08:00
Anthony Calosa
6b0847159d unused import 2022-08-05 14:23:01 +08:00
Anthony Calosa
d15cf79598 cleanup 2022-08-05 14:17:22 +08:00
Anthony Calosa
99222e6fa5 landscape and portrait settings for reward/shop card display/tooltips 
- user can adjust the values seperately for landscape or portrait mode
 2022-08-05 14:12:22 +08:00
Anthony Calosa
1759a94cdc remove duplicate setting 2022-08-05 10:46:44 +08:00
Anthony Calosa
745d71745e setting for card display/tooltip on adventure rewards/shops 
- add support for various display aspect ratio
 2022-08-05 10:26:32 +08:00