diff --git a/.gitignore b/.gitignore index 6a3b186e..e0d091c7 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,5 @@ test.png /assets/* !/assets/cubyz !/assets/backgrounds/default_background.png +/assets/cubyz/music +/assets/cubyz/fonts diff --git a/assets/cubyz/fonts/unscii-16-full.ttf b/assets/cubyz/fonts/unscii-16-full.ttf deleted file mode 100644 index 0a3a84eb..00000000 Binary files a/assets/cubyz/fonts/unscii-16-full.ttf and /dev/null differ diff --git a/assets/cubyz/music/DarkTimes.ogg b/assets/cubyz/music/DarkTimes.ogg deleted file mode 100644 index 0ca6b3ec..00000000 Binary files a/assets/cubyz/music/DarkTimes.ogg and /dev/null differ diff --git a/assets/cubyz/music/EasternThought.ogg b/assets/cubyz/music/EasternThought.ogg deleted file mode 100644 index 44f791f1..00000000 Binary files a/assets/cubyz/music/EasternThought.ogg and /dev/null differ diff --git a/assets/cubyz/music/GymnopedieNo1.ogg b/assets/cubyz/music/GymnopedieNo1.ogg deleted file mode 100644 index 4bf53777..00000000 Binary files a/assets/cubyz/music/GymnopedieNo1.ogg and /dev/null differ diff --git a/assets/cubyz/music/KingBoard.ogg b/assets/cubyz/music/KingBoard.ogg deleted file mode 100644 index 3d4465d7..00000000 Binary files a/assets/cubyz/music/KingBoard.ogg and /dev/null differ diff --git a/assets/cubyz/music/Sincerely.ogg b/assets/cubyz/music/Sincerely.ogg deleted file mode 100644 index c24b7fbe..00000000 Binary files a/assets/cubyz/music/Sincerely.ogg and /dev/null differ diff --git a/assets/cubyz/music/credits.txt b/assets/cubyz/music/credits.txt deleted file mode 100644 index f402ba8d..00000000 --- a/assets/cubyz/music/credits.txt +++ /dev/null @@ -1,44 +0,0 @@ -TotalDemented ( https://www.youtube.com/channel/UCut9PCEq4cEJogfEPUXk7Gg ): -cubyz.ogg -leaves.ogg -in_the_depths.ogg -la_kubisa_caverna.ogg -la_kubisa_caverna_69.ogg -tides.ogg - - -sinanimea: -sunrise.ogg -under_the_water_sky.ogg - - -Mrmayman: -out_of_breath.ogg - - - -Kevin MacLeod - -Syncerely by Kevin MacLeod -Link: https://incompetech.filmmusic.io/song/5033-sincerely -License: https://filmmusic.io/standard-license - -Gymnopedie No. 1 by Kevin MacLeod -Link: https://incompetech.filmmusic.io/song/3837-gymnopedie-no-1 -License: https://filmmusic.io/standard-license - -Dark Times by Kevin MacLeod -Link: https://incompetech.filmmusic.io/song/3611-dark-times -License: https://filmmusic.io/standard-license - -Eastern Thought by Kevin MacLeod -Link: https://incompetech.filmmusic.io/song/3692-eastern-thought -License: https://filmmusic.io/standard-license - -Mana Two Part 2 by Kevin MacLeod -Link: https://incompetech.filmmusic.io/song/5713-mana-two-part-2 -License: https://filmmusic.io/standard-license - -Heart of the Beast by Kevin MacLeod -Link: https://incompetech.filmmusic.io/song/3862-heart-of-the-beast -License: https://filmmusic.io/standard-license diff --git a/assets/cubyz/music/cubyz.ogg b/assets/cubyz/music/cubyz.ogg deleted file mode 100644 index a388fe7a..00000000 Binary files a/assets/cubyz/music/cubyz.ogg and /dev/null differ diff --git a/assets/cubyz/music/heart-of-the-beast.ogg b/assets/cubyz/music/heart-of-the-beast.ogg deleted file mode 100644 index 49ba4223..00000000 Binary files a/assets/cubyz/music/heart-of-the-beast.ogg and /dev/null differ diff --git a/assets/cubyz/music/in_the_depths.ogg b/assets/cubyz/music/in_the_depths.ogg deleted file mode 100644 index af2e1062..00000000 Binary files a/assets/cubyz/music/in_the_depths.ogg and /dev/null differ diff --git a/assets/cubyz/music/la_kubisa_caverna.ogg b/assets/cubyz/music/la_kubisa_caverna.ogg deleted file mode 100644 index cd48d31a..00000000 Binary files a/assets/cubyz/music/la_kubisa_caverna.ogg and /dev/null differ diff --git a/assets/cubyz/music/la_kubisa_caverna_69.ogg b/assets/cubyz/music/la_kubisa_caverna_69.ogg deleted file mode 100644 index 2a0bfdfb..00000000 Binary files a/assets/cubyz/music/la_kubisa_caverna_69.ogg and /dev/null differ diff --git a/assets/cubyz/music/leaves.ogg b/assets/cubyz/music/leaves.ogg deleted file mode 100644 index a9681da2..00000000 Binary files a/assets/cubyz/music/leaves.ogg and /dev/null differ diff --git a/assets/cubyz/music/mana-two-part-2.ogg b/assets/cubyz/music/mana-two-part-2.ogg deleted file mode 100644 index 9a163af2..00000000 Binary files a/assets/cubyz/music/mana-two-part-2.ogg and /dev/null differ diff --git a/assets/cubyz/music/out_of_breath.ogg b/assets/cubyz/music/out_of_breath.ogg deleted file mode 100644 index 33c40e25..00000000 Binary files a/assets/cubyz/music/out_of_breath.ogg and /dev/null differ diff --git a/assets/cubyz/music/sunrise.ogg b/assets/cubyz/music/sunrise.ogg deleted file mode 100644 index cce9f721..00000000 Binary files a/assets/cubyz/music/sunrise.ogg and /dev/null differ diff --git a/assets/cubyz/music/tides.ogg b/assets/cubyz/music/tides.ogg deleted file mode 100644 index d565bee3..00000000 Binary files a/assets/cubyz/music/tides.ogg and /dev/null differ diff --git a/assets/cubyz/music/under_the_water_sky.ogg b/assets/cubyz/music/under_the_water_sky.ogg deleted file mode 100644 index 287ce480..00000000 Binary files a/assets/cubyz/music/under_the_water_sky.ogg and /dev/null differ diff --git a/build.zig b/build.zig index 1c3d1ecc..703419f7 100644 --- a/build.zig +++ b/build.zig @@ -156,6 +156,18 @@ pub fn build(b: *std.Build) !void { const useLocalDeps = b.option(bool, "local", "Use local cubyz_deps") orelse false; + const largeAssets = b.dependency("cubyz_large_assets", .{}); + b.installDirectory(.{ + .source_dir = largeAssets.path("music"), + .install_subdir = "assets/cubyz/music/", + .install_dir = .{ .custom = ".." }, + }); + b.installDirectory(.{ + .source_dir = largeAssets.path("fonts"), + .install_subdir = "assets/cubyz/fonts/", + .install_dir = .{ .custom = ".." }, + }); + const exe = b.addExecutable(.{ .name = "Cubyzig", .root_source_file = b.path("src/main.zig"), diff --git a/build.zig.zon b/build.zig.zon index 0d95354b..6b357bef 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -36,5 +36,9 @@ .url = "https://github.com/PixelGuys/Cubyz-Libs/releases/download/6/cubyz_deps_x86_64-windows-gnu.tar.gz", .hash = "N-V-__8AAIpW1AJNtAJnajSjZfiiqMB2tKQ8qkR2g6nhf5SE", }, + .cubyz_large_assets = .{ + .url = "git+https://github.com/PixelGuys/Cubyz-Assets/#e0ea686f86c008b29cd109e1bdd757ce6574eaf3", + .hash = "N-V-__8AAAxDUATPdad1MQC8jeiFsoXRet_SvG6acW5Dmxdh", + }, }, }