Zeronaut/KaijuSaveEarth
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Zeronaut:ff1863182e4ee157b563f3160d3fda1b59f162c2
Branches Tags
Zeronaut:main
Zeronaut:macos
Zeronaut:emscripten
..
compare: Zeronaut:f449eda43f6cbd3f90508029e94741f4c2de1f9b
Branches Tags
Zeronaut:macos
Zeronaut:emscripten
Zeronaut:main

No commits in common. "ff1863182e4ee157b563f3160d3fda1b59f162c2" and "f449eda43f6cbd3f90508029e94741f4c2de1f9b" have entirely different histories.
ff1863182e ... f449eda43f

3 changed files with 4 additions and 17 deletions
Show Stats Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

3
.gitignore vendored
View File

@ -110,6 +110,3 @@ CMakeCache.txt
# macOS finder files # macOS finder files
.DS_Store .DS_Store
# VS Code project stuff
.vscode*

18
src/game/Game.cpp
View File

@ -145,26 +145,16 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g
} }
std::string kaijuTex = Game::projPath + "assets/textures/actors/kaijuturtle.png"; std::string kaijuTex = Game::projPath + "assets/textures/actors/kaijuturtle.png";
<<<<<<< HEAD
std::string fontTex = Game::projPath + "assets/textures/ui/ui-font-lorez5.png";
std::string textBoxTex = Game::projPath + "assets/textures/ui/ui-element-bubble.png";
std::string musicFile = Game::projPath + "assets/audio/music/sillypuppy.ogg";
std::string sfxFile = Game::projPath + "assets/audio/sfx/bwoop.wav";
assets->AddTexture("player", kaijuTex.c_str());
assets->AddTexture("font", fontTex.c_str());
assets->AddTexture("textBox", textBoxTex.c_str());
=======
assets->AddTexture("player", kaijuTex.c_str()); assets->AddTexture("player", kaijuTex.c_str());
assets->AddTexture("font", "assets/textures/ui/ui-font-lorez5.png"); assets->AddTexture("font", "assets/textures/ui/ui-font-lorez5.png");
assets->AddTexture("textBox", "assets/textures/ui/ui-element-bubble.png"); assets->AddTexture("textBox", "assets/textures/ui/ui-element-bubble.png");
assets->AddTexture("collider","assets/textures/ColTex.png"); assets->AddTexture("collider","assets/textures/ColTex.png");
>>>>>>> f449eda43f6cbd3f90508029e94741f4c2de1f9b
assets->AddMusicTrack("simonZ",musicFile.c_str()); assets->AddMusicTrack("simonZ","assets/audio/music/sillypuppy.ogg");
assets->AddMusicTrack("simonZ","assets/audio/music/victory.ogg");
assets->AddSoundClip("bwoop",sfxFile.c_str()); assets->AddSoundClip("bwoop","assets/audio/sfx/bwoop.wav");
std::string myText = "U to Start"; std::string myText = "U to Start";
@ -255,7 +245,7 @@ void Game::update()
if (Mix_PlayingMusic() == 0 && gsm->currentState == GameStateManager::ST_COREGAME) if (Mix_PlayingMusic() == 0 && gsm->currentState == GameStateManager::ST_COREGAME)
{ {
// std::cout << "Play Music Now" << std::endl; // std::cout << "Play Music Now" << std::endl;
Mix_PlayMusic(assets->GetMusicTrack("simonZ"), -1); // Mix_PlayMusic(assets->GetMusicTrack("simonZ"), -1);
} }
if (Mix_PlayingMusic() != 0 && gsm->currentState != GameStateManager::ST_COREGAME) if (Mix_PlayingMusic() != 0 && gsm->currentState != GameStateManager::ST_COREGAME)
{ {