Skip to content

Commit

Permalink
merge(load save): merged with master load save
Browse files Browse the repository at this point in the history
  • Loading branch information
@Gurvan-Le-Letty
Gurvan-Le-Letty committed Jun 19, 2022
2 parents 5859214 + 5574fab commit f0d118c
Show file tree
Hide file tree
Showing 52 changed files with 1,163 additions and 408 deletions.
11 changes: 9 additions & 2 deletions project/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ file(GLOB SOURCES
Source/Objects/3DObject/MapObject/Block/*.cpp
Source/Objects/3DObject/MapObject/Map/*.cpp
Source/Objects/3DObject/PlayerObject/*.cpp
Source/Objects/3DObject/AiObject/*.cpp


Source/Scenes/*.cpp
Expand Down Expand Up @@ -83,9 +84,15 @@ file(GLOB SOURCES

# specify the sources
file(GLOB TESTS
Tests/Source/Audio/*.cpp
Tests/Source/Core/*.cpp
Tests/Source/Datas/Position/*.cpp
Tests/Source/Datas/Rendering/*.cpp
Tests/Source/Errors/*.cpp
Tests/Source/Inputs/*.cpp
Tests/Source/Objects/*.cpp
Tests/Source/Scenes/*.cpp
Tests/Source/Settings/*.cpp
Tests/Source/Tools/*.cpp
)

Expand Down Expand Up @@ -126,7 +133,8 @@ include_directories(
Source/Objects/3DObject/MapObject/
Source/Objects/3DObject/MapObject/Block/
Source/Objects/3DObject/MapObject/Map/
Source/Objects/3DObject/PlayerObject
Source/Objects/3DObject/PlayerObject/
Source/Objects/3DObject/AiObject/

Source/Scenes/
Source/Scenes/GameScenes/
Expand Down Expand Up @@ -157,7 +165,6 @@ include_directories(
Source/Tools/
)


option(UNIT_TEST "Run unit tests" OFF) #OFF by default
if (UNIT_TEST)
add_executable(unit_tests ${SOURCES} ${TESTS})
Expand Down
25 changes: 23 additions & 2 deletions project/Conf/Scenes/EndGameScene/button.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,29 @@
"2-Continue": {
"type": "button",
"nbFrame": 3,
"position": [1770, 900, 0],
"position": [940, 900, 0],
"audio": "Ressources/buttons/click_sound.ogg",
"texture": "Ressources/buttons/next_button.png"
"texture": "Ressources/buttons/little_button.png",
"text": {
"font": "Ressources/fonts/squarefont/Square.ttf",
"text": "Main Menu",
"color": [255, 255, 255, 255],
"fontSize": 40,
"position": [80, 40, 0]
}
},
"3-Restart": {
"type": "button",
"nbFrame": 3,
"position": [1470, 900, 0],
"texture": "Ressources/buttons/little_button.png",
"audio": "Ressources/buttons/click_sound.ogg",
"text": {
"font": "Ressources/fonts/squarefont/Square.ttf",
"text": "Battle Again",
"color": [255, 255, 255, 255],
"fontSize": 40,
"position": [80, 40, 0]
}
}
}
9 changes: 9 additions & 0 deletions project/Conf/Scenes/GameScene/endingGameText.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"0-winner-set": {
"font": "Ressources/fonts/primetime/PRIMETIME.ttf",
"text": "",
"color": [255, 255, 255, 255],
"fontSize": 100,
"position": [700, 400, 0]
}
}
13 changes: 9 additions & 4 deletions project/Conf/Scenes/GameScene/image.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,27 @@
"scale": 1,
"position": [830, 0, 0]
},
"1-score-player-1": {
"1-set-logo": {
"texture": "Ressources/sprites/set.png",
"scale": 1,
"position": [0, 0, 0]
},
"2-score-player-1": {
"texture": "Ressources/sprites/bonus_card_left.png",
"scale": 1,
"position": [0, 100, 0]
},
"2-score-player-2": {
"3-score-player-2": {
"texture": "Ressources/sprites/bonus_card_left.png",
"scale": 1,
"position": [0, 500, 0]
},
"3-score-player-3": {
"4-score-player-3": {
"texture": "Ressources/sprites/bonus_card_right.png",
"scale": 1,
"position": [1500, 110, 0]
},
"4-score-player-4": {
"5-score-player-4": {
"texture": "Ressources/sprites/bonus_card_right.png",
"scale": 1,
"position": [1500, 510, 0]
Expand Down
9 changes: 9 additions & 0 deletions project/Conf/Scenes/GameScene/startingGameText.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"0-counter": {
"font": "Ressources/fonts/primetime/PRIMETIME.ttf",
"text": "",
"color": [255, 255, 255, 255],
"fontSize": 100,
"position": [700, 400, 0]
}
}
17 changes: 12 additions & 5 deletions project/Conf/Scenes/GameScene/text.json
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,40 @@
{
"0": {
"0-timer": {
"font": "Ressources/fonts/primetime/PRIMETIME.ttf",
"text": "",
"color": [255, 255, 255, 255],
"fontSize": 50,
"position": [915, 35, 0]
},
"1-1J": {
"1-number-of-sets": {
"font": "Ressources/fonts/primetime/PRIMETIME.ttf",
"text": "",
"color": [255, 255, 255, 255],
"fontSize": 50,
"position": [60, 40, 0]
},
"2-1J": {
"font": "Ressources/fonts/primetime/PRIMETIME.ttf",
"text": "1J",
"color": [0, 0, 0, 255],
"fontSize": 30,
"position": [45, 290, 0]
},
"2-2J": {
"3-2J": {
"font": "Ressources/fonts/primetime/PRIMETIME.ttf",
"text": "2J",
"color": [0, 0, 0, 255],
"fontSize": 30,
"position": [1822, 300, 0]
},
"3-3J": {
"4-3J": {
"font": "Ressources/fonts/primetime/PRIMETIME.ttf",
"text": "3J",
"color": [0, 0, 0, 255],
"fontSize": 30,
"position": [40, 690, 0]
},
"4-4J": {
"5-4J": {
"font": "Ressources/fonts/primetime/PRIMETIME.ttf",
"text": "4J",
"color": [0, 0, 0, 255],
Expand Down
18 changes: 16 additions & 2 deletions project/Conf/Scenes/IntroductionScene/text.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@
{
"0-winner-player": {
"0-starter-text": {
"font": "Ressources/fonts/primetime/PRIMETIME.ttf",
"text": "Press a Key to Start",
"color": [255, 255, 255, 255],
"fontSize": 40,
"position": [750, 700, 0]
},
"1-copyright-text": {
"font": "Ressources/fonts/primetime/PRIMETIME.ttf",
"text": "©2022 Studio17 Entertainment",
"color": [128, 128, 128, 255],
"fontSize": 30,
"position": [750, 1035, 0]
},
"2-version-text": {
"font": "Ressources/fonts/primetime/PRIMETIME.ttf",
"text": "ver.1.7",
"color": [128, 128, 128, 255],
"fontSize": 30,
"position": [800, 700, 0]
"position": [1750, 1035, 0]
}
}
6 changes: 3 additions & 3 deletions project/Conf/Settings/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
1,
0
],
"musicVolume": 1.0000001192092896,
"saveIndex": 4,
"soundVolume": 1.0000001192092896,
"musicVolume": 1.639127766850379e-08,
"saveIndex": 8,
"soundVolume": 1.639127766850379e-08,
"title": "Indie Studio",
"windowSize": [
1920,
Expand Down
Binary file added project/Ressources/sprites/set.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions project/Save/Maps/random.map
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
XXXXXXXXXXX
X OO OO X
X OOOO X
X xOxOxOx X
XO OOOOOOOX
XOxOxOxOxOX
XOOOOOOOOOX
XOxOxOxOx X
XOOOO OOOOX
X xOxOxOx X
XO OOO OOOX
XOxOx xOxOX
XO OOO OOOX
XOx xOxOxOX
XOOOOOOOO X
X xOxOx x X
X OOOOO X
XXXXXXXXXXX
12 changes: 6 additions & 6 deletions project/Source/Core/Core.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,17 +80,17 @@ void Core::loadMenuScenes()
_menuScenes.emplace(Scene::Scenes::BINDING_MENU, std::make_shared<Scene::BindingScene>(_settings, _parallax, _keyboard, _actionPressed, _playerActions, _gamepadPlayerActions));
updateLoadingScreen("..");
_menuScenes.emplace(Scene::Scenes::SELECT_PLAYER, std::make_shared<Scene::SelectPlayerScene>(_settings, _gameSettings, _parallax, std::bind(&Scene::GameScene::applyGameParams, gameScene)));
updateLoadingScreen(".");
_menuScenes.emplace(Scene::Scenes::END_GAME, std::make_shared<Scene::EndGameScene>(_settings, _gameSettings, _parallax));
updateLoadingScreen("");
_menuScenes.emplace(Scene::Scenes::SELECT_MAP, std::make_shared<Scene::SelectMapScene>(_settings, _gameSettings, _parallax));
_menuScenes.emplace(Scene::Scenes::END_GAME, std::make_shared<Scene::EndGameScene>(_settings, _gameSettings, _parallax, std::bind(&Scene::GameScene::applyGameParams, gameScene)));
updateLoadingScreen(".");
_menuScenes.emplace(Scene::Scenes::CREDITS, std::make_shared<Scene::CreditsScene>(_settings, _parallax));
_menuScenes.emplace(Scene::Scenes::SELECT_MAP, std::make_shared<Scene::SelectMapScene>(_settings, _gameSettings, _parallax));
updateLoadingScreen("..");
_menuScenes.emplace(Scene::Scenes::HELP, std::make_shared<Scene::HelpScene>(_settings, _parallax));
_menuScenes.emplace(Scene::Scenes::CREDITS, std::make_shared<Scene::CreditsScene>(_settings, _parallax));
updateLoadingScreen("...");
_menuScenes.emplace(Scene::Scenes::HELP, std::make_shared<Scene::HelpScene>(_settings, _parallax));
updateLoadingScreen("..");
_menuScenes.emplace(Scene::Scenes::INFORMATION, std::make_shared<Scene::InformationScene>(_settings, _parallax));
updateLoadingScreen("");
updateLoadingScreen(".");
_settings->getWindow()->endDrawing();
}

Expand Down
Loading

0 comments on commit f0d118c

Please sign in to comment.