From 2dfcb07bc4526bbc4e2ba4a60ff5740fecf10b50 Mon Sep 17 00:00:00 2001 From: Juju Adams Date: Tue, 29 Dec 2020 13:35:07 +0000 Subject: [PATCH] 1.0.0 --- README.md | 2 +- chatterbox.yyp | 10 ++--- options/ios/options_ios.yy | 44 ++++++++++--------- options/tvos/options_tvos.yy | 22 +++++----- options/windows/options_windows.yy | 17 +++---- .../__chatterbox_system.gml | 4 +- 6 files changed, 52 insertions(+), 47 deletions(-) diff --git a/README.md b/README.md index 8a808e8c..b9b1e590 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

-

0.5.4

+

1.0.0

Narrative engine for GameMaker Studio 2.3.0 by @jujuadams

diff --git a/chatterbox.yyp b/chatterbox.yyp index 338c07b7..3ae1cbda 100644 --- a/chatterbox.yyp +++ b/chatterbox.yyp @@ -56,8 +56,8 @@ "name": "Default", "children": [], }, - "RoomOrder": [ - {"name":"rm_main","path":"rooms/rm_main/rm_main.yy",}, + "RoomOrderNodes": [ + {"roomId":{"name":"rm_main","path":"rooms/rm_main/rm_main.yy",},}, ], "Folders": [ {"folderPath":"folders/Chatterbox.yy","order":0,"resourceVersion":"1.0","name":"Chatterbox","tags":[],"resourceType":"GMFolder",}, @@ -68,10 +68,10 @@ {"folderPath":"folders/Chatterbox/Getters.yy","order":6,"resourceVersion":"1.0","name":"Getters","tags":[],"resourceType":"GMFolder",}, ], "AudioGroups": [ - {"targets":461609314234257646,"resourceVersion":"1.0","name":"audiogroup_default","resourceType":"GMAudioGroup",}, + {"targets":-1,"resourceVersion":"1.3","name":"audiogroup_default","resourceType":"GMAudioGroup",}, ], "TextureGroups": [ - {"isScaled":false,"autocrop":true,"border":2,"mipsToGenerate":0,"targets":461609314234257646,"resourceVersion":"1.0","name":"Default","resourceType":"GMTextureGroup",}, + {"isScaled":false,"autocrop":true,"border":2,"mipsToGenerate":0,"groupParent":null,"targets":-1,"resourceVersion":"1.3","name":"Default","resourceType":"GMTextureGroup",}, ], "IncludedFiles": [ {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, @@ -212,7 +212,7 @@ {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"testcase_stop.yarn","resourceType":"GMIncludedFile",}, ], "MetaData": { - "IDEVersion": "23.1.1.193", + "IDEVersion": "2.3.1.542", }, "resourceVersion": "1.4", "name": "chatterbox", diff --git a/options/ios/options_ios.yy b/options/ios/options_ios.yy index ac99148a..a29fed7e 100644 --- a/options/ios/options_ios.yy +++ b/options/ios/options_ios.yy @@ -10,27 +10,27 @@ "option_ios_orientation_landscape_flipped": true, "option_ios_devices": 2, "option_ios_defer_home_indicator": false, - "option_ios_icon_iphone_app_120": "${base_options_dir}\\ios\\icons\\app\\iphone_120.png", - "option_ios_icon_iphone_app_180": "${base_options_dir}\\ios\\icons\\app\\iphone_180.png", - "option_ios_icon_ipad_app_76": "${base_options_dir}\\ios\\icons\\app\\ipad_76.png", - "option_ios_icon_ipad_app_152": "${base_options_dir}\\ios\\icons\\app\\ipad_152.png", - "option_ios_icon_ipad_pro_app_167": "${base_options_dir}\\ios\\icons\\app\\ipad_pro_167.png", - "option_ios_icon_iphone_notification_40": "${base_options_dir}\\ios\\icons\\notification\\iphone_40.png", - "option_ios_icon_iphone_notification_60": "${base_options_dir}\\ios\\icons\\notification\\iphone_60.png", - "option_ios_icon_ipad_notification_20": "${base_options_dir}\\ios\\icons\\notification\\ipad_20.png", - "option_ios_icon_ipad_notification_40": "${base_options_dir}\\ios\\icons\\notification\\ipad_40.png", - "option_ios_icon_iphone_spotlight_80": "${base_options_dir}\\ios\\icons\\spotlight\\iphone_80.png", - "option_ios_icon_iphone_spotlight_120": "${base_options_dir}\\ios\\icons\\spotlight\\iphone_120.png", - "option_ios_icon_ipad_spotlight_40": "${base_options_dir}\\ios\\icons\\spotlight\\ipad_40.png", - "option_ios_icon_ipad_spotlight_80": "${base_options_dir}\\ios\\icons\\spotlight\\ipad_80.png", - "option_ios_icon_iphone_settings_58": "${base_options_dir}\\ios\\icons\\settings\\iphone_58.png", - "option_ios_icon_iphone_settings_87": "${base_options_dir}\\ios\\icons\\settings\\iphone_87.png", - "option_ios_icon_ipad_settings_29": "${base_options_dir}\\ios\\icons\\settings\\ipad_29.png", - "option_ios_icon_ipad_settings_58": "${base_options_dir}\\ios\\icons\\settings\\ipad_58.png", - "option_ios_icon_itunes_artwork_1024": "${base_options_dir}\\ios\\icons\\itunes\\itunes_1024.png", + "option_ios_icon_iphone_app_120": "${base_options_dir}/ios/icons/app/iphone_120.png", + "option_ios_icon_iphone_app_180": "${base_options_dir}/ios/icons/app/iphone_180.png", + "option_ios_icon_ipad_app_76": "${base_options_dir}/ios/icons/app/ipad_76.png", + "option_ios_icon_ipad_app_152": "${base_options_dir}/ios/icons/app/ipad_152.png", + "option_ios_icon_ipad_pro_app_167": "${base_options_dir}/ios/icons/app/ipad_pro_167.png", + "option_ios_icon_iphone_notification_40": "${base_options_dir}/ios/icons/notification/iphone_40.png", + "option_ios_icon_iphone_notification_60": "${base_options_dir}/ios/icons/notification/iphone_60.png", + "option_ios_icon_ipad_notification_20": "${base_options_dir}/ios/icons/notification/ipad_20.png", + "option_ios_icon_ipad_notification_40": "${base_options_dir}/ios/icons/notification/ipad_40.png", + "option_ios_icon_iphone_spotlight_80": "${base_options_dir}/ios/icons/spotlight/iphone_80.png", + "option_ios_icon_iphone_spotlight_120": "${base_options_dir}/ios/icons/spotlight/iphone_120.png", + "option_ios_icon_ipad_spotlight_40": "${base_options_dir}/ios/icons/spotlight/ipad_40.png", + "option_ios_icon_ipad_spotlight_80": "${base_options_dir}/ios/icons/spotlight/ipad_80.png", + "option_ios_icon_iphone_settings_58": "${base_options_dir}/ios/icons/settings/iphone_58.png", + "option_ios_icon_iphone_settings_87": "${base_options_dir}/ios/icons/settings/iphone_87.png", + "option_ios_icon_ipad_settings_29": "${base_options_dir}/ios/icons/settings/ipad_29.png", + "option_ios_icon_ipad_settings_58": "${base_options_dir}/ios/icons/settings/ipad_58.png", + "option_ios_icon_itunes_artwork_1024": "${base_options_dir}/ios/icons/itunes/itunes_1024.png", "option_ios_splashscreen_background_colour": 4294967295, - "option_ios_launchscreen_image": "${base_options_dir}\\ios\\splash\\launchscreen.png", - "option_ios_launchscreen_image_landscape": "${base_options_dir}\\ios\\splash\\launchscreen-landscape.png", + "option_ios_launchscreen_image": "${base_options_dir}/ios/splash/launchscreen.png", + "option_ios_launchscreen_image_landscape": "${base_options_dir}/ios/splash/launchscreen-landscape.png", "option_ios_launchscreen_fill": 0, "option_ios_interpolate_pixels": false, "option_ios_half_ipad1_textures": false, @@ -41,7 +41,9 @@ "option_ios_facebook_app_display_name": "", "option_ios_push_notifications": false, "option_ios_apple_sign_in": false, - "resourceVersion": "1.0", + "option_ios_podfile_path": "${options_dir}/ios/Podfile", + "option_ios_podfile_lock_path": "${options_dir}/ios/Podfile.lock", + "resourceVersion": "1.3", "name": "iOS", "tags": [], "resourceType": "GMiOSOptions", diff --git a/options/tvos/options_tvos.yy b/options/tvos/options_tvos.yy index a31cba0c..275eb092 100644 --- a/options/tvos/options_tvos.yy +++ b/options/tvos/options_tvos.yy @@ -4,15 +4,15 @@ "option_tvos_version": "1.0.0.0", "option_tvos_output_dir": "~/GameMakerStudio2/tvOS", "option_tvos_team_id": "", - "option_tvos_icon_400": "${base_options_dir}\\tvos\\icons\\400.png", - "option_tvos_icon_400_2x": "${base_options_dir}\\tvos\\icons\\400_2x.png", - "option_tvos_icon_1280": "${base_options_dir}\\tvos\\icons\\1280.png", - "option_tvos_topshelf": "${base_options_dir}\\tvos\\topshelf\\topshelf.png", - "option_tvos_topshelf_2x": "${base_options_dir}\\tvos\\topshelf\\topshelf_2x.png", - "option_tvos_topshelf_wide": "${base_options_dir}\\tvos\\topshelf\\topshelf_wide.png", - "option_tvos_topshelf_wide_2x": "${base_options_dir}\\tvos\\topshelf\\topshelf_wide_2x.png", - "option_tvos_splashscreen": "${base_options_dir}\\tvos\\splash\\splash.png", - "option_tvos_splashscreen_2x": "${base_options_dir}\\tvos\\splash\\splash_2x.png", + "option_tvos_icon_400": "${base_options_dir}/tvos/icons/400.png", + "option_tvos_icon_400_2x": "${base_options_dir}/tvos/icons/400_2x.png", + "option_tvos_icon_1280": "${base_options_dir}/tvos/icons/1280.png", + "option_tvos_topshelf": "${base_options_dir}/tvos/topshelf/topshelf.png", + "option_tvos_topshelf_2x": "${base_options_dir}/tvos/topshelf/topshelf_2x.png", + "option_tvos_topshelf_wide": "${base_options_dir}/tvos/topshelf/topshelf_wide.png", + "option_tvos_topshelf_wide_2x": "${base_options_dir}/tvos/topshelf/topshelf_wide_2x.png", + "option_tvos_splashscreen": "${base_options_dir}/tvos/splash/splash.png", + "option_tvos_splashscreen_2x": "${base_options_dir}/tvos/splash/splash_2x.png", "option_tvos_splash_time": 10, "option_tvos_interpolate_pixels": true, "option_tvos_scale": 0, @@ -20,7 +20,9 @@ "option_tvos_display_cursor": false, "option_tvos_push_notifications": false, "option_tvos_apple_sign_in": false, - "resourceVersion": "1.0", + "option_tvos_podfile_path": "${options_dir}\\tvos\\Podfile", + "option_tvos_podfile_lock_path": "${options_dir}\\tvos\\Podfile.lock", + "resourceVersion": "1.3", "name": "tvOS", "tags": [], "resourceType": "GMtvOSOptions", diff --git a/options/windows/options_windows.yy b/options/windows/options_windows.yy index 71d6c32a..c1443342 100644 --- a/options/windows/options_windows.yy +++ b/options/windows/options_windows.yy @@ -1,15 +1,15 @@ { "option_windows_display_name": "Chatterbox", "option_windows_executable_name": "${project_name}", - "option_windows_version": "0.5.4.0", + "option_windows_version": "1.0.0.0", "option_windows_company_info": "@jujuadams", "option_windows_product_info": "Chatterbox", "option_windows_copyright_info": "@jujuadams (c) 2020", "option_windows_description_info": "Chatterbox", "option_windows_display_cursor": true, - "option_windows_icon": "${base_options_dir}\\windows\\icons\\icon.ico", + "option_windows_icon": "${base_options_dir}/windows/icons/icon.ico", "option_windows_save_location": 0, - "option_windows_splash_screen": "${base_options_dir}\\windows\\splash\\splash.png", + "option_windows_splash_screen": "${base_options_dir}/windows/splash/splash.png", "option_windows_use_splash": false, "option_windows_start_fullscreen": false, "option_windows_allow_fullscreen_switching": false, @@ -21,14 +21,15 @@ "option_windows_copy_exe_to_dest": false, "option_windows_sleep_margin": 10, "option_windows_texture_page": "2048x2048", - "option_windows_installer_finished": "${base_options_dir}\\windows\\installer\\finished.bmp", - "option_windows_installer_header": "${base_options_dir}\\windows\\installer\\header.bmp", - "option_windows_license": "${base_options_dir}\\windows\\installer\\license.txt", - "option_windows_nsis_file": "${base_options_dir}\\windows\\installer\\nsis_script.nsi", + "option_windows_installer_finished": "${base_options_dir}/windows/installer/finished.bmp", + "option_windows_installer_header": "${base_options_dir}/windows/installer/header.bmp", + "option_windows_license": "${base_options_dir}/windows/installer/license.txt", + "option_windows_nsis_file": "${base_options_dir}/windows/installer/nsis_script.nsi", "option_windows_enable_steam": false, "option_windows_disable_sandbox": false, "option_windows_steam_use_alternative_launcher": false, - "resourceVersion": "1.0", + "option_windows_use_x64": false, + "resourceVersion": "1.1", "name": "Windows", "tags": [], "resourceType": "GMWindowsOptions", diff --git a/scripts/__chatterbox_system/__chatterbox_system.gml b/scripts/__chatterbox_system/__chatterbox_system.gml index d19aa76a..5ef57c99 100644 --- a/scripts/__chatterbox_system/__chatterbox_system.gml +++ b/scripts/__chatterbox_system/__chatterbox_system.gml @@ -1,7 +1,7 @@ #region Internal Macro Definitions -#macro __CHATTERBOX_VERSION "0.5.4" -#macro __CHATTERBOX_DATE "2020/11/02" +#macro __CHATTERBOX_VERSION "1.0.0" +#macro __CHATTERBOX_DATE "2020/12/29" #macro __CHATTERBOX_VARIABLE_INVALID "__chatterbox_variable_error"