Skip to content

Commit

Permalink
Updated version number and disabled the extras menu
Browse files Browse the repository at this point in the history
  • Loading branch information
hhyyrylainen committed Apr 14, 2019
1 parent c01215d commit 5ed6969
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ link_directories("${LEVIATHAN_SRC}/build/bin")
set(PROGRAM_VERSION_STABLE 0)
set(PROGRAM_VERSION_MAJOR 4)
set(PROGRAM_VERSION_MINOR 1)
set(PROGRAM_VERSION_PATCH 0)
set(PROGRAM_VERSION_PATCH 1)
set(PROGRAM_VERSION_SUFFIX "")

set(PROGRAM_VERSION_STR ${PROGRAM_VERSION_STABLE}.${PROGRAM_VERSION_MAJOR}.${PROGRAM_VERSION_MINOR}.${PROGRAM_VERSION_PATCH}${PROGRAM_VERSION_SUFFIX})
Expand Down
15 changes: 8 additions & 7 deletions scripts/gui/main_menu.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,14 @@ export function runMenuSetup(){
common.playButtonPressSound();
newGame();
}, true);
document.getElementById("extrasButton").addEventListener("click", (event) => {
event.stopPropagation();
common.playButtonPressSound();
$("#mainMenu").slideUp("fast", () => {
$("#extrasMenu").slideDown("fast");
});
}, true);
// The prototype doesn't really work so disabled for now
// document.getElementById("extrasButton").addEventListener("click", (event) => {
// event.stopPropagation();
// common.playButtonPressSound();
// $("#mainMenu").slideUp("fast", () => {
// $("#extrasMenu").slideDown("fast");
// });
// }, true);
document.getElementById("backFromExtras").addEventListener("click", (event) => {
event.stopPropagation();
common.playButtonPressSound();
Expand Down
2 changes: 1 addition & 1 deletion scripts/gui/thrive_gui.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<div class="MenuButton DisabledButton">Load Game</div>
<div class="MenuButton DisabledButton">Options</div>
<div class="MenuButton DisabledButton">Tools</div>
<div class="MenuButton" id="extrasButton">Extras</div>
<div class="MenuButton DisabledButton" id="extrasButton">Extras</div>
<div class="MenuButton DisabledButton">Credits</div>
<div class="MenuButton" id="quitButton">Exit</div>
</div>
Expand Down

0 comments on commit 5ed6969

Please sign in to comment.