Merge branch 'master' into release

2023-11-08 23:42:30 +01:00 · 2023-11-08 23:42:30 +01:00 · 529da2d440
parent dc1b444c92 3785898e40
commit 529da2d440
1270 changed files with 10409 additions and 12073 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1 @@
+* text=auto
--- a/.gitignore
+++ b/.gitignore
@ -1,7 +1,21 @@
+# IDE files
+.vscode
+
+# secret(?) assets
 _asset
 song-assets
 skin-assets
+
+# generated skin files
 nautica.json
 skin.cfg
-.vscode
-/textures/crew/
+
+# any crew that's not the default one, we do not package crew
+textures/crew/*
+!textures/crew/appeal_card.png
+!textures/crew/frame.png
+!textures/crew/portrait.png
+!textures/crew/make-a-crew/frame_glow.png
+!textures/crew/make-a-crew/frame_metal.png
+!textures/crew/make-a-crew/instructions.txt
+!textures/crew/anim/nothing
--- a/README.md
+++ b/README.md
@ -5,10 +5,12 @@ Project Starter: GSK Bladez
 ## Coding
 - [REDACTED]
 - Hersi
+- RealFD
 - fdigl
 - Hoshikara
 - GSK Bladez
 - Local
+- Kuenaimaku

 ## Graphics
 - GSK Bladez
--- a/folder/3intro.wav
+++ b/folder/3intro.wav
--- a/audio/titlescreen/splash/splash1.wav
+++ b/audio/titlescreen/splash/splash1.wav
--- a/backgrounds/fallback/textures/background/anim/eye-thomas.jpg
+++ b/backgrounds/fallback/textures/background/anim/eye-thomas.jpg
--- a/backgrounds/fallback/textures/background/anim/goldleaves-c.jpg
+++ b/backgrounds/fallback/textures/background/anim/goldleaves-c.jpg
--- a/backgrounds/fallback/textures/background/anim/goldleaves.jpg
+++ b/backgrounds/fallback/textures/background/anim/goldleaves.jpg
--- a/backgrounds/fallback/textures/background/anim/sakura1-c.jpg
+++ b/backgrounds/fallback/textures/background/anim/sakura1-c.jpg
--- a/backgrounds/fallback/textures/background/anim/sakura1.jpg
+++ b/backgrounds/fallback/textures/background/anim/sakura1.jpg
--- a/backgrounds/fallback/textures/background/anim/snow-c.jpg
+++ b/backgrounds/fallback/textures/background/anim/snow-c.jpg
--- a/backgrounds/fallback/textures/background/anim/snow.jpg
+++ b/backgrounds/fallback/textures/background/anim/snow.jpg
--- a/backgrounds/fallback/textures/background/anim/specific1-c.jpg
+++ b/backgrounds/fallback/textures/background/anim/specific1-c.jpg
--- a/backgrounds/fallback/textures/background/anim/specific1.jpg
+++ b/backgrounds/fallback/textures/background/anim/specific1.jpg
--- a/backgrounds/fallback/textures/background/anim/specific12-c.jpg
+++ b/backgrounds/fallback/textures/background/anim/specific12-c.jpg
--- a/backgrounds/fallback/textures/background/anim/specific12.jpg
+++ b/backgrounds/fallback/textures/background/anim/specific12.jpg
--- a/backgrounds/fallback/textures/background/anim/specific13-c.jpg
+++ b/backgrounds/fallback/textures/background/anim/specific13-c.jpg
--- a/backgrounds/fallback/textures/background/anim/specific13.jpg
+++ b/backgrounds/fallback/textures/background/anim/specific13.jpg
--- a/backgrounds/fallback/textures/background/anim/technocircle-c.jpg
+++ b/backgrounds/fallback/textures/background/anim/technocircle-c.jpg
--- a/backgrounds/fallback/textures/background/anim/technocircle.jpg
+++ b/backgrounds/fallback/textures/background/anim/technocircle.jpg
--- a/backgrounds/fallback/textures/background/anim/xcalibur-c.jpg
+++ b/backgrounds/fallback/textures/background/anim/xcalibur-c.jpg
--- a/backgrounds/fallback/textures/background/anim/xcalibur.jpg
+++ b/backgrounds/fallback/textures/background/anim/xcalibur.jpg
--- a/backgrounds/fallback/textures/background/beach.png
+++ b/backgrounds/fallback/textures/background/beach.png
--- a/backgrounds/fallback/textures/background/bedroom-c.jpg
+++ b/backgrounds/fallback/textures/background/bedroom-c.jpg
--- a/backgrounds/fallback/textures/background/bedroom.jpg
+++ b/backgrounds/fallback/textures/background/bedroom.jpg
--- a/backgrounds/fallback/textures/background/brown_planet.jpg
+++ b/backgrounds/fallback/textures/background/brown_planet.jpg
--- a/backgrounds/fallback/textures/background/city.png
+++ b/backgrounds/fallback/textures/background/city.png
--- a/backgrounds/fallback/textures/background/cloudy-c.jpg
+++ b/backgrounds/fallback/textures/background/cloudy-c.jpg
--- a/backgrounds/fallback/textures/background/cloudy.jpg
+++ b/backgrounds/fallback/textures/background/cloudy.jpg
--- a/backgrounds/fallback/textures/background/cyber-c.jpg
+++ b/backgrounds/fallback/textures/background/cyber-c.jpg
--- a/backgrounds/fallback/textures/background/cyber.jpg
+++ b/backgrounds/fallback/textures/background/cyber.jpg
--- a/backgrounds/fallback/textures/background/cyberspace-c.jpg
+++ b/backgrounds/fallback/textures/background/cyberspace-c.jpg
--- a/backgrounds/fallback/textures/background/cyberspace.jpg
+++ b/backgrounds/fallback/textures/background/cyberspace.jpg
--- a/backgrounds/fallback/textures/background/cyberspace_night.png
+++ b/backgrounds/fallback/textures/background/cyberspace_night.png
--- a/backgrounds/fallback/textures/background/cyberspace_night_starburst.png
+++ b/backgrounds/fallback/textures/background/cyberspace_night_starburst.png
--- a/backgrounds/fallback/textures/background/cyberspace_sunrise-f.png
+++ b/backgrounds/fallback/textures/background/cyberspace_sunrise-f.png
--- a/backgrounds/fallback/textures/background/cyberspace_sunrise.png
+++ b/backgrounds/fallback/textures/background/cyberspace_sunrise.png
--- a/backgrounds/fallback/textures/background/deepsea-c.jpg
+++ b/backgrounds/fallback/textures/background/deepsea-c.jpg
--- a/backgrounds/fallback/textures/background/deepsea.jpg
+++ b/backgrounds/fallback/textures/background/deepsea.jpg
--- a/backgrounds/fallback/textures/background/desert-c.jpg
+++ b/backgrounds/fallback/textures/background/desert-c.jpg
--- a/backgrounds/fallback/textures/background/desert-c2.jpg
+++ b/backgrounds/fallback/textures/background/desert-c2.jpg
--- a/backgrounds/fallback/textures/background/desert.jpg
+++ b/backgrounds/fallback/textures/background/desert.jpg
--- a/backgrounds/fallback/textures/background/fantasy-c.jpg
+++ b/backgrounds/fallback/textures/background/fantasy-c.jpg
--- a/backgrounds/fallback/textures/background/fantasy.jpg
+++ b/backgrounds/fallback/textures/background/fantasy.jpg
--- a/backgrounds/fallback/textures/background/flame-c.jpg
+++ b/backgrounds/fallback/textures/background/flame-c.jpg
--- a/backgrounds/fallback/textures/background/flame.jpg
+++ b/backgrounds/fallback/textures/background/flame.jpg
--- a/backgrounds/fallback/textures/background/galaxy-c.jpg
+++ b/backgrounds/fallback/textures/background/galaxy-c.jpg
--- a/backgrounds/fallback/textures/background/game-f.png
+++ b/backgrounds/fallback/textures/background/game-f.png
--- a/backgrounds/fallback/textures/background/grass-c.jpg
+++ b/backgrounds/fallback/textures/background/grass-c.jpg
--- a/backgrounds/fallback/textures/background/grass.jpg
+++ b/backgrounds/fallback/textures/background/grass.jpg
--- a/backgrounds/fallback/textures/background/jomanda.png
+++ b/backgrounds/fallback/textures/background/jomanda.png
--- a/backgrounds/fallback/textures/background/mars-c.jpg
+++ b/backgrounds/fallback/textures/background/mars-c.jpg
--- a/backgrounds/fallback/textures/background/mars.jpg
+++ b/backgrounds/fallback/textures/background/mars.jpg
--- a/backgrounds/fallback/textures/background/moon_blue-c.jpg
+++ b/backgrounds/fallback/textures/background/moon_blue-c.jpg
--- a/backgrounds/fallback/textures/background/moon_blue.jpg
+++ b/backgrounds/fallback/textures/background/moon_blue.jpg
--- a/backgrounds/fallback/textures/background/moon_purple-c.jpg
+++ b/backgrounds/fallback/textures/background/moon_purple-c.jpg
--- a/backgrounds/fallback/textures/background/moon_purple.jpg
+++ b/backgrounds/fallback/textures/background/moon_purple.jpg
--- a/backgrounds/fallback/textures/background/night-c.jpg
+++ b/backgrounds/fallback/textures/background/night-c.jpg
--- a/backgrounds/fallback/textures/background/night.jpg
+++ b/backgrounds/fallback/textures/background/night.jpg
--- a/backgrounds/fallback/textures/background/ocean-c.jpg
+++ b/backgrounds/fallback/textures/background/ocean-c.jpg
--- a/backgrounds/fallback/textures/background/ocean.jpg
+++ b/backgrounds/fallback/textures/background/ocean.jpg
--- a/backgrounds/fallback/textures/background/prettygalaxy-c.jpg
+++ b/backgrounds/fallback/textures/background/prettygalaxy-c.jpg
--- a/backgrounds/fallback/textures/background/prettygalaxy.jpg
+++ b/backgrounds/fallback/textures/background/prettygalaxy.jpg
--- a/backgrounds/fallback/textures/background/red_dusk-c.jpg
+++ b/backgrounds/fallback/textures/background/red_dusk-c.jpg
--- a/backgrounds/fallback/textures/background/red_dusk.jpg
+++ b/backgrounds/fallback/textures/background/red_dusk.jpg
--- a/backgrounds/fallback/textures/background/redblur-c.jpg
+++ b/backgrounds/fallback/textures/background/redblur-c.jpg
--- a/backgrounds/fallback/textures/background/redblur.jpg
+++ b/backgrounds/fallback/textures/background/redblur.jpg
--- a/backgrounds/fallback/textures/background/redgradient.jpg
+++ b/backgrounds/fallback/textures/background/redgradient.jpg
--- a/backgrounds/fallback/textures/background/sakura-c.jpg
+++ b/backgrounds/fallback/textures/background/sakura-c.jpg
--- a/backgrounds/fallback/textures/background/sakura.jpg
+++ b/backgrounds/fallback/textures/background/sakura.jpg
--- a/backgrounds/fallback/textures/background/sea-day-f.png
+++ b/backgrounds/fallback/textures/background/sea-day-f.png
--- a/backgrounds/fallback/textures/background/sea-day.png
+++ b/backgrounds/fallback/textures/background/sea-day.png
--- a/backgrounds/fallback/textures/background/sea-ice-f.png
+++ b/backgrounds/fallback/textures/background/sea-ice-f.png
--- a/backgrounds/fallback/textures/background/sea-ice.png
+++ b/backgrounds/fallback/textures/background/sea-ice.png
--- a/backgrounds/fallback/textures/background/sea-night-f.png
+++ b/backgrounds/fallback/textures/background/sea-night-f.png
--- a/backgrounds/fallback/textures/background/sea-night.png
+++ b/backgrounds/fallback/textures/background/sea-night.png
--- a/backgrounds/fallback/textures/background/sea-storm-f.png
+++ b/backgrounds/fallback/textures/background/sea-storm-f.png
--- a/backgrounds/fallback/textures/background/sea-storm.png
+++ b/backgrounds/fallback/textures/background/sea-storm.png
--- a/backgrounds/fallback/textures/background/sea-thunder-f.png
+++ b/backgrounds/fallback/textures/background/sea-thunder-f.png
--- a/backgrounds/fallback/textures/background/sea-thunder.png
+++ b/backgrounds/fallback/textures/background/sea-thunder.png
--- a/backgrounds/fallback/textures/background/sky-c.jpg
+++ b/backgrounds/fallback/textures/background/sky-c.jpg
--- a/backgrounds/fallback/textures/background/sky-iv-c.jpg
+++ b/backgrounds/fallback/textures/background/sky-iv-c.jpg
--- a/backgrounds/fallback/textures/background/sky-iv-dark.jpg
+++ b/backgrounds/fallback/textures/background/sky-iv-dark.jpg
--- a/backgrounds/fallback/textures/background/sky-iv.jpg
+++ b/backgrounds/fallback/textures/background/sky-iv.jpg
--- a/backgrounds/fallback/textures/background/sky.jpg
+++ b/backgrounds/fallback/textures/background/sky.jpg
--- a/backgrounds/fallback/textures/background/sky_iv_2-c.png
+++ b/backgrounds/fallback/textures/background/sky_iv_2-c.png
--- a/backgrounds/fallback/textures/background/sky_iv_2.png
+++ b/backgrounds/fallback/textures/background/sky_iv_2.png
--- a/backgrounds/fallback/textures/background/star-c.png
+++ b/backgrounds/fallback/textures/background/star-c.png
--- a/backgrounds/fallback/textures/background/star.png
+++ b/backgrounds/fallback/textures/background/star.png
--- a/backgrounds/fallback/textures/background/sunset-c.jpg
+++ b/backgrounds/fallback/textures/background/sunset-c.jpg
--- a/backgrounds/fallback/textures/background/sunset.jpg
+++ b/backgrounds/fallback/textures/background/sunset.jpg
--- a/backgrounds/fallback/textures/background/twilight-c.png
+++ b/backgrounds/fallback/textures/background/twilight-c.png
--- a/backgrounds/fallback/textures/background/twilight.png
+++ b/backgrounds/fallback/textures/background/twilight.png
--- a/backgrounds/fallback/textures/background/undersea-c.png
+++ b/backgrounds/fallback/textures/background/undersea-c.png
--- a/backgrounds/fallback/textures/background/undersea.png
+++ b/backgrounds/fallback/textures/background/undersea.png
--- a/backgrounds/fallback/textures/background/underwater-c.jpg
+++ b/backgrounds/fallback/textures/background/underwater-c.jpg
--- a/backgrounds/fallback/textures/background/underwater.jpg
+++ b/backgrounds/fallback/textures/background/underwater.jpg
--- a/backgrounds/fallback/textures/background/watervault-c.jpg
+++ b/backgrounds/fallback/textures/background/watervault-c.jpg
--- a/backgrounds/fallback/textures/background/watervault.jpg
+++ b/backgrounds/fallback/textures/background/watervault.jpg
--- a/backgrounds/fallback/textures/center/anim/hiyuki.png
+++ b/backgrounds/fallback/textures/center/anim/hiyuki.png
--- a/Show More
+++ b/Show More