merge w/ master

1 files changed, 14 insertions, 5 deletions

diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt
index 5c7bb6b..4d02633 100644
--- a/game/CMakeLists.txt
+++ b/game/CMakeLists.txt
@@ -11,7 +11,14 @@ add_subdirectory(../src crepe)
 add_executable(main)
 
 target_sources(main PUBLIC
+	background/AquariumSubScene.cpp
+	background/AquariumScript.cpp
+	background/BackgroundSubScene.cpp
+	background/ForestParallaxScript.cpp
+	background/ForestSubScene.cpp
 	GameScene.cpp
+	background/HallwaySubScene.cpp
+	background/HallwayScript.cpp
 	MoveCameraManualyScript.cpp
 	player/PlayerScript.cpp
 	player/PlayerSubScene.cpp
@@ -22,23 +29,25 @@ target_sources(main PUBLIC
 	workers/WorkersSubScene.cpp
 	workers/WorkerScript.cpp
 	workers/PanicFromPlayerScript.cpp
+	workers/CollisionScript.cpp
 	main.cpp
 	menus/BannerSubScene.cpp
 	menus/ButtonSubScene.cpp
 	menus/IButtonScript.cpp
-	menus/ButtonSetShopScript.cpp
-	menus/ButtonSetMainMenuScript.cpp
+	menus/ButtonSetShopSubScript.cpp
+	menus/ButtonSetMainMenuSubScript.cpp
+	menus/ButtonNextMainMenuSubScript.cpp
 	menus/FloatingWindowSubScene.cpp
 	menus/IFloatingWindowScript.cpp
 	menus/shop/ShopMenuScene.cpp
-	menus/mainmenu/ButtonTransitionPreviewScript.cpp
+	menus/mainmenu/ButtonTransitionPreviewSubScript.cpp
 	menus/mainmenu/ITransitionScript.cpp
 	menus/mainmenu/MainMenuScene.cpp
-	menus/mainmenu/TransitionStartScript.cpp
+	menus/mainmenu/TransitionStartSubScript.cpp
 	menus/endgame/EndGameSubScene.cpp
 	menus/endgame/EndGameSubScript.cpp
 	coins/CoinSubScene.cpp
-	coins/CoinPool.cpp
+	coins/CoinPoolSubScene.cpp
 	coins/CoinSystemScript.cpp
 	coins/CoinScript.cpp
 	hud/HudSubScene.cpp