Merge branch 'develop' into codegenerator

2026-04-27 22:57:18 +02:00
parent 47e5e0ca17 b5dd0cc686
commit c6ce9940a6
17 changed files with 496 additions and 18 deletions
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -24,6 +24,7 @@ globals = {
  "Minigame",
  "Window",
  "ContinuedWindow",
+  "CreditsWindow",
  "TTGIntroWindow",
  "BriefIntroWindow",
  "TitleIntroWindow",
@@ -38,10 +39,14 @@ globals = {
  "MysteriousManScreen",
  "DiscussionWindow",
  "EndWindow",
+<<<<<<< HEAD
  "PlayerNameWindow",
  "TextInput",
  "CodeGenerator",
  "CreditsWindow",
+=======
+  "GameOverWindow",
+>>>>>>> develop
  "mset",
  "mget",
  "btnp",