diff --git a/BBMOD_GML/BBMOD.resource_order b/BBMOD_GML/BBMOD.resource_order index d5abd743..9c7af4f9 100644 --- a/BBMOD_GML/BBMOD.resource_order +++ b/BBMOD_GML/BBMOD.resource_order @@ -81,6 +81,7 @@ ], "ResourceOrderSettings":[ {"name":"BBMOD_CameraHTML5","order":1,"path":"extensions/BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy",}, + {"name":"Room1","order":2,"path":"rooms/Room1/Room1.yy",}, {"name":"__bbmod_array","order":5,"path":"scripts/__bbmod_array/__bbmod_array.yy",}, {"name":"__bbmod_async","order":3,"path":"scripts/__bbmod_async/__bbmod_async.yy",}, {"name":"__bbmod_blendmode","order":14,"path":"scripts/__bbmod_blendmode/__bbmod_blendmode.yy",}, @@ -311,8 +312,8 @@ {"name":"BBMOD_SprLensDirt","order":1,"path":"sprites/BBMOD_SprLensDirt/BBMOD_SprLensDirt.yy",}, {"name":"BBMOD_SprLensFlareHeptagon","order":1,"path":"sprites/BBMOD_SprLensFlareHeptagon/BBMOD_SprLensFlareHeptagon.yy",}, {"name":"BBMOD_SprLensFlareHoop","order":3,"path":"sprites/BBMOD_SprLensFlareHoop/BBMOD_SprLensFlareHoop.yy",}, + {"name":"BBMOD_SprLensFlareStarburst","order":6,"path":"sprites/BBMOD_SprLensFlareStarburst/BBMOD_SprLensFlareStarburst.yy",}, {"name":"BBMOD_SprLensFlareStreak","order":5,"path":"sprites/BBMOD_SprLensFlareStreak/BBMOD_SprLensFlareStreak.yy",}, {"name":"BBMOD_SprWhite","order":2,"path":"sprites/BBMOD_SprWhite/BBMOD_SprWhite.yy",}, - {"name":"BBMOD_SprLensFlareStarburst","order":6,"path":"sprites/BBMOD_SprLensFlareStarburst/BBMOD_SprLensFlareStarburst.yy",}, ], } \ No newline at end of file diff --git a/BBMOD_GML/BBMOD.yyp b/BBMOD_GML/BBMOD.yyp index 76a78af5..c25d88f7 100644 --- a/BBMOD_GML/BBMOD.yyp +++ b/BBMOD_GML/BBMOD.yyp @@ -92,23 +92,6 @@ {"$GMFolder":"","%Name":"Shaders","folderPath":"folders/BBMOD/Terrain/Shaders.yy","name":"Shaders","resourceType":"GMFolder","resourceVersion":"2.0",}, ], "IncludedFiles":[ - {"$GMIncludedFile":"","%Name":"Character_Aim.bbanim","CopyToMask":-1,"filePath":"datafiles/Data/Assets/Character","name":"Character_Aim.bbanim","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"Character_Idle.bbanim","CopyToMask":-1,"filePath":"datafiles/Data/Assets/Character","name":"Character_Idle.bbanim","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"Character_Interact_ground.bbanim","CopyToMask":-1,"filePath":"datafiles/Data/Assets/Character","name":"Character_Interact_ground.bbanim","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"Character_Jump.bbanim","CopyToMask":-1,"filePath":"datafiles/Data/Assets/Character","name":"Character_Jump.bbanim","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"Character_log.txt","CopyToMask":-1,"filePath":"datafiles/Data/Assets/Character","name":"Character_log.txt","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"Character_PunchLeft.bbanim","CopyToMask":-1,"filePath":"datafiles/Data/Assets/Character","name":"Character_PunchLeft.bbanim","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"Character_PunchRight.bbanim","CopyToMask":-1,"filePath":"datafiles/Data/Assets/Character","name":"Character_PunchRight.bbanim","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"Character_Run.bbanim","CopyToMask":-1,"filePath":"datafiles/Data/Assets/Character","name":"Character_Run.bbanim","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"Character_Shoot.bbanim","CopyToMask":-1,"filePath":"datafiles/Data/Assets/Character","name":"Character_Shoot.bbanim","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"Character_Walk.bbanim","CopyToMask":-1,"filePath":"datafiles/Data/Assets/Character","name":"Character_Walk.bbanim","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"Character.bbmod","CopyToMask":-1,"filePath":"datafiles/Data/Assets/Character","name":"Character.bbmod","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"Zombie_Attack.bbanim","CopyToMask":-1,"filePath":"datafiles/Data/Assets/Character","name":"Zombie_Attack.bbanim","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"Zombie_Death.bbanim","CopyToMask":-1,"filePath":"datafiles/Data/Assets/Character","name":"Zombie_Death.bbanim","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"Zombie_Idle.bbanim","CopyToMask":-1,"filePath":"datafiles/Data/Assets/Character","name":"Zombie_Idle.bbanim","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"Zombie_Walk.bbanim","CopyToMask":-1,"filePath":"datafiles/Data/Assets/Character","name":"Zombie_Walk.bbanim","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"Pistol.obj","CopyToMask":-1,"filePath":"datafiles/Data/Assets","name":"Pistol.obj","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"Shell.obj","CopyToMask":-1,"filePath":"datafiles/Data/Assets","name":"Shell.obj","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"assimp-vc143-mt.dll","CopyToMask":64,"filePath":"datafiles/Data/BBMOD","name":"assimp-vc143-mt.dll","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"BBMOD","CopyToMask":0,"filePath":"datafiles/Data/BBMOD","name":"BBMOD","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"BBMOD.dll","CopyToMask":64,"filePath":"datafiles/Data/BBMOD","name":"BBMOD.dll","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, @@ -159,6 +142,7 @@ "name":"BBMOD", "resources":[ {"id":{"name":"BBMOD_CameraHTML5","path":"extensions/BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy",},}, + {"id":{"name":"Room1","path":"rooms/Room1/Room1.yy",},}, {"id":{"name":"__bbmod_array","path":"scripts/__bbmod_array/__bbmod_array.yy",},}, {"id":{"name":"__bbmod_async","path":"scripts/__bbmod_async/__bbmod_async.yy",},}, {"id":{"name":"__bbmod_blendmode","path":"scripts/__bbmod_blendmode/__bbmod_blendmode.yy",},}, @@ -452,14 +436,16 @@ {"id":{"name":"BBMOD_SprLensDirt","path":"sprites/BBMOD_SprLensDirt/BBMOD_SprLensDirt.yy",},}, {"id":{"name":"BBMOD_SprLensFlareHeptagon","path":"sprites/BBMOD_SprLensFlareHeptagon/BBMOD_SprLensFlareHeptagon.yy",},}, {"id":{"name":"BBMOD_SprLensFlareHoop","path":"sprites/BBMOD_SprLensFlareHoop/BBMOD_SprLensFlareHoop.yy",},}, + {"id":{"name":"BBMOD_SprLensFlareStarburst","path":"sprites/BBMOD_SprLensFlareStarburst/BBMOD_SprLensFlareStarburst.yy",},}, {"id":{"name":"BBMOD_SprLensFlareStreak","path":"sprites/BBMOD_SprLensFlareStreak/BBMOD_SprLensFlareStreak.yy",},}, {"id":{"name":"BBMOD_SprParticle","path":"sprites/BBMOD_SprParticle/BBMOD_SprParticle.yy",},}, {"id":{"name":"BBMOD_SprWhite","path":"sprites/BBMOD_SprWhite/BBMOD_SprWhite.yy",},}, - {"id":{"name":"BBMOD_SprLensFlareStarburst","path":"sprites/BBMOD_SprLensFlareStarburst/BBMOD_SprLensFlareStarburst.yy",},}, ], "resourceType":"GMProject", "resourceVersion":"2.0", - "RoomOrderNodes":[], + "RoomOrderNodes":[ + {"roomId":{"name":"Room1","path":"rooms/Room1/Room1.yy",},}, + ], "templateType":null, "TextureGroups":[ {"$GMTextureGroup":"","%Name":"Default","autocrop":true,"border":8,"compressFormat":"bz2","customOptions":"","directory":"","groupParent":null,"isScaled":true,"loadType":"default","mipsToGenerate":-1,"name":"Default","resourceType":"GMTextureGroup","resourceVersion":"2.0","targets":-1,}, diff --git a/BBMOD_GML/ExpandShaders.py b/BBMOD_GML/ExpandShaders.py index 13596ffa..43d37a5c 100644 --- a/BBMOD_GML/ExpandShaders.py +++ b/BBMOD_GML/ExpandShaders.py @@ -104,8 +104,8 @@ def combine(*_args: list[dict]) -> dict: expand_shader("BBMOD_ShGBufferTerrain", combine(TERRAIN, OUTPUT_GBUFFER)) # Zombie shaders -ZOMBIE = combine({ "X_ZOMBIE": 1 }, ANIMATED) +# ZOMBIE = combine({ "X_ZOMBIE": 1 }, ANIMATED) -expand_shader("ShZombie", combine(ZOMBIE, PBR)) -expand_shader("ShZombieDepth", combine(ZOMBIE, OUTPUT_DEPTH)) -expand_shader("ShZombieGBuffer", combine(ZOMBIE, OUTPUT_GBUFFER)) +# expand_shader("ShZombie", combine(ZOMBIE, PBR)) +# expand_shader("ShZombieDepth", combine(ZOMBIE, OUTPUT_DEPTH)) +# expand_shader("ShZombieGBuffer", combine(ZOMBIE, OUTPUT_GBUFFER)) diff --git a/BBMOD_GML/extensions/BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy b/BBMOD_GML/extensions/BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy index 8866e5bd..5d337218 100644 --- a/BBMOD_GML/extensions/BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy +++ b/BBMOD_GML/extensions/BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy @@ -14,7 +14,7 @@ "copyToTargets":32, "description":"", "exportToGame":true, - "extensionVersion":"3.21.0", + "extensionVersion":"3.21.1", "files":[ {"$GMExtensionFile":"","%Name":"BBMOD_CameraHTML5.js","constants":[],"copyToTargets":32,"filename":"BBMOD_CameraHTML5.js","final":"","functions":[ {"$GMExtensionFunction":"","%Name":"bbmod_html5_pointer_lock","argCount":0,"args":[],"documentation":"","externalName":"bbmod_html5_pointer_lock","help":"bbmod_html5_pointer_lock()","hidden":false,"kind":5,"name":"bbmod_html5_pointer_lock","resourceType":"GMExtensionFunction","resourceVersion":"2.0","returnType":2,}, diff --git a/BBMOD_GML/options/amazonfire/options_amazonfire.yy b/BBMOD_GML/options/amazonfire/options_amazonfire.yy index a61e4344..4491e980 100644 --- a/BBMOD_GML/options/amazonfire/options_amazonfire.yy +++ b/BBMOD_GML/options/amazonfire/options_amazonfire.yy @@ -5,7 +5,7 @@ "option_amazonfire_application_tag_inject":"", "option_amazonfire_build_tools":"", "option_amazonfire_compile_sdk":"", - "option_amazonfire_display_name":"BBMOD Demo", + "option_amazonfire_display_name":"BBMOD", "option_amazonfire_gamepad_support":true, "option_amazonfire_icon_hdpi":"${base_options_dir}/android/icons/hdpi.png", "option_amazonfire_icon_ldpi":"${base_options_dir}/android/icons/ldpi.png", @@ -44,7 +44,7 @@ "option_amazonfire_texture_page":"2048x2048", "option_amazonfire_tools_from_version":false, "option_amazonfire_tv_banner":"${base_options_dir}/amazonfire/tv_banner.png", - "option_amazonfire_version":"3.21.0", + "option_amazonfire_version":"3.21.1", "resourceType":"GMAmazonFireOptions", "resourceVersion":"2.0", } \ No newline at end of file diff --git a/BBMOD_GML/options/android/options_android.yy b/BBMOD_GML/options/android/options_android.yy index abe93659..7c8e6979 100644 --- a/BBMOD_GML/options/android/options_android.yy +++ b/BBMOD_GML/options/android/options_android.yy @@ -10,7 +10,7 @@ "option_android_build_tools":"", "option_android_compile_sdk":"30", "option_android_device_support":0, - "option_android_display_name":"BBMOD Demo", + "option_android_display_name":"BBMOD", "option_android_facebook_app_display_name":"", "option_android_facebook_id":"", "option_android_gamepad_support":true, @@ -75,7 +75,7 @@ "option_android_tv_isgame":true, "option_android_tv_supports_leanback":true, "option_android_use_facebook":false, - "option_android_version":"3.21.0", + "option_android_version":"3.21.1", "resourceType":"GMAndroidOptions", "resourceVersion":"2.0", } \ No newline at end of file diff --git a/BBMOD_GML/options/html5/options_html5.yy b/BBMOD_GML/options/html5/options_html5.yy index c7e1cd20..07e49111 100644 --- a/BBMOD_GML/options/html5/options_html5.yy +++ b/BBMOD_GML/options/html5/options_html5.yy @@ -3,7 +3,7 @@ "%Name":"HTML5", "name":"HTML5", "option_html5_allow_fullscreen":true, - "option_html5_browser_title":"BBMOD Demo", + "option_html5_browser_title":"BBMOD", "option_html5_centregame":true, "option_html5_display_cursor":true, "option_html5_facebook_app_display_name":"", @@ -28,7 +28,7 @@ "option_html5_usebuiltinparticles":true, "option_html5_usesplash":false, "option_html5_use_facebook":false, - "option_html5_version":"3.21.0.0", + "option_html5_version":"3.21.1.0", "option_html5_webgl":1, "resourceType":"GMHtml5Options", "resourceVersion":"2.0", diff --git a/BBMOD_GML/options/ios/options_ios.yy b/BBMOD_GML/options/ios/options_ios.yy index f4e6fff6..6c248dc8 100644 --- a/BBMOD_GML/options/ios/options_ios.yy +++ b/BBMOD_GML/options/ios/options_ios.yy @@ -7,7 +7,7 @@ "option_ios_cocoapods_checkbox":true, "option_ios_defer_home_indicator":false, "option_ios_devices":2, - "option_ios_display_name":"BBMOD Demo", + "option_ios_display_name":"BBMOD", "option_ios_enable_broadcast":false, "option_ios_half_ipad1_textures":false, "option_ios_icon_ipad_app_152":"${base_options_dir}/ios/icons/app/ipad_152.png", @@ -44,7 +44,7 @@ "option_ios_splashscreen_background_colour":255, "option_ios_team_id":"", "option_ios_texture_page":"2048x2048", - "option_ios_version":"3.21.0", + "option_ios_version":"3.21.1", "resourceType":"GMiOSOptions", "resourceVersion":"2.0", } \ No newline at end of file diff --git a/BBMOD_GML/options/linux/options_linux.yy b/BBMOD_GML/options/linux/options_linux.yy index 0259345c..64519d44 100644 --- a/BBMOD_GML/options/linux/options_linux.yy +++ b/BBMOD_GML/options/linux/options_linux.yy @@ -5,7 +5,7 @@ "option_linux_allow_fullscreen":true, "option_linux_disable_sandbox":false, "option_linux_display_cursor":true, - "option_linux_display_name":"BBMOD Demo", + "option_linux_display_name":"BBMOD", "option_linux_display_splash":false, "option_linux_enable_steam":false, "option_linux_homepage":"http://www.yoyogames.com", @@ -20,7 +20,7 @@ "option_linux_start_fullscreen":false, "option_linux_sync":false, "option_linux_texture_page":"2048x2048", - "option_linux_version":"3.21.0", + "option_linux_version":"3.21.1", "resourceType":"GMLinuxOptions", "resourceVersion":"2.0", } \ No newline at end of file diff --git a/BBMOD_GML/options/mac/options_mac.yy b/BBMOD_GML/options/mac/options_mac.yy index 7e582c26..e70faa72 100644 --- a/BBMOD_GML/options/mac/options_mac.yy +++ b/BBMOD_GML/options/mac/options_mac.yy @@ -14,7 +14,7 @@ "option_mac_copyright":"", "option_mac_disable_sandbox":false, "option_mac_display_cursor":true, - "option_mac_display_name":"BBMOD Demo", + "option_mac_display_name":"BBMOD", "option_mac_enable_retina":false, "option_mac_enable_steam":false, "option_mac_icon_png":"${base_options_dir}/mac/icons/1024.png", @@ -30,7 +30,7 @@ "option_mac_start_fullscreen":false, "option_mac_team_id":"", "option_mac_texture_page":"2048x2048", - "option_mac_version":"3.21.0", + "option_mac_version":"3.21.1", "option_mac_vsync":false, "option_mac_x86_64":true, "resourceType":"GMMacOptions", diff --git a/BBMOD_GML/options/operagx/options_operagx.yy b/BBMOD_GML/options/operagx/options_operagx.yy index 8bfb98e4..7e97a774 100644 --- a/BBMOD_GML/options/operagx/options_operagx.yy +++ b/BBMOD_GML/options/operagx/options_operagx.yy @@ -4,7 +4,7 @@ "name":"operagx", "option_operagx_display_cursor":true, "option_operagx_editUrl":"", - "option_operagx_game_name":"BBMOD Demo", + "option_operagx_game_name":"BBMOD", "option_operagx_guid":"", "option_operagx_internalShareUrl":"", "option_operagx_interpolate_pixels":false, @@ -23,7 +23,7 @@ "option_operagx_team_id":"", "option_operagx_team_name":"", "option_operagx_texture_page":"2048x2048", - "option_operagx_version":"3.21.0.0", + "option_operagx_version":"3.21.1.0", "resourceType":"GMOperaGXOptions", "resourceVersion":"2.0", } \ No newline at end of file diff --git a/BBMOD_GML/options/tvos/options_tvos.yy b/BBMOD_GML/options/tvos/options_tvos.yy index 19aa036d..5c5114c7 100644 --- a/BBMOD_GML/options/tvos/options_tvos.yy +++ b/BBMOD_GML/options/tvos/options_tvos.yy @@ -6,7 +6,7 @@ "option_tvos_bundle_name":"com.company.game", "option_tvos_cocoapods_checkbox":true, "option_tvos_display_cursor":false, - "option_tvos_display_name":"BBMOD Demo", + "option_tvos_display_name":"BBMOD", "option_tvos_enable_broadcast":false, "option_tvos_icon_1280":"${base_options_dir}/tvos/icons/1280.png", "option_tvos_icon_400":"${base_options_dir}/tvos/icons/400.png", @@ -26,7 +26,7 @@ "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_version":"3.21.0", + "option_tvos_version":"3.21.1", "resourceType":"GMtvOSOptions", "resourceVersion":"2.0", } \ No newline at end of file diff --git a/BBMOD_GML/options/windows/options_windows.yy b/BBMOD_GML/options/windows/options_windows.yy index a427b6ff..f0cf024d 100644 --- a/BBMOD_GML/options/windows/options_windows.yy +++ b/BBMOD_GML/options/windows/options_windows.yy @@ -10,7 +10,7 @@ "option_windows_description_info":"", "option_windows_disable_sandbox":false, "option_windows_display_cursor":true, - "option_windows_display_name":"BBMOD Demo", + "option_windows_display_name":"BBMOD", "option_windows_enable_steam":false, "option_windows_executable_name":"${project_name}.exe", "option_windows_icon":"${base_options_dir}/windows/icons/icon.ico", @@ -29,7 +29,7 @@ "option_windows_steam_use_alternative_launcher":false, "option_windows_texture_page":"2048x2048", "option_windows_use_splash":false, - "option_windows_version":"3.21.0.0", + "option_windows_version":"3.21.1.0", "option_windows_vsync":false, "resourceType":"GMWindowsOptions", "resourceVersion":"2.0", diff --git a/BBMOD_GML/options/windowsuap/options_windowsuap.yy b/BBMOD_GML/options/windowsuap/options_windowsuap.yy index 428b6a3f..e3e56957 100644 --- a/BBMOD_GML/options/windowsuap/options_windowsuap.yy +++ b/BBMOD_GML/options/windowsuap/options_windowsuap.yy @@ -1,10 +1,10 @@ { - "option_windowsuap_display_name": "BBMOD Demo", + "option_windowsuap_display_name": "BBMOD", "option_windowsuap_package_name": "YourPackageName", "option_windowsuap_publisher_display_name": "YourPublisherName", "option_windowsuap_package_display_name": "YourPackageDisplayName", "option_windowsuap_description": "Your Description", - "option_windowsuap_version": "3.21.0.0", + "option_windowsuap_version": "3.21.1.0", "option_windowsuap_orient_portrait": true, "option_windowsuap_orient_portrait_flipped": true, "option_windowsuap_orient_landscape": true, diff --git a/BBMOD_GML/rooms/Room1/Room1.yy b/BBMOD_GML/rooms/Room1/Room1.yy new file mode 100644 index 00000000..8e0ce3cd --- /dev/null +++ b/BBMOD_GML/rooms/Room1/Room1.yy @@ -0,0 +1,53 @@ +{ + "$GMRoom":"", + "%Name":"Room1", + "creationCodeFile":"", + "inheritCode":false, + "inheritCreationOrder":false, + "inheritLayers":false, + "instanceCreationOrder":[], + "isDnd":false, + "layers":[ + {"$GMRInstanceLayer":"","%Name":"Instances","depth":0,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[],"layers":[],"name":"Instances","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":false,"visible":true,}, + {"$GMRBackgroundLayer":"","%Name":"Background","animationFPS":15.0,"animationSpeedType":0,"colour":4278190080,"depth":100,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"name":"Background","properties":[],"resourceType":"GMRBackgroundLayer","resourceVersion":"2.0","spriteId":null,"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":false,"visible":true,"vspeed":0.0,"vtiled":false,"x":0,"y":0,}, + ], + "name":"Room1", + "parent":{ + "name":"BBMOD", + "path":"BBMOD.yyp", + }, + "parentRoom":null, + "physicsSettings":{ + "inheritPhysicsSettings":false, + "PhysicsWorld":false, + "PhysicsWorldGravityX":0.0, + "PhysicsWorldGravityY":10.0, + "PhysicsWorldPixToMetres":0.1, + }, + "resourceType":"GMRoom", + "resourceVersion":"2.0", + "roomSettings":{ + "Height":768, + "inheritRoomSettings":false, + "persistent":false, + "Width":1366, + }, + "sequenceId":null, + "views":[ + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + ], + "viewSettings":{ + "clearDisplayBuffer":true, + "clearViewBackground":false, + "enableViews":false, + "inheritViewSettings":false, + }, + "volume":1.0, +} \ No newline at end of file diff --git a/BBMOD_GML/scripts/__bbmod_defines/__bbmod_defines.gml b/BBMOD_GML/scripts/__bbmod_defines/__bbmod_defines.gml index 77a1b9ef..87947a11 100644 --- a/BBMOD_GML/scripts/__bbmod_defines/__bbmod_defines.gml +++ b/BBMOD_GML/scripts/__bbmod_defines/__bbmod_defines.gml @@ -12,7 +12,7 @@ #macro BBMOD_RELEASE_MINOR 21 /// @macro {Real} The patch version number of this BBMOD release. -#macro BBMOD_RELEASE_PATCH 0 +#macro BBMOD_RELEASE_PATCH 1 /// @macro {String} The version of this BBMOD release as a string ("major.minor.patch" format). #macro BBMOD_RELEASE_STRING BBMOD_RELEASE_MAJOR"."BBMOD_RELEASE_MINOR"."BBMOD_RELEASE_PATCH"" diff --git a/ChangelogDev.md b/ChangelogDev.md index 75efc156..15430d38 100644 --- a/ChangelogDev.md +++ b/ChangelogDev.md @@ -1,6 +1,2 @@ # Changelog dev > This file is used to accumulate changes before a changelog for a release is created. - -* Fixed method `present` of renderers. -* Fixed wrong comparisons with the epsilon value, which caused getting `NaN` in various places (e.g. `BBMOD_Vec3.Normalize`). Thanks to [@xgreffe](https://github.com/xgreffe) for the pull request! -* Fixed error in `BBMOD_Material.from_json` when given JSON included string "undefined". diff --git a/docs_src/Changelog/Changelog3.21.1.md b/docs_src/Changelog/Changelog3.21.1.md new file mode 100644 index 00000000..5cd876d9 --- /dev/null +++ b/docs_src/Changelog/Changelog3.21.1.md @@ -0,0 +1,6 @@ +# Changelog 3.21.1 +This release is a hotfix for an issue where renderers did not display the application surface if they did not use a post-processor. + +* Fixed method `present` of `BBMOD_BaseRenderer`, `BBMOD_DefaultRenderer` and `BBMOD_DeferredRenderer`, which did not draw the application surface if post-processor was not defined or was disabled. +* Fixed wrong comparisons with the epsilon value, which caused getting `NaN` in various places (e.g. `BBMOD_Vec3.Normalize`). Thanks to [@xgreffe](https://github.com/xgreffe) for the pull request! +* Fixed error that occured when `BBMOD_Material.from_json` was given a JSON that included string "undefined" as a value for a shader (which is a valid option). diff --git a/docs_src/Changelog/Changelog_.md b/docs_src/Changelog/Changelog_.md index 1ac454b8..1ededc7c 100644 --- a/docs_src/Changelog/Changelog_.md +++ b/docs_src/Changelog/Changelog_.md @@ -2,6 +2,7 @@ In this section you can find changelogs for all releases of BBMOD since 3.0.0. ## Contents +* [3.21.1](./Changelog3.21.1.html) * [3.21.0](./Changelog3.21.0.html) * [3.20.2](./Changelog3.20.2.html) * [3.20.1](./Changelog3.20.1.html) diff --git a/docs_src/index.md b/docs_src/index.md index 63927a11..c6c280e7 100644 --- a/docs_src/index.md +++ b/docs_src/index.md @@ -1,5 +1,5 @@ # BBMOD -Welcome to the official documentation of BBMOD 3.21.0! +Welcome to the official documentation of BBMOD 3.21.1! BBMOD is an advanced 3D rendering solution for GameMaker. It consists of a custom model, animation and material formats, a model converter (BBMOD CLI), diff --git a/gmdoc.json b/gmdoc.json index 34060f1f..a3ab11be 100644 --- a/gmdoc.json +++ b/gmdoc.json @@ -5,7 +5,7 @@ "title": "BBMOD Docs", "author": "BlueBurn", "prefix": ["bbmod", "__bbmod"], - "version": "3.21.0", + "version": "3.21.1", "analytics": "", "api": { "rating": "/bbmod/page_rating.php" @@ -15,6 +15,7 @@ "Changelog": { "file": "Changelog/Changelog_.md", "pages": { + "3.21.1": "Changelog/Changelog3.21.1.md", "3.21.0": "Changelog/Changelog3.21.0.md", "3.20.2": "Changelog/Changelog3.20.2.md", "3.20.1": "Changelog/Changelog3.20.1.md",