Merge branch 'develop' into codegenerator

2026-04-27 22:57:18 +02:00
1 changed files with 3 additions and 0 deletions
@@ -39,11 +39,14 @@ globals = {
  "MysteriousManScreen",
  "DiscussionWindow",
  "EndWindow",
+<<<<<<< HEAD
  "PlayerNameWindow",
  "TextInput",
  "CodeGenerator",
  "CreditsWindow",
+=======
  "GameOverWindow",
+>>>>>>> develop
  "mset",
  "mget",
  "btnp",