Compare commits

..

3 Commits

Author SHA1 Message Date
272a54ea87 fix colors
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-02-22 21:32:24 +01:00
14b14ffc0c window.register.lua
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-02-22 21:26:59 +01:00
7e87a78a15 Merge pull request 'feature/context-refactoring' (#13) from feature/context-refactoring into master
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #13
2026-02-22 19:19:02 +00:00
4 changed files with 33 additions and 24 deletions

View File

@@ -34,6 +34,7 @@ screen/screen.walking_to_office.lua
screen/screen.office.lua screen/screen.office.lua
screen/screen.walking_to_home.lua screen/screen.walking_to_home.lua
window/window.manager.lua window/window.manager.lua
window/window.register.lua
window/window.splash.lua window/window.splash.lua
window/window.intro.lua window/window.intro.lua
window/window.menu.lua window/window.menu.lua

View File

@@ -7,11 +7,11 @@ function Config.initial_data()
height = 136 height = 136
}, },
colors = { colors = {
black = 0, black = 2,
light_grey = 13, light_grey = 13,
dark_grey = 14, dark_grey = 14,
red = 2, red = 0,
green = 6, green = 7,
blue = 9, blue = 9,
white = 12, white = 12,
item = 12, item = 12,

View File

@@ -41,24 +41,3 @@ function Window.get_current_handler()
return function() trace("Error: No handler for window: " .. tostring(Context.current_window)) end return function() trace("Error: No handler for window: " .. tostring(Context.current_window)) end
end end
end end
SplashWindow = {}
IntroWindow = {}
MenuWindow = {}
GameWindow = {}
PopupWindow = {}
ConfigurationWindow = {}
AudioTestWindow = {}
MinigameButtonMashWindow = {}
MinigameRhythmWindow = {}
MinigameDDRWindow = {}
-- Registration of all window modules
Window.register("splash", SplashWindow)
Window.register("intro", IntroWindow)
Window.register("menu", MenuWindow)
Window.register("game", GameWindow)
Window.register("popup", PopupWindow)
Window.register("configuration", ConfigurationWindow)
Window.register("audiotest", AudioTestWindow)
Window.register("minigame_button_mash", MinigameButtonMashWindow)
Window.register("minigame_rhythm", MinigameRhythmWindow)
Window.register("minigame_ddr", MinigameDDRWindow)

View File

@@ -0,0 +1,29 @@
SplashWindow = {}
Window.register("splash", SplashWindow)
IntroWindow = {}
Window.register("intro", IntroWindow)
MenuWindow = {}
Window.register("menu", MenuWindow)
GameWindow = {}
Window.register("game", GameWindow)
PopupWindow = {}
Window.register("popup", PopupWindow)
ConfigurationWindow = {}
Window.register("configuration", ConfigurationWindow)
AudioTestWindow = {}
Window.register("audiotest", AudioTestWindow)
MinigameButtonMashWindow = {}
Window.register("minigame_button_mash", MinigameButtonMashWindow)
MinigameRhythmWindow = {}
Window.register("minigame_rhythm", MinigameRhythmWindow)
MinigameDDRWindow = {}
Window.register("minigame_ddr", MinigameDDRWindow)