Skip to content
Permalink
Browse files

Fixed textures of included maps

- Fixed texture on maps
- Added new soundtrack by F1NG3RS
- Added optional soundtrack URL definition
- Fixed Makefile to build server on Linux
  • Loading branch information
YellowberryHN committed Jan 16, 2020
1 parent d79a43e commit 5ea10ef47d22c51bfe9c3368231736ce47fa2e2b
@@ -202,7 +202,7 @@ skyboxglare 1
smoothdist 32
smoothmove 75
soundpack "default"
soundtrack "adwh"
soundtrack "f1ng3rs"
soundvol 127
sparklyfix 0
spawnwait 0
@@ -814,7 +814,10 @@ newgui soundtrack [
guistayopen [
guitext (concat "Soundtrack:" $soundtrack)
guitext (concatword "^f1" $_soundtrack_title)
guitext (concatword "^f0By " $_soundtrack_author)
guitext (concatword "By " $_soundtrack_author)
if (!=s $_soundtrack_url "") [
guitext (concatword "^f0" $_soundtrack_url)
]
guibar
guilist [
guilist [
@@ -0,0 +1,4 @@
_soundtrack_title ""
_soundtrack_author ""
_soundtrack_url ""
musicnum = 1
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN +130 KB packages/base/hr.cfg
Binary file not shown.
BIN -1.87 KB (100%) packages/base/hr.cmr
Binary file not shown.
Binary file not shown.
BIN +38.2 KB (100%) packages/base/neo_falls.cmr
Binary file not shown.
Binary file not shown.
BIN +53 KB (100%) packages/base/neo_noir.cmr
Binary file not shown.
Binary file not shown.
BIN +1.51 MB (410%) packages/base/retrograde.cmr
Binary file not shown.
BIN +130 KB (140000%) packages/base/space_ship.cfg
Binary file not shown.
BIN -23.8 KB (98%) packages/base/space_ship.cmr
Binary file not shown.
Binary file not shown.
BIN +54.2 KB (260%) packages/base/zigguraut.cmr
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
No changes.
@@ -0,0 +1,8 @@
// VGM
// By F1NG3RS
// See credits.txt for more info

_soundtrack_title "VGM"
_soundtrack_author "^fs^fhF1NG3RS^fr"
_soundtrack_url "https://f1ng3rs.bandcamp.com/album/vgm"
musicnum = 11
@@ -202,7 +202,7 @@ skyboxglare 1
smoothdist 32
smoothmove 75
soundpack "default"
soundtrack "adwh"
soundtrack "f1ng3rs"
soundvol 127
sparklyfix 0
spawnwait 0
@@ -154,6 +154,7 @@ SERVER_OBJS= \
shared/stream-standalone.o \
shared/tools-standalone.o \
shared/cJSON/cJSON.o \
shared/microtar.o \
engine/command-standalone.o \
engine/server-standalone.o \
engine/worldio-standalone.o \
@@ -165,6 +166,7 @@ MASTER_OBJS= \
shared/stream-standalone.o \
shared/tools-standalone.o \
shared/cJSON/cJSON.o \
shared/microtar.o \
engine/command-standalone.o \
engine/master-standalone.o

@@ -237,13 +237,15 @@ void startmusic(char *name, char *cmd)
}

COMMANDN(music, startmusic, "ss");
SVARFP(soundtrack, "adwh", {
SVARFP(soundtrack, "adwh", {
execfile("data/streset.cfg", false);
defformatstring(soundtrackcfgname, "packages/music/%s/soundtrack.cfg", soundtrack);
execfile(soundtrackcfgname, false);
if (identexists("playsong")) execute("playsong");
});
SVARP(_soundtrack_title, "");
SVARP(_soundtrack_author, "");
SVARP(_soundtrack_url, "");

static Mix_Chunk *loadwav(const char *name)
{
@@ -4,7 +4,7 @@ namespace game
{
char* gametitle = "Project Crimson"; // game name: are you dumb
char* gamestage = "Alpha"; // stage: alpha, beta, release, whatever
char* gameversion = "2.1.1"; // version: major.minor(.patch[.bugfix])
char* gameversion = "2.1.1.1"; // version: major.minor(.patch[.hotfix])

ICOMMAND(version, "", (), {
defformatstring(vers, "%s %s %s", gametitle, gamestage, gameversion);
BIN +83.5 KB (200%) src/vcpp/cardboard.aps
Binary file not shown.

0 comments on commit 5ea10ef

Please sign in to comment.
You can’t perform that action at this time.