Merge dev into main

README.md

@@ -1,5 +1,5 @@
-<p align="center"><img src="https://github.com/Grisgram/gml-raptor/assets/19487451/cdb2ceb4-c13e-4f6f-bfe9-cba63fc6cff4.png" style="display:block; margin:auto; width:438px"></p>
-<h1 align="center">Release 2406</h1>
+<p align="center"><img src="https://github.com/Grisgram/gml-raptor/blob/dev/_assets_/logos_and_banners/gml-raptor-anim.gif" style="display:block; margin:auto; width:438px"></p>
+<h1 align="center">Release 2409</h1>
 
 `gml-raptor` is a ready-to-use project template for [GameMaker Studio 2.3+](https://gamemaker.io) with a comprehensive [wiki documentation](https://github.com/Grisgram/gml-raptor/wiki) that provides lots of classes and functions that will speed up your game development!<br/>
 [The Releases page](https://github.com/Grisgram/gml-raptor/releases) contains the latest version in `.yyz` format (project template) and ready-to-import local packages in `.yymps` format.
@@ -26,9 +26,10 @@ In case you are a night owl like me and you want to support my work,<br/>especia
 ### VERSION LIST
 You need [![gmlogo](https://user-images.githubusercontent.com/19487451/177008359-37a3cdb7-2068-4ac8-84ef-4c455c2194de.png)](https://gamemaker.io)&nbsp;&nbsp;Studio 2.3+ to use `raptor`.<br/>
 These versions of external libraries are packaged into the current `raptor` release:
+
 | GMS Version | Scribble | SNAP | Canvas | OutlineShader | AnimatedFlag | HighScorer |
 |:-:|:-:|:-:|:-:|:-:|:-:|:-:|
-|2404|8.7.1|6.1.1|2.1|3.3|1.5|1.5|
+|2408|9.3|7.0.1|2.2|3.3|1.5|1.5|
 
 ### HOW RELEASES ARE ORGANIZED
 * Find the latest release at the [Releases](https://github.com/Grisgram/gml-raptor/releases) page

example-projects/gml-raptor-demo/datafiles/locale/locale_de.json

@@ -10,8 +10,14 @@
     "game_channel_prod": "Production",
     "game_channel_dev": "Development"
   },
+  "startup_server": {
+	  "connecting": "Verbinde zum Server...",
+	  "connection_success": "[?states/connected]",
+	  "connection_failed": "[?states/disconnected]",
+  },
   "credits": {
-    "credits_title": "Credits"
+    "title": "Credits",
+	"text": "",
   },
   "global_words": {
     "buttons": {
@@ -43,91 +49,4 @@
       "open": "Offen"
     }
   },
-  "main_menu": {
-    "header_text": "Willkommen zur [?legal/game_name]",
-    "version_str": "Version {0} [c_yellow]<- Das ist der Inhalt der Datei version.json[/]",
-    "start_state_game": "[scale,1.25]StateMachine Demo starten",
-    "start_race_game": "[scale,1.25]Race Demo starten",
-    "show_message": "[scale,1.25]MessageBox anzeigen",
-    "exit_game": "[scale,1.25]Spiel beenden",
-    "player_name": "Gib deinen Spielernamen hier ein und klicke \"Speichern\",\num das Savegame System zu demonstrieren",
-    "button_save": "Speichern",
-    "button_load": "Laden",
-    "button_save_enc": "Speichern verschl.",
-    "button_load_enc": "Laden verschlüsselt",
-    "info": {
-      "about": "Du siehst hier ein leeres gml-raptor Projekt.[delay,750]\nNur 1 Font,[delay,250] keine Button Sprites,[delay,250] das ist alles auf default.[delay,750]\nBewege die Maus über die Elemente,[delay,250] einige von ihnen\nhaben einen [c_white]Tooltip[/][delay,250], der dir sagt,[delay,250]\nwo du den Code im Projekt[delay,250] für dieses spezifische Item findest.[delay,750]\n\nAchja, der Font ist im Script [delay,250][c_white]Game_Configuration[/] als[delay,250]\n[delay,250][c_white]scribble_font_set_default[/][delay,250] eingetragen![delay,750]\n\nDieser Text wird dir freundlich präsentiert[delay,250] von der [c_white]StoryTeller[/] Control!",
-      "hotswap": "Klicke die Sprachbuttons,\num LG_hotswap in Aktion zu sehen",
-      "flag": "Die animated_flag in Aktion ->",
-      "save_loc": "Die Savegame Dateien sind in\nC:/Benutzer/<dein-user-name>/appdata/local/gml_raptor_demo"
-    },
-    "demo_message": {
-      "title": "Demo MessageBox",
-      "text": "Das ist eine Nachricht mit [ci_accent]super wichtiger Information[/]\nfür den Benutzer!\n\nMit nur einer Zeile code!",
-      "click_title": "Button geklickt",
-      "ok_clicked": "Du hast [ci_accent]OK[/] geklickt",
-      "cancel_clicked": "Du hast [ci_accent]ABBRECHEN[/] geklickt"
-    },
-    "tooltips": {
-      "language_button": "Objekt: Objects\\LanguageButton\nCode: Scripts\\MainMenuButtons\nEinstellungen: RoomEditor Variables auf diesem Objekt",
-      "game_button": "Objekt: _gml_raptor_\\UI\\controls\\TextButton\nCode: Scripts\\MainMenuButtons\nEinstellungen: RoomEditor Variables auf diesem Objekt",
-      "demo_label": "Dieser String wurde mittels String Reference in json aufgelöst.\nSieh in die locale_de.json bei \"main_menu/header_text\" im Included Files\\locale Ordner!",
-      "version_label": "Sieh dir die version.json Datei im Included Files Ordner an!",
-      "inputbox": "Gib etwas Text ein und teste die UX:\n[ci_accent]Cursortasten[/], [ci_accent]Shift+Cursor[/]\n[ci_accent]Pos1, End[/] (mit und ohne Shift)\n[ci_accent]Mouse-Click[/], [ci_accent]Mouse-Drag[/] zum Selektieren,\n[ci_accent]Strg-C, Strg-X, Strg-V[/] etc\n\nDie InputBox ist sehr komfortabel!",
-      "playground_button": "Grisgram's Spielwiese.\nDieser Raum ist nicht übersetzt, keine Benutzerführung.\nHier teste ich einige Features von raptor, was auch immer gerade\nin Entwicklung ist.",
-      "animation": "Hier siehst du eine Animation, die mit nur einer Zeile Code\nerstellt wurde, basierend auf AnimCurves.\nDie Partikel-Emitter sind gänzlich ohne Code erstellt.\nDie Partikel selbst wurden mit dem ParticleEditor generiert.\nSchau ins [ci_accent]raptor-wiki[/] für mehr Information!",
-      "ui_theme": "Ein [ci_accent]THEME[/] ist ein vordefiniertes Set von Farben für das UI und kann jederzeit gewechselt werden!\nSchau in die [ci_accent]UI THEMES[/] Seite im wiki!",
-      "ui_skin": "Eine [ci_accent]SKIN[/] ist ein Set von Sprites und Parametern, welches das Aussehen der UI verändert.\nKann jederzeit gewechselt werden, sogar ohne den Raum neu zu starten!\nSchau in die [ci_accent]UI SKINS[/] Seite im wiki!"
-    },
-    "start_playground": "[scale,1.25]Dev Playground",
-    "start_uidemo": "[scale,1.25]UI Demo starten",
-    "version_label_string": "[c_yellow]<- Dies ist die GameVersionLabel control[/]",
-    "copyright_label_string": "[c_yellow]<- Dies ist die CopyrightLabel control[/]",
-    "label_choose_theme": "Wähle das UI_THEME mit diesen Buttons.\nBlau ist das default theme von raptor.",
-    "label_choose_skin": "Wähle die UI_SKIN mit diesen Buttons.\nLinks ist die default skin von raptor."
-  },
-  "play": {
-    "how_to_play_states": {
-      "title": "Spielregeln",
-      "text": "Du bewegst dich mit den WASD Tasten.\n\nIn der Mitte des Bildschirms erscheint ein [ci_accent]Spawner[/].\nEr spuckt ständig [ci_accent]Gegner[/] aus.\n \nSie sehen dich, wenn du in ihren gelben [ci_accent]Scanner-Bereich[/] kommst.\n\n[shake]Dann stirbst du.[/]\n\nWenn du einen Gegner von hinten berührst, [shake]dann stirbt der Gegner![/]\n \n[ci_accent]Versuche, so lange wie möglich am Leben zu bleiben!"
-    },
-    "how_to_play_race": {
-      "title": "Race Demo",
-      "text": "Dies ist eine kurze Demo, die ein Spielfeld wie in einem Match-3 Spiel\nmit zufälligen Edelsteinen mit Hilfe von [ci_accent]RaceTables[/] füllt.\n\nDu kannst die Wahrscheinlichkeiten und den Enabled-Zustand anpassen.\n\nIm Raum befindet sich ein [ci_accent]RaceController[/] und ein [ci_accent]RaceTable[/] Objekt.\n\n[scale,1.25][ci_accent]ACHTUNG![/] Dies ist ein [ci_accent]DEMO[/] Programm!\nDie Eingabefelder sind nicht abgesichert!\nWenn du nonsens eingibst (zb. keine Zahlen als Chance), dann wird es abstürzen!\n\nKlicke auf [ci_accent]Starten[/], um das Spielfeld zu füllen."
-    },
-    "game_over": {
-      "title": "Game over",
-      "text": "Du wurdest entdeckt!\n\nAber du hast immerhin [ci_accent]{0}[/] Gegner eliminiert!\n\nNun geht's zurück zum [ci_accent]Hauptmenü[/]."
-    },
-    "ui": {
-      "score_view": "Gegner eliminiert: [ci_accent][scale,1.5]{0}[/]",
-      "debug_info": "Drücke [ci_accent]F12[/] um die Debug-Infos ein-/auszublenden",
-      "enabled": "Aktiv",
-      "chance": "Chance",
-      "race_start_button": "[scale,1.25]Starten",
-      "race_exit_button": "[scale,1.25]Demo Beenden"
-    }
-  },
-  "ui_demo": {
-    "sizable_window_title": "Ein vergrößerbares Fenster",
-    "window_title_docking": "Control Docking",
-    "show_login": "[scale,1.25][?=ui_demo/window_title_login]",
-    "show_alignment": "[scale,1.25][?=ui_demo/window_title_alignment]",
-    "login_top_message": "Einloggen, um fortzufahren",
-    "login_user": "Benutzername:",
-    "login_pwd": "Passwort:",
-    "login_button": "Anmelden",
-    "login_remember": "Benutzername und Password merken",
-    "login_entered_values": "Auslesen, der eingegebenen Daten aus einem dynamischen Fenster:",
-    "add_dock_plus": "+",
-    "show_anchoring": "[scale,1.25][?=ui_demo/window_title_anchoring]",
-    "dock_demo_info": "Klicke einen der [ci_main]'x'[/] Buttons,\num dynamisch gedockte Elemente zu erzeugen.\n\nLinks- oder Rechts-Klicke [ci_main]gedockte Elemente[/],\num sie zu vergrößern/verkleinern\nund dynamisches Layout zu sehen.",
-    "show_control_tree": "[scale,1.25][?=ui_demo/window_title_docking]",
-    "anchor_top_message": "Demonstration des [ci_accent]Anchoring[/] (Verankerung) von Controls",
-    "window_title_alignment": "Control Alignment",
-    "window_title_login": "Login Dialog Demo",
-    "window_title_anchoring": "Control Anchoring",
-    "alignment_top_message": "Demonstration des [ci_accent]alignment[/] (Ausrichtung) von Controls",
-    "label_made_with_tree": "[ci_dark]Die Buttons (und dieser Text hier)[/] \nwurden ebenfalls mit dem [ci_dark]ControlTree[/] \nauf dem [ci_dark]UI_ROOT[/] erstellt!\nSieh dir den RoomController \ndieses Raums an, dann siehst du, \nwie es gemacht wurde!"
-  }
 }

example-projects/gml-raptor-demo/datafiles/locale/locale_en.json

@@ -10,8 +10,14 @@
     "game_channel_prod": "Production",
     "game_channel_dev": "Development"
   },
+  "startup_server": {
+	  "connecting": "Connecting to Server...",
+	  "connection_success": "[?states/connected]",
+	  "connection_failed": "[?states/disconnected]",
+  },
   "credits": {
-    "credits_title": "Credits"
+    "title": "Credits",
+	"text": "",
   },
   "global_words": {
     "buttons": {
@@ -41,93 +47,6 @@
       "locked": "Locked",
       "closed": "Closed",
       "open": "Open"
-    }
-  },
-  "main_menu": {
-    "header_text": "Welcome to [?legal/game_name]",
-    "version_str": "Version {0} [c_yellow]<- This demonstrates the contents of the version.json file[/]",
-    "start_state_game": "[scale,1.25]Start StateMachine Demo",
-    "start_race_game": "[scale,1.25]Start Race Demo",
-    "show_message": "[scale,1.25]Show MessageBox",
-    "exit_game": "[scale,1.25]Exit Game",
-    "player_name": "Enter your name in the box below\nand click \"Save\" to demo the Savegame System",
-    "button_save": "Save",
-    "button_load": "Load",
-    "button_save_enc": "Save encrypted",
-    "button_load_enc": "Load encrypted",
-    "info": {
-      "about": "You see a blank gml-raptor project here.[delay,750]\nOnly 1 Font,[delay,250] no Button Sprites,[delay,250] this is all default.[delay,750]\nHover over elements, [delay,250]some of them\noffer a [c_white]Tooltip[/][delay,250] that tells you,[delay,250]\nwhere you can find the code in the project[delay,250] for that specific item.[delay,750]\n\nOh, btw, the font is set as [delay,250][c_white]scribble_font_set_default[/][delay,250]\nin the [delay,250][c_white]Game_Configuration script[/]![delay,750]\n\nThis text is presented by the [delay,250][c_white]StoryTeller[/] Control!",
-      "hotswap": "Click the locale buttons,\nto see LG_hotswap in action",
-      "flag": "The animated_flag in action ->",
-      "save_loc": "Your Savegames are located at\nC:/Users/<your-user-name>/appdata/local/gml_raptor_demo"
-    },
-    "demo_message": {
-      "title": "Demo MessageBox",
-      "text": "This is a message displaying [ci_accent]super important information[/]\nto the user!\n\nWith a single line of code!",
-      "click_title": "Button clicked",
-      "ok_clicked": "You clicked [ci_accent]OK",
-      "cancel_clicked": "You clicked [ci_accent]CANCEL"
-    },
-    "tooltips": {
-      "language_button": "Object: Objects\\LanguageButton\nCode: Scripts\\MainMenuButtons\nSettings: RoomEditor Variables on this Object",
-      "game_button": "Object: _gml_raptor_\\UI\\controls\\TextButton\nCode: Scripts\\MainMenuButtons\nSettings: RoomEditor Variables on this Object",
-      "demo_label": "This string is resolved via string reference in json.\nLook at the locale_en.json in the Included Files\\locale folder at \"main_menu/header_text\"!",
-      "version_label": "Look at the version.json File in the Included Files folder!",
-      "inputbox": "Enter some text and test the UX:\n[ci_accent]Cursor keys[/], [ci_accent]Shift+Cursor[/]\n[ci_accent]Home, End[/] (with and without Shift)\n[ci_accent]Mouse-Click[/], [ci_accent]Mouse-Drag[/] to select,\n[ci_accent]Ctrl-C, Ctrl-X, Ctrl-V[/] etc\n\nThe InputBox offers quite some comfort!",
-      "playground_button": "Grisgram's domain.\nIn this room I test some features of raptor.\nIt's not translated, no user guidance, it's... my playground!",
-      "animation": "You see here an animation that is done with a single line of code,\nbased on AnimCurves.\nThe particle emitters are codeless and are done with the\nParticleEditor tool (see [ci_accent]raptor wiki[/] for more information)",
-      "ui_theme": "A [ci_accent]THEME[/] is a pre-defined set of colors and can be swapped any time!\nSee the [ci_accent]UI Themes[/] page in the wiki!",
-      "ui_skin": "A [ci_accent]SKIN[/] is a set of sprites and values that changes, how your UI looks.\nCan be swapped any time, even without restarting the room!\nSee the [ci_accent]UI Themes[/] page in the wiki!"
-    },
-    "start_playground": "[scale,1.25]Dev Playground",
-    "start_uidemo": "[scale,1.25]Start UI Demo",
-    "version_label_string": "[c_yellow]<- This is the GameVersionLabel control[/]",
-    "copyright_label_string": "[c_yellow]<- This is the CopyrightLabel control[/]",
-    "label_choose_theme": "Choose the UI_THEME with these buttons.\nBlue is raptor's default.",
-    "label_choose_skin": "Choose the UI_SKIN with these buttons.\nThe left one is raptor's default."
-  },
-  "play": {
-    "how_to_play_states": {
-      "title": "How to play",
-      "text": "Move your character with WASD keys.\n\nIn the middle of the screen, a [ci_accent]Spawner[/] will appear.\nIt spits out [ci_accent]enemies[/] every now and then.\n\nThey see you when you enter their yellow [ci_accent]Scanner range[/].\n\n[shake]Then you die.[/]\n\nIf you can touch an enemy on its back side, [shake]then the enemy dies![/]\n\n[ci_accent]Try to survive as long as you can!"
-    },
-    "how_to_play_race": {
-      "title": "Race Demo",
-      "text": "This is a short demo filling a playing field, that could be any Match-3 game\nwith random gems using [ci_accent]RaceTables[/].\n\nYou can modify the chances and enabled states with the controls.\n\nThis room contains a [ci_accent]RaceController[/] and a [ci_accent]RaceTable[/] object.\n\n[scale,1.25][ci_accent]WARNING![/] This is a [ci_accent]DEMO[/] Program!\nThe InputBoxes perform no type-checking!\nIf you enter nonsense (i.e. no numbers as Chance), it will crash!\n\nClick the [ci_accent]Run[/] button to fill the board."
-    },
-    "game_over": {
-      "title": "Game over",
-      "text": "You got caught!\n\nBut you could at least eliminate [ci_accent]{0}[/] enemies!\n\nNow we're heading back to the [ci_accent]Main Menu[/]."
     },
-    "ui": {
-      "score_view": "Enemies eliminated: [ci_accent][scale,1.5]{0}[/]",
-      "debug_info": "Press [ci_accent]F12[/] to show/hide the debug infos",
-      "enabled": "Enabled",
-      "chance": "Chance",
-      "race_start_button": "[scale,1.25]Run",
-      "race_exit_button": "[scale,1.25]Back to Main"
-    }
   },
-  "ui_demo": {
-    "sizable_window_title": "A sizable window",
-    "window_title_docking": "Control Docking",
-    "show_login": "[scale,1.25][?=ui_demo/window_title_login]",
-    "show_alignment": "[scale,1.25][?=ui_demo/window_title_alignment]",
-    "login_top_message": "To continue, login here",
-    "login_user": "Username:",
-    "login_pwd": "Password:",
-    "login_button": "Login",
-    "login_remember": "Remember user name and password",
-    "login_entered_values": "Demonstrating read-out of control in a dynamic window:",
-    "add_dock_plus": "+",
-    "show_anchoring": "[scale,1.25][?=ui_demo/window_title_anchoring]",
-    "dock_demo_info": "Press any of the [ci_main]'x'[/] buttons to\ndynamically add docked elements.\n\nLeft- or right-click any of the [ci_main]docked elements[/]\nto grow/shrink them to see dynamic re-layouting.",
-    "show_control_tree": "[scale,1.25][?=ui_demo/window_title_docking]",
-    "anchor_top_message": "Demonstrating control [ci_accent]anchoring[/]",
-    "window_title_alignment": "Control Alignment",
-    "window_title_login": "Login Dialog Demo",
-    "window_title_anchoring": "Control Anchoring",
-    "alignment_top_message": "Demonstrating control [ci_accent]alignment[/]",
-    "label_made_with_tree": "[ci_dark]The Buttons (and this text here)[/]\nhave been created and aligned through\nthe [ci_dark]ControlTree[/] at the [ci_dark]UI_ROOT[/]!\nTake a look at the source code of the \nRoomController of this room, there you\ncan see, how this has been done!\n"
-  }
 }