diff --git a/PixelComposer.yyp b/PixelComposer.yyp index 2e97cdd3c..95300c1dc 100644 --- a/PixelComposer.yyp +++ b/PixelComposer.yyp @@ -189,90 +189,6 @@ "IncludedFiles": [ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"ApolloHelp.html","CopyToMask":-1,"filePath":"datafiles",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Assets.zip","CopyToMask":-1,"filePath":"datafiles/data",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"assimp-vc143-mt.dll","CopyToMask":-1,"filePath":"datafiles/data/BBMOD",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"assimp-vc143-mt.dll","CopyToMask":64,"filePath":"datafiles/Data/BBMOD",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"BBMOD","CopyToMask":-1,"filePath":"datafiles/data/BBMOD",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"BBMOD","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"BBMOD.dll","CopyToMask":-1,"filePath":"datafiles/data/BBMOD",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"BBMOD.dll","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"BBMOD.exe","CopyToMask":-1,"filePath":"datafiles/data/BBMOD",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"BBMOD.exe","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"libassimp.5.dylib","CopyToMask":-1,"filePath":"datafiles/data/BBMOD",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"libassimp.5.dylib","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"libBBMOD.dylib","CopyToMask":-1,"filePath":"datafiles/data/BBMOD",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"libBBMOD.dylib","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"LICENSE-Assimp","CopyToMask":-1,"filePath":"datafiles/data/BBMOD",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"LICENSE-Assimp","CopyToMask":64,"filePath":"datafiles/Data/BBMOD",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"gizmo.blend","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Models",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"GizmoMove.bbmod","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Models",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"GizmoMove.bbmod","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Models",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"GizmoRotate.bbmod","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Models",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"GizmoRotate.bbmod","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Models",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"GizmoScale.bbmod","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Models",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"GizmoScale.bbmod","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Models",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"rotateGizmo.fbx","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Models",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Sphere.bbmod","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Models",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Sphere.bbmod","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Models",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"IBL-10.png","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"IBL-10.png","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"IBL-15.png","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"IBL-15.png","CopyToMask":3035461389054378222,"filePath":"datafiles/Data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"IBL-5.png","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"IBL-5.png","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"IBL+0.png","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"IBL+0.png","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"IBL+10.png","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"IBL+10.png","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"IBL+15.png","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"IBL+15.png","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"IBL+20.png","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"IBL+20.png","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"IBL+30.png","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"IBL+30.png","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"IBL+40.png","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"IBL+40.png","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"IBL+5.png","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"IBL+5.png","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"IBL+50.png","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"IBL+50.png","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"IBL+60.png","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"IBL+60.png","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"IBL+70.png","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"IBL+70.png","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"IBL+80.png","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"IBL+80.png","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"IBL+90.png","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"IBL+90.png","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Sky-10.png","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Sky-10.png","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Sky-15.png","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Sky-15.png","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Sky-5.png","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Sky-5.png","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Sky+0.png","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Sky+0.png","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Sky+10.png","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Sky+10.png","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Sky+15.png","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Sky+15.png","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Sky+20.png","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Sky+20.png","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Sky+30.png","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Sky+30.png","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Sky+40.png","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Sky+40.png","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Sky+5.png","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Sky+5.png","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Sky+50.png","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Sky+50.png","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Sky+60.png","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Sky+60.png","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Sky+70.png","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Sky+70.png","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Sky+80.png","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Sky+80.png","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Sky+90.png","CopyToMask":-1,"filePath":"datafiles/data/BBMOD/Skies",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Sky+90.png","CopyToMask":-1,"filePath":"datafiles/Data/BBMOD/Skies",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Collections.zip","CopyToMask":-1,"filePath":"datafiles/data",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Guides.zip","CopyToMask":-1,"filePath":"datafiles/data",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"icon.png","CopyToMask":-1,"filePath":"datafiles/data",}, @@ -923,7 +839,7 @@ "isEcma": false, "LibraryEmitters": [], "MetaData": { - "IDEVersion": "2023.2.0.71", + "IDEVersion": "2023.4.0.84", }, "resources": [ {"id":{"name":"s_node_corner","path":"sprites/s_node_corner/s_node_corner.yy",},}, diff --git a/datafiles/data/BBMOD/BBMOD b/datafiles/data/BBMOD/BBMOD deleted file mode 100644 index 044385bd3..000000000 Binary files a/datafiles/data/BBMOD/BBMOD and /dev/null differ diff --git a/datafiles/data/BBMOD/BBMOD.dll b/datafiles/data/BBMOD/BBMOD.dll deleted file mode 100644 index b2250147a..000000000 Binary files a/datafiles/data/BBMOD/BBMOD.dll and /dev/null differ diff --git a/datafiles/data/BBMOD/BBMOD.exe b/datafiles/data/BBMOD/BBMOD.exe deleted file mode 100644 index 8eb32fbb9..000000000 Binary files a/datafiles/data/BBMOD/BBMOD.exe and /dev/null differ diff --git a/datafiles/data/BBMOD/LICENSE-Assimp b/datafiles/data/BBMOD/LICENSE-Assimp deleted file mode 100644 index 7d2194deb..000000000 --- a/datafiles/data/BBMOD/LICENSE-Assimp +++ /dev/null @@ -1,78 +0,0 @@ -Open Asset Import Library (assimp) - -Copyright (c) 2006-2021, assimp team -All rights reserved. - -Redistribution and use of this software in source and binary forms, -with or without modification, are permitted provided that the -following conditions are met: - -* Redistributions of source code must retain the above - copyright notice, this list of conditions and the - following disclaimer. - -* Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the - following disclaimer in the documentation and/or other - materials provided with the distribution. - -* Neither the name of the assimp team, nor the names of its - contributors may be used to endorse or promote products - derived from this software without specific prior - written permission of the assimp team. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - - -****************************************************************************** - -AN EXCEPTION applies to all files in the ./test/models-nonbsd folder. -These are 3d models for testing purposes, from various free sources -on the internet. They are - unless otherwise stated - copyright of -their respective creators, which may impose additional requirements -on the use of their work. For any of these models, see -.source.txt for more legal information. Contact us if you -are a copyright holder and believe that we credited you inproperly or -if you don't want your files to appear in the repository. - - -****************************************************************************** - -Poly2Tri Copyright (c) 2009-2010, Poly2Tri Contributors -http://code.google.com/p/poly2tri/ - -All rights reserved. -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. -* Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. -* Neither the name of Poly2Tri nor the names of its contributors may be - used to endorse or promote products derived from this software without specific - prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/datafiles/data/BBMOD/Models/GizmoMove.bbmod b/datafiles/data/BBMOD/Models/GizmoMove.bbmod deleted file mode 100644 index bea708563..000000000 Binary files a/datafiles/data/BBMOD/Models/GizmoMove.bbmod and /dev/null differ diff --git a/datafiles/data/BBMOD/Models/GizmoRotate.bbmod b/datafiles/data/BBMOD/Models/GizmoRotate.bbmod deleted file mode 100644 index 0d6cd8911..000000000 Binary files a/datafiles/data/BBMOD/Models/GizmoRotate.bbmod and /dev/null differ diff --git a/datafiles/data/BBMOD/Models/GizmoScale.bbmod b/datafiles/data/BBMOD/Models/GizmoScale.bbmod deleted file mode 100644 index 34819c97d..000000000 Binary files a/datafiles/data/BBMOD/Models/GizmoScale.bbmod and /dev/null differ diff --git a/datafiles/data/BBMOD/Models/Sphere.bbmod b/datafiles/data/BBMOD/Models/Sphere.bbmod deleted file mode 100644 index b5c23a9bd..000000000 Binary files a/datafiles/data/BBMOD/Models/Sphere.bbmod and /dev/null differ diff --git a/datafiles/data/BBMOD/Models/gizmo.blend b/datafiles/data/BBMOD/Models/gizmo.blend deleted file mode 100644 index eebc8c2ac..000000000 Binary files a/datafiles/data/BBMOD/Models/gizmo.blend and /dev/null differ diff --git a/datafiles/data/BBMOD/Models/rotateGizmo.fbx b/datafiles/data/BBMOD/Models/rotateGizmo.fbx deleted file mode 100644 index 8668d3c6b..000000000 Binary files a/datafiles/data/BBMOD/Models/rotateGizmo.fbx and /dev/null differ diff --git a/datafiles/data/BBMOD/Skies/IBL+0.png b/datafiles/data/BBMOD/Skies/IBL+0.png deleted file mode 100644 index 744d26c48..000000000 Binary files a/datafiles/data/BBMOD/Skies/IBL+0.png and /dev/null differ diff --git a/datafiles/data/BBMOD/Skies/IBL+10.png b/datafiles/data/BBMOD/Skies/IBL+10.png deleted file mode 100644 index cd19b6b26..000000000 Binary files a/datafiles/data/BBMOD/Skies/IBL+10.png and /dev/null differ diff --git a/datafiles/data/BBMOD/Skies/IBL+15.png b/datafiles/data/BBMOD/Skies/IBL+15.png deleted file mode 100644 index aa341b236..000000000 Binary files a/datafiles/data/BBMOD/Skies/IBL+15.png and /dev/null differ diff --git a/datafiles/data/BBMOD/Skies/IBL+20.png b/datafiles/data/BBMOD/Skies/IBL+20.png deleted file mode 100644 index 4811930af..000000000 Binary files a/datafiles/data/BBMOD/Skies/IBL+20.png and /dev/null differ diff --git a/datafiles/data/BBMOD/Skies/IBL+30.png b/datafiles/data/BBMOD/Skies/IBL+30.png deleted file mode 100644 index 8135b46e5..000000000 Binary files a/datafiles/data/BBMOD/Skies/IBL+30.png and /dev/null differ diff --git a/datafiles/data/BBMOD/Skies/IBL+40.png b/datafiles/data/BBMOD/Skies/IBL+40.png deleted file mode 100644 index 3c8624347..000000000 Binary files a/datafiles/data/BBMOD/Skies/IBL+40.png and /dev/null differ diff --git a/datafiles/data/BBMOD/Skies/IBL+5.png b/datafiles/data/BBMOD/Skies/IBL+5.png deleted file mode 100644 index 2da797e99..000000000 Binary files a/datafiles/data/BBMOD/Skies/IBL+5.png and /dev/null differ diff --git a/datafiles/data/BBMOD/Skies/IBL+50.png b/datafiles/data/BBMOD/Skies/IBL+50.png deleted file mode 100644 index 121b01933..000000000 Binary files a/datafiles/data/BBMOD/Skies/IBL+50.png and /dev/null differ diff --git a/datafiles/data/BBMOD/Skies/IBL+60.png b/datafiles/data/BBMOD/Skies/IBL+60.png deleted file mode 100644 index db7df61e6..000000000 Binary files a/datafiles/data/BBMOD/Skies/IBL+60.png and /dev/null differ diff --git a/datafiles/data/BBMOD/Skies/IBL+70.png b/datafiles/data/BBMOD/Skies/IBL+70.png deleted file mode 100644 index 086c196ca..000000000 Binary files a/datafiles/data/BBMOD/Skies/IBL+70.png and /dev/null differ diff --git a/datafiles/data/BBMOD/Skies/IBL+80.png b/datafiles/data/BBMOD/Skies/IBL+80.png deleted file mode 100644 index de58a84dd..000000000 Binary files a/datafiles/data/BBMOD/Skies/IBL+80.png and /dev/null differ diff --git a/datafiles/data/BBMOD/Skies/IBL+90.png b/datafiles/data/BBMOD/Skies/IBL+90.png deleted file mode 100644 index 65b29ff10..000000000 Binary files a/datafiles/data/BBMOD/Skies/IBL+90.png and /dev/null differ diff --git a/datafiles/data/BBMOD/Skies/IBL-10.png b/datafiles/data/BBMOD/Skies/IBL-10.png deleted file mode 100644 index b0c864318..000000000 Binary files a/datafiles/data/BBMOD/Skies/IBL-10.png and /dev/null differ diff --git a/datafiles/data/BBMOD/Skies/IBL-15.png b/datafiles/data/BBMOD/Skies/IBL-15.png deleted file mode 100644 index 395db0301..000000000 Binary files a/datafiles/data/BBMOD/Skies/IBL-15.png and /dev/null differ diff --git a/datafiles/data/BBMOD/Skies/IBL-5.png b/datafiles/data/BBMOD/Skies/IBL-5.png deleted file mode 100644 index 89249c901..000000000 Binary files a/datafiles/data/BBMOD/Skies/IBL-5.png and /dev/null differ diff --git a/datafiles/data/BBMOD/Skies/Sky+0.png b/datafiles/data/BBMOD/Skies/Sky+0.png deleted file mode 100644 index a6e8ff6bb..000000000 Binary files a/datafiles/data/BBMOD/Skies/Sky+0.png and /dev/null differ diff --git a/datafiles/data/BBMOD/Skies/Sky+10.png b/datafiles/data/BBMOD/Skies/Sky+10.png deleted file mode 100644 index 347c8cce8..000000000 Binary files a/datafiles/data/BBMOD/Skies/Sky+10.png and /dev/null differ diff --git a/datafiles/data/BBMOD/Skies/Sky+15.png b/datafiles/data/BBMOD/Skies/Sky+15.png deleted file mode 100644 index 65cfe441c..000000000 Binary files a/datafiles/data/BBMOD/Skies/Sky+15.png and /dev/null differ diff --git a/datafiles/data/BBMOD/Skies/Sky+20.png b/datafiles/data/BBMOD/Skies/Sky+20.png deleted file mode 100644 index 6550d7e0c..000000000 Binary files a/datafiles/data/BBMOD/Skies/Sky+20.png and /dev/null differ diff --git a/datafiles/data/BBMOD/Skies/Sky+30.png b/datafiles/data/BBMOD/Skies/Sky+30.png deleted file mode 100644 index 80e69827f..000000000 Binary files a/datafiles/data/BBMOD/Skies/Sky+30.png and /dev/null differ diff --git a/datafiles/data/BBMOD/Skies/Sky+40.png b/datafiles/data/BBMOD/Skies/Sky+40.png deleted file mode 100644 index 5bf91b50b..000000000 Binary files a/datafiles/data/BBMOD/Skies/Sky+40.png and /dev/null differ diff --git a/datafiles/data/BBMOD/Skies/Sky+5.png b/datafiles/data/BBMOD/Skies/Sky+5.png deleted file mode 100644 index ea8b5ef43..000000000 Binary files a/datafiles/data/BBMOD/Skies/Sky+5.png and /dev/null differ diff --git a/datafiles/data/BBMOD/Skies/Sky+50.png b/datafiles/data/BBMOD/Skies/Sky+50.png deleted file mode 100644 index 3fef896d3..000000000 Binary files a/datafiles/data/BBMOD/Skies/Sky+50.png and /dev/null differ diff --git a/datafiles/data/BBMOD/Skies/Sky+60.png b/datafiles/data/BBMOD/Skies/Sky+60.png deleted file mode 100644 index d15d481fd..000000000 Binary files a/datafiles/data/BBMOD/Skies/Sky+60.png and /dev/null differ diff --git a/datafiles/data/BBMOD/Skies/Sky+70.png b/datafiles/data/BBMOD/Skies/Sky+70.png deleted file mode 100644 index 6e5637b8f..000000000 Binary files a/datafiles/data/BBMOD/Skies/Sky+70.png and /dev/null differ diff --git a/datafiles/data/BBMOD/Skies/Sky+80.png b/datafiles/data/BBMOD/Skies/Sky+80.png deleted file mode 100644 index a8ffdee2e..000000000 Binary files a/datafiles/data/BBMOD/Skies/Sky+80.png and /dev/null differ diff --git a/datafiles/data/BBMOD/Skies/Sky+90.png b/datafiles/data/BBMOD/Skies/Sky+90.png deleted file mode 100644 index 6053ecbad..000000000 Binary files a/datafiles/data/BBMOD/Skies/Sky+90.png and /dev/null differ diff --git a/datafiles/data/BBMOD/Skies/Sky-10.png b/datafiles/data/BBMOD/Skies/Sky-10.png deleted file mode 100644 index 2a798d51c..000000000 Binary files a/datafiles/data/BBMOD/Skies/Sky-10.png and /dev/null differ diff --git a/datafiles/data/BBMOD/Skies/Sky-15.png b/datafiles/data/BBMOD/Skies/Sky-15.png deleted file mode 100644 index b3c51d975..000000000 Binary files a/datafiles/data/BBMOD/Skies/Sky-15.png and /dev/null differ diff --git a/datafiles/data/BBMOD/Skies/Sky-5.png b/datafiles/data/BBMOD/Skies/Sky-5.png deleted file mode 100644 index 5d79b054b..000000000 Binary files a/datafiles/data/BBMOD/Skies/Sky-5.png and /dev/null differ diff --git a/datafiles/data/BBMOD/assimp-vc143-mt.dll b/datafiles/data/BBMOD/assimp-vc143-mt.dll deleted file mode 100644 index e47fdda53..000000000 Binary files a/datafiles/data/BBMOD/assimp-vc143-mt.dll and /dev/null differ diff --git a/datafiles/data/BBMOD/libBBMOD.dylib b/datafiles/data/BBMOD/libBBMOD.dylib deleted file mode 100644 index 76f2426cb..000000000 Binary files a/datafiles/data/BBMOD/libBBMOD.dylib and /dev/null differ diff --git a/datafiles/data/BBMOD/libassimp.5.dylib b/datafiles/data/BBMOD/libassimp.5.dylib deleted file mode 100644 index cb98ce307..000000000 Binary files a/datafiles/data/BBMOD/libassimp.5.dylib and /dev/null differ diff --git a/scripts/node_path/node_path.gml b/scripts/node_path/node_path.gml index 4ebd530a0..210527a1e 100644 --- a/scripts/node_path/node_path.gml +++ b/scripts/node_path/node_path.gml @@ -16,6 +16,7 @@ function Node_Path(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { inputs[| 3] = nodeValue("Round anchor", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) .rejectArray(); + input_display_list = [ ["Path", false], 0, 2, 1, 3, diff --git a/scripts/panel_function/panel_function.gml b/scripts/panel_function/panel_function.gml index 926c846ef..68eea5d5c 100644 --- a/scripts/panel_function/panel_function.gml +++ b/scripts/panel_function/panel_function.gml @@ -124,11 +124,11 @@ panelObjectInit(); //if(!directory_exists(DIRECTORY + "layouts")) - zip_unzip("data/layouts.zip", DIRECTORY); + zip_unzip("data/Layouts.zip", DIRECTORY); - var file = DIRECTORY + "layouts/" + PREF_MAP[? "panel_layout_file"] + ".json"; + var file = DIRECTORY + "Layouts/" + PREF_MAP[? "panel_layout_file"] + ".json"; if(!file_exists(file)) - file = DIRECTORY + "layouts/Horizontal.json"; + file = DIRECTORY + "Layouts/Horizontal.json"; loadPanel(file, PANEL_MAIN); PANEL_ANIMATION.updatePropertyList(); diff --git a/scripts/panel_menu/panel_menu.gml b/scripts/panel_menu/panel_menu.gml index 32d424bf5..08d6fe9e1 100644 --- a/scripts/panel_menu/panel_menu.gml +++ b/scripts/panel_menu/panel_menu.gml @@ -151,7 +151,7 @@ function Panel_Menu() : PanelContent() constructor { [ get_text("panel_menu_panels", "Panels"), [ menuItem(get_text("panel_menu_workspace", "Workspace"), function(_x, _y, _depth) { var arr = [], lays = []; - var f = file_find_first(DIRECTORY + "layouts/*", 0); + var f = file_find_first(DIRECTORY + "Layouts/*", 0); while(f != "") { array_push(lays, filename_name_only(f)); f = file_find_next(); @@ -162,7 +162,7 @@ function Panel_Menu() : PanelContent() constructor { dia.name = PREF_MAP[? "panel_layout_file"]; dia.onModify = function(name) { var cont = panelSerialize(); - json_save_struct(DIRECTORY + "layouts/" + name + ".json", cont); + json_save_struct(DIRECTORY + "Layouts/" + name + ".json", cont); }; })); array_push(arr, -1); diff --git a/scripts/panel_workspace/panel_workspace.gml b/scripts/panel_workspace/panel_workspace.gml index 5a1e49e00..5bf2d527d 100644 --- a/scripts/panel_workspace/panel_workspace.gml +++ b/scripts/panel_workspace/panel_workspace.gml @@ -13,7 +13,7 @@ function Panel_Workspace() : PanelContent() constructor { function refreshContent() { workspaces = []; - var f = file_find_first(DIRECTORY + "layouts/*", 0); + var f = file_find_first(DIRECTORY + "Layouts/*", 0); while(f != "") { array_push(workspaces, filename_name_only(f)); f = file_find_next(); @@ -56,7 +56,7 @@ function Panel_Workspace() : PanelContent() constructor { dia.name = PREF_MAP[? "panel_layout_file"]; dia.onModify = function(name) { var cont = panelSerialize(); - json_save_struct(DIRECTORY + "layouts/" + name + ".json", cont); + json_save_struct(DIRECTORY + "Layouts/" + name + ".json", cont); PREF_MAP[? "panel_layout_file"] = name; PREF_SAVE(); @@ -79,11 +79,11 @@ function Panel_Workspace() : PanelContent() constructor { }), menuItem("Replace with current", function() { var cont = panelSerialize(); - json_save_struct(DIRECTORY + "layouts/" + layout_selecting + ".json", cont); + json_save_struct(DIRECTORY + "Layouts/" + layout_selecting + ".json", cont); }), menuItem("Delete", function() { - file_delete(DIRECTORY + "layouts/" + layout_selecting + ".json"); + file_delete(DIRECTORY + "Layouts/" + layout_selecting + ".json"); refreshContent(); }, THEME.cross), ]);