From 497d80913437bcdd4a897a935968683a427df422 Mon Sep 17 00:00:00 2001 From: Patrik Kraif Date: Fri, 19 Apr 2024 19:11:31 +0200 Subject: [PATCH] Updated BBMOD to 3.21.2 --- .../BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy | 2 +- options/amazonfire/options_amazonfire.yy | 2 +- options/android/options_android.yy | 2 +- options/html5/options_html5.yy | 2 +- options/ios/options_ios.yy | 2 +- options/linux/options_linux.yy | 2 +- options/mac/options_mac.yy | 2 +- options/operagx/options_operagx.yy | 2 +- options/tvos/options_tvos.yy | 2 +- options/windows/options_windows.yy | 2 +- .../BBMOD_ColorGradingEffect.gml | 3 +++ .../BBMOD_LensDistortionEffect.gml | 2 +- .../BBMOD_NormalDistortionEffect.gml | 3 ++- .../BBMOD_SunShaftsEffect.gml | 16 +++++++++++++--- .../BBMOD_ShColorGrading.fsh | 9 ++------- .../5e52c852-96b0-44bd-a39b-919074af4aec.png | Bin 1263044 -> 1263044 bytes .../0bfbc505-03d0-43b7-82d8-d8a257f154e1.png | Bin 1263044 -> 1263044 bytes .../2c48178d-8c71-49c0-98e1-a2f4e1a5189b.png | Bin 282 -> 282 bytes .../d29f13d3-8eff-440e-989a-926bdce1dac5.png | Bin 282 -> 282 bytes .../f32abfde-987f-47df-8dc5-6501ccd1cffe.png | Bin 441 -> 441 bytes .../7871b65d-a5ff-4d19-bcb3-5887144e2eca.png | Bin 441 -> 441 bytes .../9c1088e4-4abf-42a7-ba51-7768972da5f4.png | Bin 360 -> 360 bytes .../609ab95a-bc6f-4dd9-8bd2-12e84733b60c.png | Bin 360 -> 360 bytes .../2c0dbe20-e924-4d3b-bd43-b7fcd89299e4.png | Bin 282 -> 282 bytes .../ddc0cec4-9ac7-4182-80c8-ca47f583360f.png | Bin 282 -> 282 bytes .../2c0dbe20-e924-4d3b-bd43-b7fcd89299e4.png | Bin 282 -> 282 bytes .../BBMOD_SprDefaultSpecularColor.yy | 4 ++-- .../ddc0cec4-9ac7-4182-80c8-ca47f583360f.png | Bin 282 -> 282 bytes .../198f2eb3-626a-4665-a2b0-881cce537b25.png | Bin 1112 -> 1112 bytes .../f6406058-c156-411a-b6b4-53268f2116b4.png | Bin 1097 -> 1097 bytes .../cf694e91-149c-40b5-8c3e-977ad4b52c84.png | Bin 1112 -> 1112 bytes .../cf694e91-149c-40b5-8c3e-977ad4b52c84.png | Bin 1097 -> 1097 bytes .../53a81332-e4de-4bc2-98d1-95f7df68a62a.png | Bin 350375 -> 350375 bytes .../0d5f58c5-7c4d-40c8-9214-2a3cc66342d9.png | Bin 350375 -> 350375 bytes .../05f74315-7188-46ef-97f9-79d5e9f72694.png | Bin 5217 -> 5217 bytes .../c2aed7b1-e8f0-4ec0-82cb-1539d2f63bb3.png | Bin 5217 -> 5217 bytes .../b96bc2e2-32e9-4783-9b2a-f8569dee2561.png | Bin 46967 -> 46967 bytes .../55dc12e6-70d1-40b7-8452-33ac29851330.png | Bin 46967 -> 46967 bytes .../971a6ff5-ee10-4f3f-a2ac-d9c05eb6a024.png | Bin 163720 -> 163720 bytes .../747c91bc-a508-45fa-9f6c-e78468aa8d2a.png | Bin 163720 -> 163720 bytes .../fa2e235f-11e5-47d4-a01a-5c3f7a4d9f39.png | Bin 4347 -> 4347 bytes .../4c9c1895-1d2d-4e36-b501-1a04700f3b43.png | Bin 4347 -> 4347 bytes .../3aac4271-58c7-44de-9a18-62ce002f4288.png | Bin 40889 -> 40889 bytes .../e0fec503-965d-4d6c-8c50-8ddca8cc8815.png | Bin 40889 -> 40889 bytes .../2c48178d-8c71-49c0-98e1-a2f4e1a5189b.png | Bin 280 -> 280 bytes .../d29f13d3-8eff-440e-989a-926bdce1dac5.png | Bin 280 -> 280 bytes 46 files changed, 33 insertions(+), 24 deletions(-) diff --git a/extensions/BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy b/extensions/BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy index 5d33721..260eaad 100644 --- a/extensions/BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy +++ b/extensions/BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy @@ -14,7 +14,7 @@ "copyToTargets":32, "description":"", "exportToGame":true, - "extensionVersion":"3.21.1", + "extensionVersion":"3.21.2", "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/options/amazonfire/options_amazonfire.yy b/options/amazonfire/options_amazonfire.yy index 412c71d..3f2ab8a 100644 --- a/options/amazonfire/options_amazonfire.yy +++ b/options/amazonfire/options_amazonfire.yy @@ -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.1", + "option_amazonfire_version":"3.21.2", "resourceType":"GMAmazonFireOptions", "resourceVersion":"2.0", } \ No newline at end of file diff --git a/options/android/options_android.yy b/options/android/options_android.yy index 9892301..04394bf 100644 --- a/options/android/options_android.yy +++ b/options/android/options_android.yy @@ -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.1", + "option_android_version":"3.21.2", "resourceType":"GMAndroidOptions", "resourceVersion":"2.0", } \ No newline at end of file diff --git a/options/html5/options_html5.yy b/options/html5/options_html5.yy index 388b6a4..bde8ee2 100644 --- a/options/html5/options_html5.yy +++ b/options/html5/options_html5.yy @@ -28,7 +28,7 @@ "option_html5_usebuiltinparticles":true, "option_html5_usesplash":false, "option_html5_use_facebook":false, - "option_html5_version":"3.21.1.0", + "option_html5_version":"3.21.2.0", "option_html5_webgl":1, "resourceType":"GMHtml5Options", "resourceVersion":"2.0", diff --git a/options/ios/options_ios.yy b/options/ios/options_ios.yy index 33a8bf8..d2bb2c1 100644 --- a/options/ios/options_ios.yy +++ b/options/ios/options_ios.yy @@ -44,7 +44,7 @@ "option_ios_splashscreen_background_colour":255, "option_ios_team_id":"", "option_ios_texture_page":"2048x2048", - "option_ios_version":"3.21.1", + "option_ios_version":"3.21.2", "resourceType":"GMiOSOptions", "resourceVersion":"2.0", } \ No newline at end of file diff --git a/options/linux/options_linux.yy b/options/linux/options_linux.yy index cfb42fe..fb35fbe 100644 --- a/options/linux/options_linux.yy +++ b/options/linux/options_linux.yy @@ -20,7 +20,7 @@ "option_linux_start_fullscreen":false, "option_linux_sync":false, "option_linux_texture_page":"2048x2048", - "option_linux_version":"3.21.1", + "option_linux_version":"3.21.2", "resourceType":"GMLinuxOptions", "resourceVersion":"2.0", } \ No newline at end of file diff --git a/options/mac/options_mac.yy b/options/mac/options_mac.yy index bf8e29c..96b3af0 100644 --- a/options/mac/options_mac.yy +++ b/options/mac/options_mac.yy @@ -30,7 +30,7 @@ "option_mac_start_fullscreen":false, "option_mac_team_id":"", "option_mac_texture_page":"2048x2048", - "option_mac_version":"3.21.1", + "option_mac_version":"3.21.2", "option_mac_vsync":false, "option_mac_x86_64":true, "resourceType":"GMMacOptions", diff --git a/options/operagx/options_operagx.yy b/options/operagx/options_operagx.yy index 59ff761..d7fb24c 100644 --- a/options/operagx/options_operagx.yy +++ b/options/operagx/options_operagx.yy @@ -23,7 +23,7 @@ "option_operagx_team_id":"", "option_operagx_team_name":"", "option_operagx_texture_page":"2048x2048", - "option_operagx_version":"3.21.1.0", + "option_operagx_version":"3.21.2.0", "resourceType":"GMOperaGXOptions", "resourceVersion":"2.0", } \ No newline at end of file diff --git a/options/tvos/options_tvos.yy b/options/tvos/options_tvos.yy index 3977728..f6d5d83 100644 --- a/options/tvos/options_tvos.yy +++ b/options/tvos/options_tvos.yy @@ -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.1", + "option_tvos_version":"3.21.2", "resourceType":"GMtvOSOptions", "resourceVersion":"2.0", } \ No newline at end of file diff --git a/options/windows/options_windows.yy b/options/windows/options_windows.yy index 0a15931..b826721 100644 --- a/options/windows/options_windows.yy +++ b/options/windows/options_windows.yy @@ -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.1.0", + "option_windows_version":"3.21.2.0", "option_windows_vsync":false, "resourceType":"GMWindowsOptions", "resourceVersion":"2.0", diff --git a/scripts/BBMOD_ColorGradingEffect/BBMOD_ColorGradingEffect.gml b/scripts/BBMOD_ColorGradingEffect/BBMOD_ColorGradingEffect.gml index dde5d95..d571a57 100644 --- a/scripts/BBMOD_ColorGradingEffect/BBMOD_ColorGradingEffect.gml +++ b/scripts/BBMOD_ColorGradingEffect/BBMOD_ColorGradingEffect.gml @@ -22,7 +22,10 @@ function BBMOD_ColorGradingEffect(_lut=undefined) surface_set_target(_surfaceDest); shader_set(BBMOD_ShColorGrading); texture_set_stage(__uLUT, LUT); + gpu_push_state(); + gpu_set_tex_filter_ext(__uLUT, false); draw_surface(_surfaceSrc, 0, 0); + gpu_pop_state(); shader_reset(); surface_reset_target(); return _surfaceDest; diff --git a/scripts/BBMOD_LensDistortionEffect/BBMOD_LensDistortionEffect.gml b/scripts/BBMOD_LensDistortionEffect/BBMOD_LensDistortionEffect.gml index 326653a..1b31e34 100644 --- a/scripts/BBMOD_LensDistortionEffect/BBMOD_LensDistortionEffect.gml +++ b/scripts/BBMOD_LensDistortionEffect/BBMOD_LensDistortionEffect.gml @@ -28,7 +28,7 @@ function BBMOD_LensDistortionEffect(_strength=0.0, _zoom=1.0) static draw = function (_surfaceDest, _surfaceSrc, _depth, _normals) { - if (Strength <= 0.0) + if (Strength == 0.0) { return _surfaceSrc; } diff --git a/scripts/BBMOD_NormalDistortionEffect/BBMOD_NormalDistortionEffect.gml b/scripts/BBMOD_NormalDistortionEffect/BBMOD_NormalDistortionEffect.gml index 3152009..94d332b 100644 --- a/scripts/BBMOD_NormalDistortionEffect/BBMOD_NormalDistortionEffect.gml +++ b/scripts/BBMOD_NormalDistortionEffect/BBMOD_NormalDistortionEffect.gml @@ -29,7 +29,8 @@ function BBMOD_NormalDistortionEffect(_texture=pointer_null, _strength=1.0) static draw = function (_surfaceDest, _surfaceSrc, _depth, _normals) { - if (Texture == pointer_null) + if (Texture == pointer_null + || Strength == 0.0) { return _surfaceSrc; } diff --git a/scripts/BBMOD_SunShaftsEffect/BBMOD_SunShaftsEffect.gml b/scripts/BBMOD_SunShaftsEffect/BBMOD_SunShaftsEffect.gml index b4168ef..952dc00 100644 --- a/scripts/BBMOD_SunShaftsEffect/BBMOD_SunShaftsEffect.gml +++ b/scripts/BBMOD_SunShaftsEffect/BBMOD_SunShaftsEffect.gml @@ -1,6 +1,6 @@ /// @module PostProcessing -/// @func BBMOD_SunShaftsEffect([_lightDir[, _radius[, _color[, _blurSize[, _blurStep[, _blendMode]]]]]]) +/// @func BBMOD_SunShaftsEffect([_lightDir[, _radius[, _color[, _blurSize[, _blurStep[, _blendMode[, _lensDirtStrength]]]]]]]) /// /// @extends BBMOD_PostProcessEffect /// @@ -19,13 +19,18 @@ /// the quality. Defaults to 0.01 (high quality).0 /// @param {Constant.BlendMode} [_blendMode] The blend mode used to combine the /// sun shafts with the scene. Good options are `bm_add` (default) and `bm_max`. +/// @param {Real} [_lensDirtStrength] Modules the strength of the lens dirt +/// effect when applied to sun shafts. Defaults to 1. +/// +/// @see BBMOD_PostProcessor.LensDirtStrength function BBMOD_SunShaftsEffect( _lightDir=undefined, _radius=0.1, _color=undefined, _blurSize=100, _blurStep=0.01, - _blendMode=bm_add + _blendMode=bm_add, + _lensDirtStrength=1.0 ) : BBMOD_PostProcessEffect() constructor { /// @var {Struct.BBMOD_Vec3} The direction in which the light is coming. @@ -53,6 +58,11 @@ function BBMOD_SunShaftsEffect( /// with the scene. Good options are `bm_add` (default) and `bm_max`. BlendMode = _blendMode; + /// @var {Real} Modules the strength of the lens dirt effect when applied to + /// sun shafts. Default value is 1. + /// @see BBMOD_PostProcessor.LensDirtStrength + LensDirtStrength = _lensDirtStrength; + /// @var {Id.Surface} /// @private __surWork1 = -1; @@ -141,7 +151,7 @@ function BBMOD_SunShaftsEffect( texture_set_stage(__uLensDirtTex, PostProcessor.LensDirt); var _uvs = texture_get_uvs(PostProcessor.LensDirt); shader_set_uniform_f(__uLensDirtUVs, _uvs[0], _uvs[1], _uvs[2], _uvs[3]); - shader_set_uniform_f(__uLensDirtStrength, PostProcessor.LensDirtStrength); + shader_set_uniform_f(__uLensDirtStrength, PostProcessor.LensDirtStrength * LensDirtStrength); draw_surface_ext(__surWork2, 0, 0, 2, 2, 0, c_white, 1.0); shader_reset(); gpu_pop_state(); diff --git a/shaders/BBMOD_ShColorGrading/BBMOD_ShColorGrading.fsh b/shaders/BBMOD_ShColorGrading/BBMOD_ShColorGrading.fsh index ff3147b..06c54bc 100644 --- a/shaders/BBMOD_ShColorGrading/BBMOD_ShColorGrading.fsh +++ b/shaders/BBMOD_ShColorGrading/BBMOD_ShColorGrading.fsh @@ -40,12 +40,7 @@ vec3 ColorGrade(vec3 color, sampler2D lut) void main() { - vec3 color = texture2D(gm_BaseTexture, v_vTexCoord).rgb; - -//#ifndef _YY_GLSLES_ -// color = ColorGrade(color, u_texLUT); -//#endif - - gl_FragColor.rgb = color; + vec3 color = clamp(texture2D(gm_BaseTexture, v_vTexCoord).rgb, vec3(0.0), vec3(1.0)); + gl_FragColor.rgb = ColorGrade(color, u_texLUT); gl_FragColor.a = 1.0; } diff --git a/sprites/BBMOD_SprBestFitNormalLUT/5e52c852-96b0-44bd-a39b-919074af4aec.png b/sprites/BBMOD_SprBestFitNormalLUT/5e52c852-96b0-44bd-a39b-919074af4aec.png index 0ebde3efbf0aa750c43ce6a6a19ebcaac6c5eded..f479d2110b99ca7367f3c1f9b6bae199e03cce2a 100644 GIT binary patch delta 155 zcmX@o?R%u#x1oixg{g(Pg{6hHg{_6Xg`?Mnsj-!bxwe6Um4QJyvwsT%1A}UbYeY#(Vo9o1ZhlH;S|x*#fsu)>fr+jmx(2qm e?-tWrT!j@B&}9O>uRRAE#o+1c=d#Wzp$Pz)LMrJ1 delta 155 zcmX@o?R%u#x1oixg{g(Pg{6hHg{_6Xg`l#m4U%VuGnu33=FCzt`Q|Ei6yC4x%nxXX_X8{21X{j1}3_O=o$`$ eKlPg4;wr45fG#uL>Bv-|Q4F50elF{r5}E+}PAozI diff --git a/sprites/BBMOD_SprBestFitNormalLUT/layers/5e52c852-96b0-44bd-a39b-919074af4aec/0bfbc505-03d0-43b7-82d8-d8a257f154e1.png b/sprites/BBMOD_SprBestFitNormalLUT/layers/5e52c852-96b0-44bd-a39b-919074af4aec/0bfbc505-03d0-43b7-82d8-d8a257f154e1.png index 0ebde3efbf0aa750c43ce6a6a19ebcaac6c5eded..f479d2110b99ca7367f3c1f9b6bae199e03cce2a 100644 GIT binary patch delta 155 zcmX@o?R%u#x1oixg{g(Pg{6hHg{_6Xg`?Mnsj-!bxwe6Um4QJyvwsT%1A}UbYeY#(Vo9o1ZhlH;S|x*#fsu)>fr+jmx(2qm e?-tWrT!j@B&}9O>uRRAE#o+1c=d#Wzp$Pz)LMrJ1 delta 155 zcmX@o?R%u#x1oixg{g(Pg{6hHg{_6Xg`l#m4U%VuGnu33=FCzt`Q|Ei6yC4x%nxXX_X8{21X{j1}3_O=o$`$ eKlPg4;wr45fG#uL>Bv-|Q4F50elF{r5}E+}PAozI diff --git a/sprites/BBMOD_SprBlack/2c48178d-8c71-49c0-98e1-a2f4e1a5189b.png b/sprites/BBMOD_SprBlack/2c48178d-8c71-49c0-98e1-a2f4e1a5189b.png index 7895b559db9cab453a6a64656a242c5679c1dfa3..72e88df4e9b76bf4d7d768ab20fb4db61fb294c9 100644 GIT binary patch delta 87 zcmbQmG>d7%R1u31BLgc_V=EI2Z36=<1A|6y``n2uWiiA*h_zpwcuPS6UHx+AWqb@k N;OXk;vd$@?2>>7T7ry`i delta 87 zcmbQmG>d7%R1vcfLrW`D11l3tZ36=<0|W8eFsF$tWiiCl6yE)tcuPS6UA>{{c|`^w N@O1TaS?83{1ON~T7mEM@ diff --git a/sprites/BBMOD_SprBlack/layers/2c48178d-8c71-49c0-98e1-a2f4e1a5189b/d29f13d3-8eff-440e-989a-926bdce1dac5.png b/sprites/BBMOD_SprBlack/layers/2c48178d-8c71-49c0-98e1-a2f4e1a5189b/d29f13d3-8eff-440e-989a-926bdce1dac5.png index 7895b559db9cab453a6a64656a242c5679c1dfa3..72e88df4e9b76bf4d7d768ab20fb4db61fb294c9 100644 GIT binary patch delta 87 zcmbQmG>d7%R1u31BLgc_V=EI2Z36=<1A|6y``n2uWiiA*h_zpwcuPS6UHx+AWqb@k N;OXk;vd$@?2>>7T7ry`i delta 87 zcmbQmG>d7%R1vcfLrW`D11l3tZ36=<0|W8eFsF$tWiiCl6yE)tcuPS6UA>{{c|`^w N@O1TaS?83{1ON~T7mEM@ diff --git a/sprites/BBMOD_SprCheckerboard/f32abfde-987f-47df-8dc5-6501ccd1cffe.png b/sprites/BBMOD_SprCheckerboard/f32abfde-987f-47df-8dc5-6501ccd1cffe.png index 4a93bad32e716a2eb14d057178dfae94d0cb5adb..2d77db21a285393975375ea2bcd941b188438888 100644 GIT binary patch delta 90 zcmdnVypwr@38RQbh>?Mnsj-!bxwe6Um4QJyvwzEE4@OxG3AVWJ7LzL(6%^2Q1bSb4 P&Hx0Su6{1-oD!M<`0*D7 delta 90 zcmdnVypwr@38RQvh@qvGsezS=g|>l#m4U%VuGnvrJs4#%Bo2f>^_pDCsGxwZW4hCk QsSH5i>FVdQ&MBb@07n=YUH||9 diff --git a/sprites/BBMOD_SprCheckerboard/layers/f32abfde-987f-47df-8dc5-6501ccd1cffe/7871b65d-a5ff-4d19-bcb3-5887144e2eca.png b/sprites/BBMOD_SprCheckerboard/layers/f32abfde-987f-47df-8dc5-6501ccd1cffe/7871b65d-a5ff-4d19-bcb3-5887144e2eca.png index 4a93bad32e716a2eb14d057178dfae94d0cb5adb..2d77db21a285393975375ea2bcd941b188438888 100644 GIT binary patch delta 90 zcmdnVypwr@38RQbh>?Mnsj-!bxwe6Um4QJyvwzEE4@OxG3AVWJ7LzL(6%^2Q1bSb4 P&Hx0Su6{1-oD!M<`0*D7 delta 90 zcmdnVypwr@38RQvh@qvGsezS=g|>l#m4U%VuGnvrJs4#%Bo2f>^_pDCsGxwZW4hCk QsSH5i>FVdQ&MBb@07n=YUH||9 diff --git a/sprites/BBMOD_SprColorGradingLUT/9c1088e4-4abf-42a7-ba51-7768972da5f4.png b/sprites/BBMOD_SprColorGradingLUT/9c1088e4-4abf-42a7-ba51-7768972da5f4.png index 2b886d98f5ba9239bc376f57c30b21e0abbc62c4..f09a2d3db20cf04c2fac4e961d6ee392c3170f2d 100644 GIT binary patch delta 88 zcmaFC^nz)^V-brGBLgc_V=EJLZ36=<1A}sA|CWj0WiiCr;=Wr<)?idnK-UoHeeF2| O5O})!xvXd7%R1u31BLgc_V=EJLZ36=<1A}sA|CWg>WiiCr;=Wrd7%R1vcfLrW`D11l2?Z36=<1A~oRvEL@Hl*JG~5dPF_;w=RQboJAnj!b0$ N0#8>zmvv4FO#n^F85#fp diff --git a/sprites/BBMOD_SprDefaultNormalW/layers/2c0dbe20-e924-4d3b-bd43-b7fcd89299e4/ddc0cec4-9ac7-4182-80c8-ca47f583360f.png b/sprites/BBMOD_SprDefaultNormalW/layers/2c0dbe20-e924-4d3b-bd43-b7fcd89299e4/ddc0cec4-9ac7-4182-80c8-ca47f583360f.png index c5e245f47b01978e7c5d9eb10671fdd941afdbce..351ac97e0bf0b20fcd03c3775914fb5c48d70b36 100644 GIT binary patch delta 87 zcmbQmG>d7%R1u31BLgc_V=EJLZ36=<1A}sA|CWg>WiiCr;=Wrd7%R1vcfLrW`D11l2?Z36=<1A~oRvEL@Hl*JG~5dPF_;w=RQboJAnj!b0$ N0#8>zmvv4FO#n^F85#fp diff --git a/sprites/BBMOD_SprDefaultSpecularColor/2c0dbe20-e924-4d3b-bd43-b7fcd89299e4.png b/sprites/BBMOD_SprDefaultSpecularColor/2c0dbe20-e924-4d3b-bd43-b7fcd89299e4.png index 2a928091a913b7bc16aed29815bdb018167e7310..237017071fe6604c5ffa4fc943e6f78b8d3933e7 100644 GIT binary patch delta 87 zcmbQmG>d7%R1u31BLgc_V=EJLZ36=<1A}sA|CWg>WiiCr;=Wrd7%R1vcfLrW`D11l2?Z36=<1A~oRvEL@Hl*JG~5dPF_;w=RQboJAnj!b0$ N0#8>zmvv4FO#n^F85#fp diff --git a/sprites/BBMOD_SprDefaultSpecularColor/BBMOD_SprDefaultSpecularColor.yy b/sprites/BBMOD_SprDefaultSpecularColor/BBMOD_SprDefaultSpecularColor.yy index 4e7256c..83cc22f 100644 --- a/sprites/BBMOD_SprDefaultSpecularColor/BBMOD_SprDefaultSpecularColor.yy +++ b/sprites/BBMOD_SprDefaultSpecularColor/BBMOD_SprDefaultSpecularColor.yy @@ -2,9 +2,9 @@ "$GMSprite":"", "%Name":"BBMOD_SprDefaultSpecularColor", "bboxMode":0, - "bbox_bottom":0, + "bbox_bottom":63, "bbox_left":0, - "bbox_right":0, + "bbox_right":63, "bbox_top":0, "collisionKind":1, "collisionTolerance":0, diff --git a/sprites/BBMOD_SprDefaultSpecularColor/layers/2c0dbe20-e924-4d3b-bd43-b7fcd89299e4/ddc0cec4-9ac7-4182-80c8-ca47f583360f.png b/sprites/BBMOD_SprDefaultSpecularColor/layers/2c0dbe20-e924-4d3b-bd43-b7fcd89299e4/ddc0cec4-9ac7-4182-80c8-ca47f583360f.png index 2a928091a913b7bc16aed29815bdb018167e7310..237017071fe6604c5ffa4fc943e6f78b8d3933e7 100644 GIT binary patch delta 87 zcmbQmG>d7%R1u31BLgc_V=EJLZ36=<1A}sA|CWg>WiiCr;=Wrd7%R1vcfLrW`D11l2?Z36=<1A~oRvEL@Hl*JG~5dPF_;w=RQboJAnj!b0$ N0#8>zmvv4FO#n^F85#fp diff --git a/sprites/BBMOD_SprGizmo/198f2eb3-626a-4665-a2b0-881cce537b25.png b/sprites/BBMOD_SprGizmo/198f2eb3-626a-4665-a2b0-881cce537b25.png index 2bac09af5eb661f5b401ca08306d004931d17892..73100df889f929f3e0a685e1d7078d40d4ad98de 100644 GIT binary patch delta 90 zcmcb?af4&SWo8kJ5F-OCQ)4R=b8Q0yD+7aaX8)GS&zWU0B-rAmdKI;Vst0IsPSiU0rr diff --git a/sprites/BBMOD_SprGizmo/f6406058-c156-411a-b6b4-53268f2116b4.png b/sprites/BBMOD_SprGizmo/f6406058-c156-411a-b6b4-53268f2116b4.png index ba47faa1c9e09b1c59fe66f7bb3377d51ac5633e..e36692fd37fc7230224055f85767c01310f037ae 100644 GIT binary patch delta 90 zcmX@fagt-h5oQsK5F-OCQ)4R=b8Q0yD+7aaX8)GSH<)EHB-rAmdKI;Vst0GW{)KL7v# diff --git a/sprites/BBMOD_SprGizmo/layers/198f2eb3-626a-4665-a2b0-881cce537b25/cf694e91-149c-40b5-8c3e-977ad4b52c84.png b/sprites/BBMOD_SprGizmo/layers/198f2eb3-626a-4665-a2b0-881cce537b25/cf694e91-149c-40b5-8c3e-977ad4b52c84.png index 2bac09af5eb661f5b401ca08306d004931d17892..73100df889f929f3e0a685e1d7078d40d4ad98de 100644 GIT binary patch delta 90 zcmcb?af4&SWo8kJ5F-OCQ)4R=b8Q0yD+7aaX8)GS&zWU0B-rAmdKI;Vst0IsPSiU0rr diff --git a/sprites/BBMOD_SprGizmo/layers/f6406058-c156-411a-b6b4-53268f2116b4/cf694e91-149c-40b5-8c3e-977ad4b52c84.png b/sprites/BBMOD_SprGizmo/layers/f6406058-c156-411a-b6b4-53268f2116b4/cf694e91-149c-40b5-8c3e-977ad4b52c84.png index ba47faa1c9e09b1c59fe66f7bb3377d51ac5633e..e36692fd37fc7230224055f85767c01310f037ae 100644 GIT binary patch delta 90 zcmX@fagt-h5oQsK5F-OCQ)4R=b8Q0yD+7aaX8)GSH<)EHB-rAmdKI;Vst0GW{)KL7v# diff --git a/sprites/BBMOD_SprLensDirt/53a81332-e4de-4bc2-98d1-95f7df68a62a.png b/sprites/BBMOD_SprLensDirt/53a81332-e4de-4bc2-98d1-95f7df68a62a.png index 58cab71efb01e77833f9fb1a1d357c9d78a4d96b..fa314baeb25a968733ce540528fd6babdac7ce15 100644 GIT binary patch delta 127 zcmZ3!QFQr6(S{br7N!>F7M3lnN)fIWAw~vPrp8t#=Gq1ZRt5&;%>FG53=FCzt`Q|E zi6yC4x%nxXX_X8{21X{j1}3_O=o;AKzFSOBk6=|$K$i*hzV;kw6oaR$pUXO@geCyk CLn49z delta 127 zcmZ3!QFQr6(S{br7N!>F7M3lnN)fJRA%>P#rUq6f7TN{|Rt5$exnjRDFfgc=xJHzu zB$lLF<>sekrd2W+85o)98kp!BqH8!1{?u!FdIYP20=mp}rz2B=MlpE0`njxgN@xNA DI$k5& diff --git a/sprites/BBMOD_SprLensDirt/layers/53a81332-e4de-4bc2-98d1-95f7df68a62a/0d5f58c5-7c4d-40c8-9214-2a3cc66342d9.png b/sprites/BBMOD_SprLensDirt/layers/53a81332-e4de-4bc2-98d1-95f7df68a62a/0d5f58c5-7c4d-40c8-9214-2a3cc66342d9.png index 58cab71efb01e77833f9fb1a1d357c9d78a4d96b..fa314baeb25a968733ce540528fd6babdac7ce15 100644 GIT binary patch delta 127 zcmZ3!QFQr6(S{br7N!>F7M3lnN)fIWAw~vPrp8t#=Gq1ZRt5&;%>FG53=FCzt`Q|E zi6yC4x%nxXX_X8{21X{j1}3_O=o;AKzFSOBk6=|$K$i*hzV;kw6oaR$pUXO@geCyk CLn49z delta 127 zcmZ3!QFQr6(S{br7N!>F7M3lnN)fJRA%>P#rUq6f7TN{|Rt5$exnjRDFfgc=xJHzu zB$lLF<>sekrd2W+85o)98kp!BqH8!1{?u!FdIYP20=mp}rz2B=MlpE0`njxgN@xNA DI$k5& diff --git a/sprites/BBMOD_SprLensFlareHeptagon/05f74315-7188-46ef-97f9-79d5e9f72694.png b/sprites/BBMOD_SprLensFlareHeptagon/05f74315-7188-46ef-97f9-79d5e9f72694.png index bfaa8de3887bdde43a49efdb2d381e0cd193c689..f02a8491f47504a5267dc5b4f9a7bb1481d6e9dd 100644 GIT binary patch delta 90 zcmaE;@la#K9bplR5F-OCQ)4R=b8Q0yD+7aaX8)GSAB1HwB-rAmdKI;Vst0NjBZCjbBd diff --git a/sprites/BBMOD_SprLensFlareHeptagon/layers/05f74315-7188-46ef-97f9-79d5e9f72694/c2aed7b1-e8f0-4ec0-82cb-1539d2f63bb3.png b/sprites/BBMOD_SprLensFlareHeptagon/layers/05f74315-7188-46ef-97f9-79d5e9f72694/c2aed7b1-e8f0-4ec0-82cb-1539d2f63bb3.png index bfaa8de3887bdde43a49efdb2d381e0cd193c689..f02a8491f47504a5267dc5b4f9a7bb1481d6e9dd 100644 GIT binary patch delta 90 zcmaE;@la#K9bplR5F-OCQ)4R=b8Q0yD+7aaX8)GSAB1HwB-rAmdKI;Vst0NjBZCjbBd diff --git a/sprites/BBMOD_SprLensFlareHoop/b96bc2e2-32e9-4783-9b2a-f8569dee2561.png b/sprites/BBMOD_SprLensFlareHoop/b96bc2e2-32e9-4783-9b2a-f8569dee2561.png index 6bf2e9d02fc344aa2c2add7b5eef11033b3d82fe..c2541f8f345fb3adfc76dff6e67600f2e821ff2a 100644 GIT binary patch delta 116 zcmezVj_Lb5rVXFAxmtu68CaPbTbY<^8yHv_7?d;nw=gg;sFt`!l%yncndlmr=o+GHV2k^1G1+{(f&#ikp!c=sK$93eUHx3vIVCg!0AKwgCjbBd delta 116 zcmezVj_Lb5rVXFAxtfI-T3VSJSeaO88yHv_7;NN<{l>t+pjzS@QIe8al4_NkpOTqY s$zWt)WTIcndlmr=o+GHV2k^1G1+{(f&#ikp!c=sK$93eUHx3vIVCg!0AKwgCjbBd delta 116 zcmezVj_Lb5rVXFAxtfI-T3VSJSeaO88yHv_7;NN<{l>t+pjzS@QIe8al4_NkpOTqY s$zWt)WTIO3%XIO2CRq#_wz%&W(>>~$ X6co_)1bSb4&Hx0Su6{1-oD!MFVdQ&MBb@0G@Un1ONa4 diff --git a/sprites/BBMOD_SprLensFlareStarburst/layers/971a6ff5-ee10-4f3f-a2ac-d9c05eb6a024/747c91bc-a508-45fa-9f6c-e78468aa8d2a.png b/sprites/BBMOD_SprLensFlareStarburst/layers/971a6ff5-ee10-4f3f-a2ac-d9c05eb6a024/747c91bc-a508-45fa-9f6c-e78468aa8d2a.png index bf74326f208f77c23ef1f091b75286f288116ada..12111d8424434b7b37b0d1da3c119e5f54b4eaa9 100644 GIT binary patch delta 98 zcmeD9&)M;xv!R7?3lnp_h((Bzft9JTm5I5wfq|8QK{>O3%XIO2CRq#_wz%&W(>>~$ X6co_)1bSb4&Hx0Su6{1-oD!MFVdQ&MBb@0G@Un1ONa4 diff --git a/sprites/BBMOD_SprLensFlareStreak/fa2e235f-11e5-47d4-a01a-5c3f7a4d9f39.png b/sprites/BBMOD_SprLensFlareStreak/fa2e235f-11e5-47d4-a01a-5c3f7a4d9f39.png index 24648c7ddf98d0e2859b3f143c45409314ed31ec..e5f9557ca8fc5982a5f914d9636dbcd2f6fd823b 100644 GIT binary patch delta 90 zcmeyZ_*-#9nSh8zh>?Mnsj-!bxwe6Um4QJyvwzFvE&*8#3AVWJ7L#`iC@7%o2=u=8 QoB;?tUHx3vIVCg!0CepbxBvhE delta 90 zcmeyZ_*-#9nSh8{h@qvGsezS=g|>l#m4U%VuGnvry98u0Bo2f>^_sj}KtTar$8@J7 QQyGB3)78&qol`;+0K)|u5dZ)H diff --git a/sprites/BBMOD_SprLensFlareStreak/layers/fa2e235f-11e5-47d4-a01a-5c3f7a4d9f39/4c9c1895-1d2d-4e36-b501-1a04700f3b43.png b/sprites/BBMOD_SprLensFlareStreak/layers/fa2e235f-11e5-47d4-a01a-5c3f7a4d9f39/4c9c1895-1d2d-4e36-b501-1a04700f3b43.png index 24648c7ddf98d0e2859b3f143c45409314ed31ec..e5f9557ca8fc5982a5f914d9636dbcd2f6fd823b 100644 GIT binary patch delta 90 zcmeyZ_*-#9nSh8zh>?Mnsj-!bxwe6Um4QJyvwzFvE&*8#3AVWJ7L#`iC@7%o2=u=8 QoB;?tUHx3vIVCg!0CepbxBvhE delta 90 zcmeyZ_*-#9nSh8{h@qvGsezS=g|>l#m4U%VuGnvry98u0Bo2f>^_sj}KtTar$8@J7 QQyGB3)78&qol`;+0K)|u5dZ)H diff --git a/sprites/BBMOD_SprParticle/3aac4271-58c7-44de-9a18-62ce002f4288.png b/sprites/BBMOD_SprParticle/3aac4271-58c7-44de-9a18-62ce002f4288.png index 31b6d43522a1f07e19d2c4046b2a0abef95ca8f9..8832d4d4718e9483e5dcf427c7c52ae03e4f4d5a 100644 GIT binary patch delta 92 zcmdnFpK0fQrVS?ZMJz&$46ICztxU|d4GgRd49c1PTPAzVm&K4^i~DXdxpKaO0=kYs S?`zK)fWXt$&t;ucLK6V)h8kM{ delta 92 zcmdnFpK0fQrVS?ZMa)7BEv-xqtV}Gl4GgRd3^sDbew*wuUlv2+K=@Oy$(8dJ6wq}{ TcRDha0SG)@{an^LB{Ts5JgpnF diff --git a/sprites/BBMOD_SprParticle/layers/3aac4271-58c7-44de-9a18-62ce002f4288/e0fec503-965d-4d6c-8c50-8ddca8cc8815.png b/sprites/BBMOD_SprParticle/layers/3aac4271-58c7-44de-9a18-62ce002f4288/e0fec503-965d-4d6c-8c50-8ddca8cc8815.png index 31b6d43522a1f07e19d2c4046b2a0abef95ca8f9..8832d4d4718e9483e5dcf427c7c52ae03e4f4d5a 100644 GIT binary patch delta 92 zcmdnFpK0fQrVS?ZMJz&$46ICztxU|d4GgRd49c1PTPAzVm&K4^i~DXdxpKaO0=kYs S?`zK)fWXt$&t;ucLK6V)h8kM{ delta 92 zcmdnFpK0fQrVS?ZMa)7BEv-xqtV}Gl4GgRd3^sDbew*wuUlv2+K=@Oy$(8dJ6wq}{ TcRDha0SG)@{an^LB{Ts5JgpnF diff --git a/sprites/BBMOD_SprWhite/2c48178d-8c71-49c0-98e1-a2f4e1a5189b.png b/sprites/BBMOD_SprWhite/2c48178d-8c71-49c0-98e1-a2f4e1a5189b.png index cc1560aaaf749644b34e56c2f81cbf68ca2e1b63..e910389eda9fdcb7844aafb9cadbd6f1ac1f91b6 100644 GIT binary patch delta 87 zcmbQiG=pivWD$!HBLgc_V=EJLZ36=<1A}sA|CWi%WiiCr;=Wrxm&Fi25dPF_;td4_boJAnj!b0$ N0#8>zmvv4FO#n*~84v&f diff --git a/sprites/BBMOD_SprWhite/layers/2c48178d-8c71-49c0-98e1-a2f4e1a5189b/d29f13d3-8eff-440e-989a-926bdce1dac5.png b/sprites/BBMOD_SprWhite/layers/2c48178d-8c71-49c0-98e1-a2f4e1a5189b/d29f13d3-8eff-440e-989a-926bdce1dac5.png index cc1560aaaf749644b34e56c2f81cbf68ca2e1b63..e910389eda9fdcb7844aafb9cadbd6f1ac1f91b6 100644 GIT binary patch delta 87 zcmbQiG=pivWD$!HBLgc_V=EJLZ36=<1A}sA|CWi%WiiCr;=Wrxm&Fi25dPF_;td4_boJAnj!b0$ N0#8>zmvv4FO#n*~84v&f