Compare commits

..
1 Commits
Author SHA1 Message Date
mr.zero 48d65424a0 Merge branch 'develop' into codegenerator
ci/woodpecker/push/woodpecker Pipeline was successful
2026-04-27 22:58:03 +02:00
-3
View File
@@ -39,14 +39,11 @@ globals = {
"MysteriousManScreen", "MysteriousManScreen",
"DiscussionWindow", "DiscussionWindow",
"EndWindow", "EndWindow",
<<<<<<< HEAD
"PlayerNameWindow", "PlayerNameWindow",
"TextInput", "TextInput",
"CodeGenerator", "CodeGenerator",
"CreditsWindow", "CreditsWindow",
=======
"GameOverWindow", "GameOverWindow",
>>>>>>> develop
"mset", "mset",
"mget", "mget",
"btnp", "btnp",