diff --git a/README.md b/README.md index 5533d0d..d0b336a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # gdash - GML utility library -Version 1.3.0 +Version 2.0.0 ## Introduction @@ -30,7 +30,6 @@ Download [the latest release](https://github.com/twisterghost/gdash/releases) an * [_length](#_lengthcollection) * [_log](#_loganything) * [_map](#_mapcolletion-mapscript) -* [_object](#_object) * [_partial](#_partialscript-arg0-arg1--arg13) * [_push](#_pusharray-value) * [_reduce](#_reducecollection-reducerscript) @@ -350,23 +349,6 @@ _map(map, divideByTwo, ds_type_map); // => [3, 5] ``` -### `_object()` - -Returns a blank object - -To use this function, make an object resource called `_gdash_object` - -``` -@param {String} A category to set on this object as the `type` variable -@returns {Instance} A blank object instance - -@example -var data = _object('test'); -data.hello = 'world'; -show_debug_message(data.type); -// => prints "test" -``` - ### `_partial(script, arg0, arg1 ... arg13)` Creates a partial function identifier for use in place of raw scripts in gdash functions, or with the use of _run. diff --git a/src/gms2/gdash/gdash.yyp b/src/gms2/gdash/gdash.yyp new file mode 100644 index 0000000..07742e7 --- /dev/null +++ b/src/gms2/gdash/gdash.yyp @@ -0,0 +1,1618 @@ +{ + "id": "1deb1b6c-99dd-4081-b006-e64593d4164d", + "modelName": "GMProject", + "mvc": "1.0", + "IsDnDProject": false, + "configs": [ + + ], + "option_ecma": false, + "parentProject": { + "id": "dac5afb2-299a-46dd-b312-77e3903be84b", + "modelName": "GMProjectParent", + "mvc": "1.0", + "alteredResources": [ + { + "Key": "ed6a955d-5826-4f98-a450-10b414266c27", + "Value": { + "id": "bc5580c8-8c3f-4756-bd0b-f039cbce32f9", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + "inherited" + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "options\\main\\options_main.yy", + "resourceType": "GMMainOptions" + } + } + ], + "hiddenResources": [ + + ], + "projectPath": "${base_project}" + }, + "resources": [ + { + "Key": "2481bf08-af5f-487f-8ba3-de56222d643f", + "Value": { + "id": "27c40811-871d-4583-a38c-e66983224c01", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "views\\2481bf08-af5f-487f-8ba3-de56222d643f.yy", + "resourceType": "GMFolder" + } + }, + { + "Key": "3d4c1a45-cb51-440d-93f7-4508fb15da2d", + "Value": { + "id": "195cf21f-ed3c-4fe3-a9c5-a121f219cc5f", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "views\\3d4c1a45-cb51-440d-93f7-4508fb15da2d.yy", + "resourceType": "GMFolder" + } + }, + { + "Key": "06188c03-8a58-4be1-b30b-7286b73779ee", + "Value": { + "id": "e4915714-5458-4c7e-a5a7-9b085c3c3f74", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "views\\06188c03-8a58-4be1-b30b-7286b73779ee.yy", + "resourceType": "GMFolder" + } + }, + { + "Key": "aaa232fc-30a0-4c62-950f-a776d3fef239", + "Value": { + "id": "912b22b3-d063-468c-84f0-bcea945b8ecb", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "views\\aaa232fc-30a0-4c62-950f-a776d3fef239.yy", + "resourceType": "GMFolder" + } + }, + { + "Key": "ef1f07da-8677-4904-9251-8af85ce5ae10", + "Value": { + "id": "ba4abd2f-e870-47cf-8606-6e9cf9050a74", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "views\\ef1f07da-8677-4904-9251-8af85ce5ae10.yy", + "resourceType": "GMFolder" + } + }, + { + "Key": "c180f1aa-9fbf-4693-a798-00a3c87790d1", + "Value": { + "id": "2e882c8a-adab-4b7a-abd3-752a2a203442", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "views\\c180f1aa-9fbf-4693-a798-00a3c87790d1.yy", + "resourceType": "GMFolder" + } + }, + { + "Key": "ecfa581b-ebf3-43f2-b17d-cd091ea11541", + "Value": { + "id": "dfcdc556-f67e-4848-9bed-1a8107699484", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "views\\ecfa581b-ebf3-43f2-b17d-cd091ea11541.yy", + "resourceType": "GMFolder" + } + }, + { + "Key": "a4eea40d-a933-497b-b91f-7e386fa9a986", + "Value": { + "id": "8747f2f9-99db-43b1-9415-2774a01ae82c", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "views\\a4eea40d-a933-497b-b91f-7e386fa9a986.yy", + "resourceType": "GMFolder" + } + }, + { + "Key": "5f7a0fdf-5764-4afb-8e56-a4e70ee39bd9", + "Value": { + "id": "4d3015ef-17d0-47b2-bb27-4a9052a30a17", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "views\\5f7a0fdf-5764-4afb-8e56-a4e70ee39bd9.yy", + "resourceType": "GMFolder" + } + }, + { + "Key": "94736fe3-0d88-4094-9ad3-af09d1fd4782", + "Value": { + "id": "20f37f77-e4c9-4700-b5df-2690160381d9", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "views\\94736fe3-0d88-4094-9ad3-af09d1fd4782.yy", + "resourceType": "GMFolder" + } + }, + { + "Key": "3df7296c-6ac7-4b71-8f67-7202521cb283", + "Value": { + "id": "38021ce2-c44b-40b9-9a02-a3f0087ee4ab", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "views\\3df7296c-6ac7-4b71-8f67-7202521cb283.yy", + "resourceType": "GMFolder" + } + }, + { + "Key": "cfd80378-4324-4b7a-9b8d-fd071e4b1e80", + "Value": { + "id": "faaeb332-aebe-4207-aa3c-12076be0ba7a", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "views\\cfd80378-4324-4b7a-9b8d-fd071e4b1e80.yy", + "resourceType": "GMFolder" + } + }, + { + "Key": "47c9dcf3-db98-49b6-b391-9e8d4ad93ccb", + "Value": { + "id": "95f7581c-b0b8-4b37-9512-cea04fd905c4", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "views\\47c9dcf3-db98-49b6-b391-9e8d4ad93ccb.yy", + "resourceType": "GMFolder" + } + }, + { + "Key": "dc6060fd-690b-4fe2-8ac8-c86faf2e04c0", + "Value": { + "id": "ca8f5cd8-572b-4b3e-874b-7c9aa8d57e41", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "views\\dc6060fd-690b-4fe2-8ac8-c86faf2e04c0.yy", + "resourceType": "GMFolder" + } + }, + { + "Key": "2c55db64-9b48-4e9d-946e-d61128133698", + "Value": { + "id": "fea9b507-8df9-4f0a-9817-bf411c54e0b9", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "views\\2c55db64-9b48-4e9d-946e-d61128133698.yy", + "resourceType": "GMFolder" + } + }, + { + "Key": "411563b4-d20f-4313-8e25-baafa8501c71", + "Value": { + "id": "ef4f1f64-fd2d-4b62-b5e7-f568c437b5af", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "views\\411563b4-d20f-4313-8e25-baafa8501c71.yy", + "resourceType": "GMFolder" + } + }, + { + "Key": "a9188620-a624-4a5a-83ae-a1b53faf038b", + "Value": { + "id": "f0d3fbcb-18a3-435a-af70-2209b88fae59", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "options\\linux\\options_linux.yy", + "resourceType": "GMLinuxOptions" + } + }, + { + "Key": "cc98d028-7bdd-4680-85f3-c87a7baa481e", + "Value": { + "id": "7589c12e-e1c8-4c42-97ab-588e0c6230cc", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "options\\windows\\options_windows.yy", + "resourceType": "GMWindowsOptions" + } + }, + { + "Key": "f418569b-3bdd-4706-a0e4-364317f54032", + "Value": { + "id": "0c9b8ef0-4a75-4d37-89de-25cdd3d7a84b", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "options\\mac\\options_mac.yy", + "resourceType": "GMMacOptions" + } + }, + { + "Key": "6e0279a3-8932-432e-b399-b4c2f985b0c5", + "Value": { + "id": "fed56c61-7e22-4140-95ab-c2640ac98b03", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "notes\\notes.yy", + "resourceType": "GMNotes" + } + }, + { + "Key": "4b2720a1-e8f2-435e-b526-fecdfa79b961", + "Value": { + "id": "948601bf-6a23-4483-8736-d84865751576", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "views\\4b2720a1-e8f2-435e-b526-fecdfa79b961.yy", + "resourceType": "GMFolder" + } + }, + { + "Key": "e0fc46fa-4a3f-4dff-9f7c-bbbacf49757e", + "Value": { + "id": "fbaf4b10-186c-418c-915c-64ce52c9ba69", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\describe\\describe.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "dbf428c1-1e51-44a8-81d8-8099f5757ec1", + "Value": { + "id": "6420b858-ebf0-4b70-a02d-de6a5be2492c", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\test_suite_pass\\test_suite_pass.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "e811c9f1-b116-489f-940c-6e2575a6fc0b", + "Value": { + "id": "8c469354-7255-4663-9198-9aed75d29797", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\test_init\\test_init.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "37a9a856-63f6-44d9-91f7-ae3bda6f0d00", + "Value": { + "id": "3ceb5141-bdce-4d81-9680-c394d353cba9", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\create_assert_error\\create_assert_error.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "d6c7075b-43fa-455a-8242-42de8f43b800", + "Value": { + "id": "4b4ae749-aec9-4ff9-a89f-670510a37fc9", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\assert\\assert.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "42399293-59c8-4d21-9b4c-ebca4668426b", + "Value": { + "id": "569add6d-12b1-40af-ac35-5b0c4f287142", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\assert_not\\assert_not.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "0a73cea8-e08e-4ed5-b60e-dbf42d1ac111", + "Value": { + "id": "7e7b68e1-27ab-4927-8ac6-9d4225fa179a", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\test_fail\\test_fail.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "03e6bf78-c9fc-4f10-9549-7dc253ca0bfc", + "Value": { + "id": "d9ace085-5691-4ee7-bad7-84ed68d741cf", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "views\\03e6bf78-c9fc-4f10-9549-7dc253ca0bfc.yy", + "resourceType": "GMFolder" + } + }, + { + "Key": "71fc0e7e-ac29-4c46-920e-a07621c9158d", + "Value": { + "id": "ddf047e3-a5e8-4c54-8786-2e8411191a9b", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\__add\\__add.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "8ebd4763-7203-42aa-9554-cc55d03a802b", + "Value": { + "id": "289dd3dd-add6-4425-8649-212bde1a4cfb", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "views\\8ebd4763-7203-42aa-9554-cc55d03a802b.yy", + "resourceType": "GMFolder" + } + }, + { + "Key": "1ba92935-c21d-4159-91a1-0a778afcbcf6", + "Value": { + "id": "2c4005fd-e6dc-46fc-bd52-e523842dcf4d", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\_typeOf\\_typeOf.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "ba3e7b6b-21ed-494e-971b-cb1b202bd637", + "Value": { + "id": "b7d4c284-2ef9-4d36-aea3-7d214cd99165", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\test_end\\test_end.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "a406ae11-12ec-49cd-b1cc-45a333ccd935", + "Value": { + "id": "a1b17962-16d5-42e2-b0aa-3db3dd0e73a9", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\int_to_event\\int_to_event.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "6674cf91-7ea3-4e59-9ebf-1f0caf512692", + "Value": { + "id": "c5ae8e9e-36c7-43c4-b137-0f1535cd2495", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\__isEven\\__isEven.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "0901360a-a162-4c78-b640-eb7ae5bd87e1", + "Value": { + "id": "8c12ccd8-da7b-44ae-a3e6-f1431191f1a2", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\assert_does_not_exist\\assert_does_not_exist.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "cf6d1c85-7152-4e6c-9814-5b6fd0a19260", + "Value": { + "id": "9ae7d97d-6caa-457d-ada1-253124ff9950", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\_contains\\_contains.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "c9e911b4-e0a5-44b2-94f6-6a6dc9106a01", + "Value": { + "id": "176f0052-a768-4e9f-8b9d-78ce1ff2d83d", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\info\\info.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "a44c3458-a344-402c-8fd1-6eff64583bc8", + "Value": { + "id": "c7ee1655-c55c-48e2-80b6-f2278c462c7b", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\__double\\__double.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "78a96032-6d47-40a1-94e8-dcb78178a134", + "Value": { + "id": "52ff4490-1727-4bdb-8c98-9d003038855a", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\_isEqual\\_isEqual.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "a257ac2f-1258-4606-a6c6-a51a5aaf32b2", + "Value": { + "id": "c9270636-3f84-4274-b42d-eeca7aaccd27", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\test_next\\test_next.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "94e9b58c-1b5c-4e05-8348-05e1155444a6", + "Value": { + "id": "d80d6237-de09-472d-a210-508289f36ecd", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\_collect\\_collect.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "10eda2f5-f03f-4f57-83ee-c65c10d22dce", + "Value": { + "id": "199fd487-1647-487b-a6af-42c204d786da", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\_filter\\_filter.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "695b8b1b-7f66-473f-aeb5-5d9f1431c1a5", + "Value": { + "id": "2f977fbb-1f22-4e5b-a17d-ef869d00585a", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\_destroy\\_destroy.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "a4a5b8b5-6a80-4608-8d72-d363ee719bcd", + "Value": { + "id": "4f01cfd1-4e47-49d2-beed-5fbb5d748dc7", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\_concat\\_concat.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "477b2a17-84c8-4ddc-ba07-345ab325cd4f", + "Value": { + "id": "317bdf60-6906-48dc-9e8e-c686ba54642d", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\_reduce\\_reduce.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "b5cea827-b3fd-48e4-9686-ccb08fd5d898", + "Value": { + "id": "e4f9e436-4700-44f1-95b3-18bb29397b00", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\_partial\\_partial.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "13bccc1f-b0d5-4ec9-aed0-4ec8f6d5078e", + "Value": { + "id": "7cd9968f-ac3f-40b9-8368-79fdff8cdaa9", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\_run\\_run.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "0b6ab207-c224-4f47-915c-8286414f04b1", + "Value": { + "id": "96077ce3-cab4-45db-82e8-a990fce9ca75", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\assert_exists\\assert_exists.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "b37db980-06b5-44b7-b0b6-1dca01f04279", + "Value": { + "id": "6d733248-e247-4dda-a6c5-18de6d198806", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\_and\\_and.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "bd7bc958-28aa-43a9-8251-81041ca0b631", + "Value": { + "id": "c2b4db1d-e1a2-4656-aee4-caee5cb03e3a", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\_push\\_push.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "2e2daba8-4764-4076-8526-b2528785accc", + "Value": { + "id": "dd65cb39-3c63-4ec2-b8e1-2ec42f6932fa", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\__sum\\__sum.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "a6902058-42c5-4eb6-8658-c430cfa31c1a", + "Value": { + "id": "0150e35a-054c-4604-b480-d9db4ec72297", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\_arrayOf\\_arrayOf.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "ec3ab82c-0beb-45ba-97e5-236df32ca017", + "Value": { + "id": "5e5b1233-5a67-42f2-a49e-57583dee3580", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\_uniq\\_uniq.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "8d7b1a7b-dadd-486c-9b21-deffc695e159", + "Value": { + "id": "c373b590-5a94-4dfc-acc2-4ba48bbc4b57", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\_spread\\_spread.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "b340ab46-5d6e-4797-8b0c-07b65051d71d", + "Value": { + "id": "dfa41bb3-79a4-4f8b-96a3-9946fe02483f", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\_find\\_find.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "cfac0abc-4609-4eae-a2d7-af54980b51fd", + "Value": { + "id": "75ba1d87-ae76-4abc-bc1c-64b17f94a36c", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\_indexOf\\_indexOf.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "e873aad6-9ebf-4686-823d-72033eff542a", + "Value": { + "id": "745f28b2-741a-4e27-bc26-1e918935f7d3", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\_map\\_map.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "40753ca5-3efd-4c93-b4b8-ee4bd601c676", + "Value": { + "id": "62da183a-ac18-4671-9b8e-00bdc35e7461", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\_log\\_log.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "e80bc793-727b-4912-80cd-2a9381ae60e5", + "Value": { + "id": "33b49993-c784-4682-bd39-a77bbf90774f", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "rooms\\room0\\room0.yy", + "resourceType": "GMRoom" + } + }, + { + "Key": "19877baf-f9bd-4216-b356-45c2b3bf122e", + "Value": { + "id": "3139a5cd-18b1-49b6-a0da-9c030576b8ed", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\_free\\_free.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "acbe9db1-5a5b-4ce1-944c-58cf842a7935", + "Value": { + "id": "f699079d-0199-4e22-95e5-f7a831cd6d66", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\_get\\_get.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "69828e54-01dd-4a2a-b789-7e999d214dca", + "Value": { + "id": "05602e89-ea82-41c3-8993-54ec8e07249d", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\_join\\_join.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "6d5ae3be-c018-4481-abe0-66e69da4ed59", + "Value": { + "id": "067a4344-f4eb-49fc-9723-02decc23236c", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\macros\\macros.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "46c29120-6d6b-44ea-86b8-afacfb700cae", + "Value": { + "id": "5860c0a4-d0c5-4db5-8bb3-97ea8d0efda9", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\_set\\_set.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "024cd91c-bb54-4636-a223-6ba0a8f98e80", + "Value": { + "id": "e15462b7-c381-44e6-8e87-e7199f511333", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\_cloneArray\\_cloneArray.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "f008e78e-dd51-41d2-bb3d-95199a8e7c3c", + "Value": { + "id": "8baed4a1-7dcd-4018-bbe1-97c1fd3e57d7", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\_keys\\_keys.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "eeb441d7-af5e-4ceb-a389-32557c90856f", + "Value": { + "id": "8b14cba2-3714-4528-893c-401aa428b5ce", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\_times\\_times.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "a1387e7d-9ef7-458e-8194-e706a534715b", + "Value": { + "id": "a30e9847-2d4f-4776-a0db-e72c59f1a618", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\_split\\_split.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "73ab2ea6-b1dd-40ce-9fb0-1356bcff5f3e", + "Value": { + "id": "57763314-898c-43ef-adf9-254e124b5a8d", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\__greaterThanThree\\__greaterThanThree.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "dbd1ee41-adb8-45ec-b8bd-1098a1541bc0", + "Value": { + "id": "16c5c6c4-ab98-4560-aa03-b5efc7001e9b", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\_length\\_length.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "e03eb5fc-f39c-4961-9abd-4347303a7909", + "Value": { + "id": "b30e9352-56a5-455a-9be3-b31af0107220", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "views\\e03eb5fc-f39c-4961-9abd-4347303a7909.yy", + "resourceType": "GMFolder" + } + }, + { + "Key": "75161d65-d380-49da-b5bd-8506f3d3c411", + "Value": { + "id": "7b9f5f67-9872-4642-b59b-e31231909108", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "objects\\obj_gdash_test_1\\obj_gdash_test_1.yy", + "resourceType": "GMObject" + } + }, + { + "Key": "89db00f9-3361-426a-ba04-cae6a2664a3e", + "Value": { + "id": "42f9347f-734e-4663-9399-ae0d64e7405a", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "views\\89db00f9-3361-426a-ba04-cae6a2664a3e.yy", + "resourceType": "GMFolder" + } + }, + { + "Key": "505546f7-b585-45b1-b369-4161fccd19b6", + "Value": { + "id": "7d3a6038-5bfa-4847-b720-d1eb6bcfee29", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "views\\505546f7-b585-45b1-b369-4161fccd19b6.yy", + "resourceType": "GMFolder" + } + }, + { + "Key": "565a36f1-6705-454d-b56c-3f536baa2e0e", + "Value": { + "id": "9b5665a9-66f0-4aab-ae94-9e45b743f112", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\@instance_create\\instance_create.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "64593d4e-15ef-4f3d-8662-12fd73e7efe9", + "Value": { + "id": "43e6ec81-5d82-4592-8dab-79f2480f0dad", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "views\\64593d4e-15ef-4f3d-8662-12fd73e7efe9.yy", + "resourceType": "GMFolder" + } + }, + { + "Key": "bd2b952d-8cfc-4ace-9fb7-13e008ec8523", + "Value": { + "id": "1738ccf0-da42-472e-959a-fb12323b46f4", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\@object_get_depth\\object_get_depth.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "97727621-bd2b-4624-8c61-db3d2d9bf2dd", + "Value": { + "id": "4a2db394-04b2-4fe3-ae3c-8c770c58cec7", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "scripts\\__global_object_depths\\__global_object_depths.yy", + "resourceType": "GMScript" + } + }, + { + "Key": "35170da1-3c2d-439d-ae70-2fcf78b4ca36", + "Value": { + "id": "d7723e5f-705f-4a3e-b069-f0926b947b65", + "modelName": "GMResourceInfo", + "mvc": "1.0", + "configDeltaFiles": [ + + ], + "configDeltas": [ + + ], + "resourceCreationConfigs": [ + "default" + ], + "resourcePath": "notes\\compatibility_report_110117_90219219.yy", + "resourceType": "GMNotes" + } + } + ], + "room_order": [ + "e80bc793-727b-4912-80cd-2a9381ae60e5" + ], + "script_order": [ + "6d5ae3be-c018-4481-abe0-66e69da4ed59", + "565a36f1-6705-454d-b56c-3f536baa2e0e", + "bd2b952d-8cfc-4ace-9fb7-13e008ec8523", + "97727621-bd2b-4624-8c61-db3d2d9bf2dd", + "d6c7075b-43fa-455a-8242-42de8f43b800", + "0901360a-a162-4c78-b640-eb7ae5bd87e1", + "0b6ab207-c224-4f47-915c-8286414f04b1", + "42399293-59c8-4d21-9b4c-ebca4668426b", + "37a9a856-63f6-44d9-91f7-ae3bda6f0d00", + "e0fc46fa-4a3f-4dff-9f7c-bbbacf49757e", + "c9e911b4-e0a5-44b2-94f6-6a6dc9106a01", + "a406ae11-12ec-49cd-b1cc-45a333ccd935", + "ba3e7b6b-21ed-494e-971b-cb1b202bd637", + "0a73cea8-e08e-4ed5-b60e-dbf42d1ac111", + "e811c9f1-b116-489f-940c-6e2575a6fc0b", + "a257ac2f-1258-4606-a6c6-a51a5aaf32b2", + "dbf428c1-1e51-44a8-81d8-8099f5757ec1", + "a44c3458-a344-402c-8fd1-6eff64583bc8", + "71fc0e7e-ac29-4c46-920e-a07621c9158d", + "2e2daba8-4764-4076-8526-b2528785accc", + "73ab2ea6-b1dd-40ce-9fb0-1356bcff5f3e", + "6674cf91-7ea3-4e59-9ebf-1f0caf512692", + "cf6d1c85-7152-4e6c-9814-5b6fd0a19260", + "1ba92935-c21d-4159-91a1-0a778afcbcf6", + "78a96032-6d47-40a1-94e8-dcb78178a134", + "477b2a17-84c8-4ddc-ba07-345ab325cd4f", + "eeb441d7-af5e-4ceb-a389-32557c90856f", + "94e9b58c-1b5c-4e05-8348-05e1155444a6", + "10eda2f5-f03f-4f57-83ee-c65c10d22dce", + "a4a5b8b5-6a80-4608-8d72-d363ee719bcd", + "695b8b1b-7f66-473f-aeb5-5d9f1431c1a5", + "b5cea827-b3fd-48e4-9686-ccb08fd5d898", + "a6902058-42c5-4eb6-8658-c430cfa31c1a", + "13bccc1f-b0d5-4ec9-aed0-4ec8f6d5078e", + "bd7bc958-28aa-43a9-8251-81041ca0b631", + "e873aad6-9ebf-4686-823d-72033eff542a", + "ec3ab82c-0beb-45ba-97e5-236df32ca017", + "b37db980-06b5-44b7-b0b6-1dca01f04279", + "b340ab46-5d6e-4797-8b0c-07b65051d71d", + "f008e78e-dd51-41d2-bb3d-95199a8e7c3c", + "19877baf-f9bd-4216-b356-45c2b3bf122e", + "8d7b1a7b-dadd-486c-9b21-deffc695e159", + "dbd1ee41-adb8-45ec-b8bd-1098a1541bc0", + "acbe9db1-5a5b-4ce1-944c-58cf842a7935", + "46c29120-6d6b-44ea-86b8-afacfb700cae", + "40753ca5-3efd-4c93-b4b8-ee4bd601c676", + "cfac0abc-4609-4eae-a2d7-af54980b51fd", + "a1387e7d-9ef7-458e-8194-e706a534715b", + "69828e54-01dd-4a2a-b789-7e999d214dca", + "024cd91c-bb54-4636-a223-6ba0a8f98e80" + ], + "tutorial": "" +} \ No newline at end of file diff --git a/src/gms2/gdash/notes/compatibility_report_110117_90219219.txt b/src/gms2/gdash/notes/compatibility_report_110117_90219219.txt new file mode 100644 index 0000000..c60fb65 --- /dev/null +++ b/src/gms2/gdash/notes/compatibility_report_110117_90219219.txt @@ -0,0 +1,82 @@ +Converting GML script : ${project_dir}\scripts\assert_not\assert_not.gml +Converted string : line 15 : " shouldn't be true" -> " shouldn\'t be true" +Converted string : line 19 : " shouldn't be " -> " shouldn\'t be " + +Converting GML script : ${project_dir}\scripts\_partial\_partial.gml +Converted string : line 32 : 'function' -> "function" +Converted string : line 33 : 'args' -> "args" +Converted string : line 34 : 'partial' -> "partial" +Converted string : line 34 : 'partial' -> "partial" + +Converting GML script : ${project_dir}\scripts\_run\_run.gml +Converted string : line 24 : 'partial' -> "partial" +Converted string : line 24 : 'partial' -> "partial" +Converted string : line 26 : 'function' -> "function" +Converted string : line 27 : 'args' -> "args" + +Converting GML script : ${project_dir}\scripts\_get\_get.gml +Converted string : line 18 : '.' -> "." + +macOS icon ${options_dir}\mac\icons\icon512.png written out as 32-bit. +Converting GML script : ${project_dir}\scripts\_set\_set.gml +Converted string : line 21 : '.' -> "." + +Converting GML script : ${project_dir}\objects\obj_gdash_test_1\Other_21.gml +Converted string : line 2 : '_indexOf' -> "_indexOf" +Converted string : line 2 : 'Returns the index of a value in a collection' -> "Returns the index of a value in a collection" + +Converting GML script : ${project_dir}\objects\obj_gdash_test_1\Other_20.gml +Converted string : line 2 : '_concat' -> "_concat" +Converted string : line 2 : 'Appends one array to another' -> "Appends one array to another" + +Converting GML script : ${project_dir}\objects\obj_gdash_test_1\Other_19.gml +Converted string : line 2 : '_filter' -> "_filter" +Converted string : line 2 : 'returns an array with elements removed when they are falsey in the function' -> "returns an array with elements removed when they are falsey in the function" + +Converting GML script : ${project_dir}\objects\obj_gdash_test_1\Other_18.gml +Converted string : line 2 : '_find' -> "_find" +Converted string : line 2 : 'returns the first element in an array that is truthy in the function' -> "returns the first element in an array that is truthy in the function" + +Converting GML script : ${project_dir}\objects\obj_gdash_test_1\Other_13.gml +Converted string : line 5 : '1' -> "1" +Converted string : line 6 : '2' -> "2" +Converted string : line 7 : '3' -> "3" +Converted string : line 8 : '4' -> "4" +Converted string : line 9 : '5' -> "5" + +Converting GML script : ${project_dir}\objects\obj_gdash_test_1\Other_12.gml +Converted string : line 5 : 'one' -> "one" +Converted string : line 5 : 'hello' -> "hello" +Converted string : line 6 : 'two' -> "two" +Converted string : line 6 : 'hello' -> "hello" +Converted string : line 7 : 'three' -> "three" +Converted string : line 7 : 'hello' -> "hello" +Converted string : line 8 : 'four' -> "four" +Converted string : line 8 : 'hello' -> "hello" +Converted string : line 9 : 'five' -> "five" +Converted string : line 9 : 'hello' -> "hello" +Converted string : line 14 : 'one' -> "one" +Converted string : line 15 : 'two' -> "two" +Converted string : line 16 : 'three' -> "three" +Converted string : line 17 : 'four' -> "four" +Converted string : line 18 : 'five' -> "five" + +Converting GML script : ${project_dir}\objects\obj_gdash_test_1\Other_11.gml +Converted string : line 5 : 'hello' -> "hello" +Converted string : line 5 : 'ello' -> "ello" +Converted string : line 6 : 'hello' -> "hello" +Converted string : line 6 : 'goodbye' -> "goodbye" +Converted string : line 11 : 'hello' -> "hello" +Converted string : line 12 : 'goodbye' -> "goodbye" +Converted string : line 15 : 'hello' -> "hello" +Converted string : line 16 : 'goodbye' -> "goodbye" +Converted string : line 17 : 'world' -> "world" +Converted string : line 22 : 'hello' -> "hello" +Converted string : line 22 : 'world' -> "world" +Converted string : line 23 : 'number' -> "number" +Converted string : line 25 : 'world' -> "world" + +game speed set to 30 +added compatibility script instance/instance_create.gml +added compatibility script object/object_get_depth.gml +added compatibility script __global_object_depths.gml \ No newline at end of file diff --git a/src/gms2/gdash/notes/compatibility_report_110117_90219219.yy b/src/gms2/gdash/notes/compatibility_report_110117_90219219.yy new file mode 100644 index 0000000..6251ef3 --- /dev/null +++ b/src/gms2/gdash/notes/compatibility_report_110117_90219219.yy @@ -0,0 +1,6 @@ +{ + "id": "35170da1-3c2d-439d-ae70-2fcf78b4ca36", + "modelName": "GMNotes", + "mvc": "1.0", + "name": "compatibility_report_110117_90219219" +} \ No newline at end of file diff --git a/src/gms2/gdash/notes/notes.txt b/src/gms2/gdash/notes/notes.txt new file mode 100644 index 0000000..203bb54 Binary files /dev/null and b/src/gms2/gdash/notes/notes.txt differ diff --git a/src/gms2/gdash/notes/notes.yy b/src/gms2/gdash/notes/notes.yy new file mode 100644 index 0000000..fb80f23 --- /dev/null +++ b/src/gms2/gdash/notes/notes.yy @@ -0,0 +1,6 @@ +{ + "id": "6e0279a3-8932-432e-b399-b4c2f985b0c5", + "modelName": "GMNotes", + "mvc": "1.0", + "name": "notes" +} \ No newline at end of file diff --git a/src/gms2/gdash/objects/obj_gdash_test_1/Create_0.gml b/src/gms2/gdash/objects/obj_gdash_test_1/Create_0.gml new file mode 100644 index 0000000..b13f80a --- /dev/null +++ b/src/gms2/gdash/objects/obj_gdash_test_1/Create_0.gml @@ -0,0 +1,10 @@ +/// Test descrption +/* + * This test ensures that gdash is working properly + */ + +test_init("gdash"); +test_next(); + +/* */ +/* */ diff --git a/src/gms2/gdash/objects/obj_gdash_test_1/Other_10.gml b/src/gms2/gdash/objects/obj_gdash_test_1/Other_10.gml new file mode 100644 index 0000000..0873794 --- /dev/null +++ b/src/gms2/gdash/objects/obj_gdash_test_1/Other_10.gml @@ -0,0 +1,9 @@ +/// _typeOf +describe("_typeOf", "Should return the type of any known data type"); + +assert(_typeOf(100), "real"); +assert(_typeOf("hello"), "string"); +assert(_typeOf(undefined), "undefined"); + +test_end(); + diff --git a/src/gms2/gdash/objects/obj_gdash_test_1/Other_11.gml b/src/gms2/gdash/objects/obj_gdash_test_1/Other_11.gml new file mode 100644 index 0000000..e6e235d --- /dev/null +++ b/src/gms2/gdash/objects/obj_gdash_test_1/Other_11.gml @@ -0,0 +1,28 @@ +/// _contains +describe("_contains", "Should determine if arbitrary things contain targets"); + +// String contains string +assert(_contains("hello", "ello"), true); +assert_not(_contains("hello", "goodbye"), true); + +// Array contains +var arr; +arr[0] = 1; +arr[1] = "hello"; +arr[2] = "goodbye"; + +assert(_contains(arr, 1), true); +assert(_contains(arr, "hello"), true); +assert(_contains(arr, "goodbye"), true); +assert_not(_contains(arr, "world"), true); +assert_not(_contains(arr, 2), true); + +// ds_map contains +var map = ds_map_create(); +ds_map_add(map, "hello", "world"); +ds_map_add(map, "number", 2); + +assert(_contains(map, "world"), true); +assert(_contains(map, 2), true); +ds_map_destroy(map); +test_end(); diff --git a/src/gms2/gdash/objects/obj_gdash_test_1/Other_12.gml b/src/gms2/gdash/objects/obj_gdash_test_1/Other_12.gml new file mode 100644 index 0000000..1f89025 --- /dev/null +++ b/src/gms2/gdash/objects/obj_gdash_test_1/Other_12.gml @@ -0,0 +1,22 @@ +/// _keys +describe("_keys", "Returns an array of all keys in a map"); + +var map = ds_map_create(); +ds_map_add(map, "one", "hello"); +ds_map_add(map, "two", "hello"); +ds_map_add(map, "three", "hello"); +ds_map_add(map, "four", "hello"); +ds_map_add(map, "five", "hello"); + +var keys = _keys(map); + +assert(_length(keys), 5); +assert(_contains(keys, "one")); +assert(_contains(keys, "two")); +assert(_contains(keys, "three")); +assert(_contains(keys, "four")); +assert(_contains(keys, "five")); + +ds_map_destroy(map); +test_end(); + diff --git a/src/gms2/gdash/objects/obj_gdash_test_1/Other_13.gml b/src/gms2/gdash/objects/obj_gdash_test_1/Other_13.gml new file mode 100644 index 0000000..2c67ae0 --- /dev/null +++ b/src/gms2/gdash/objects/obj_gdash_test_1/Other_13.gml @@ -0,0 +1,53 @@ +/// _map +describe("_map", "Iterates over a collection, calling a function"); + +var map = ds_map_create(); +ds_map_add(map, "1", 1); +ds_map_add(map, "2", 2); +ds_map_add(map, "3", 3); +ds_map_add(map, "4", 4); +ds_map_add(map, "5", 5); + +var list = ds_list_create(); +ds_list_add(list, 1, 2, 3, 4, 5); +ds_list_sort(list, true); + +var arr; +arr[0] = 1; +arr[1] = 2; +arr[2] = 3; +arr[3] = 4; +arr[4] = 5; + +var mapRes = _map(map, __double, ds_type_map); +var listRes = _map(list, __double, ds_type_list); +var arrRes = _map(arr, __double); + +var addTwo = _partial(__add, 2); +var arrRes2 = _map(arr, addTwo); + +assert(arrRes2[0], 3); + +assert(_length(mapRes), 5); +assert(_contains(mapRes, 2)); +assert(_contains(mapRes, 4)); +assert(_contains(mapRes, 6)); +assert(_contains(mapRes, 8)); +assert(_contains(mapRes, 10)); + +assert(_length(listRes), 5); +assert(listRes[0], 2); +assert(listRes[1], 4); +assert(listRes[2], 6); +assert(listRes[3], 8); +assert(listRes[4], 10); + +assert(_length(arrRes), 5); +assert(arrRes[0], 2); +assert(arrRes[1], 4); +assert(arrRes[2], 6); +assert(arrRes[3], 8); +assert(arrRes[4], 10); + +test_end(); + diff --git a/src/gms2/gdash/objects/obj_gdash_test_1/Other_14.gml b/src/gms2/gdash/objects/obj_gdash_test_1/Other_14.gml new file mode 100644 index 0000000..0fd24b4 --- /dev/null +++ b/src/gms2/gdash/objects/obj_gdash_test_1/Other_14.gml @@ -0,0 +1,14 @@ +/// _reduce +describe("_reduce", "Iterates over an array, calling a function, returning the overall result"); + +var arr; +arr[0] = 1; +arr[1] = 2; +arr[2] = 3; +arr[3] = 4; +arr[4] = 5; + +assert(_reduce(arr, __sum), 15); + +test_end(); + diff --git a/src/gms2/gdash/objects/obj_gdash_test_1/Other_15.gml b/src/gms2/gdash/objects/obj_gdash_test_1/Other_15.gml new file mode 100644 index 0000000..e3a7518 --- /dev/null +++ b/src/gms2/gdash/objects/obj_gdash_test_1/Other_15.gml @@ -0,0 +1,54 @@ +/// _isEqual +describe("_isEqual", "Determines if two values are equal"); + +assert(_isEqual(1, 1)); +assert(_isEqual("hello", "hello")); +assert_not(_isEqual(1, 2)); +assert_not(_isEqual("hello", "world")); + +var map = ds_map_create(); +ds_map_add(map, "test", 1); +ds_map_add(map, "test2", "hello"); + +var map2 = ds_map_create(); +ds_map_add(map2, "test", 1); +ds_map_add(map2, "test2", "hello"); + +var map3 = ds_map_create(); +ds_map_add(map3, "test", 2); +ds_map_add(map3, "test2", "hello"); + +var map4 = ds_map_create(); +ds_map_add(map4, "test", 2); + +assert(_isEqual(map, map2, ds_type_map)); +assert_not(_isEqual(map, map3, ds_type_map)); +assert_not(_isEqual(map, map4, ds_type_map)); + +var arr1 = _arrayOf(0, 1, 2, 3, 4); +var arr2 = _arrayOf(0, 1, 2, 3, 4); +var arr3 = _arrayOf(0, 1, 2, 3, 5); +var arr4 = _arrayOf(0, 1, 2, 3); + +assert(_isEqual(arr1, arr2)); +assert_not(_isEqual(arr1, arr3)); +assert_not(_isEqual(arr1, arr4)); + +var list1 = ds_list_create(); +ds_list_add(list1, 1, 2, 3, "hello"); + +var list2 = ds_list_create(); +ds_list_add(list2, 1, 2, 3, "hello"); + +var list3 = ds_list_create(); +ds_list_add(list3, 1, 2, 3, "goodbye"); + +var list4 = ds_list_create(); +ds_list_add(list4, 2, 3, "hello"); + +assert(_isEqual(list1, list2, ds_type_list)); +assert_not(_isEqual(list1, list3, ds_type_list)); +assert_not(_isEqual(list1, list4, ds_type_list)); + +test_end(); + diff --git a/src/gms2/gdash/objects/obj_gdash_test_1/Other_16.gml b/src/gms2/gdash/objects/obj_gdash_test_1/Other_16.gml new file mode 100644 index 0000000..55abfb1 --- /dev/null +++ b/src/gms2/gdash/objects/obj_gdash_test_1/Other_16.gml @@ -0,0 +1,10 @@ +/// _uniq +describe("_uniq", "Removes duplicate values from an array"); + +var duped = _arrayOf(1, 1, 2, 2, "hello", "hello", 3); +var unique = _arrayOf(1, 2, "hello", 3); + +assert(_isEqual(_uniq(duped), unique)); + +test_end(); + diff --git a/src/gms2/gdash/objects/obj_gdash_test_1/Other_17.gml b/src/gms2/gdash/objects/obj_gdash_test_1/Other_17.gml new file mode 100644 index 0000000..d36b5dd --- /dev/null +++ b/src/gms2/gdash/objects/obj_gdash_test_1/Other_17.gml @@ -0,0 +1,12 @@ +/// _push +describe("_push", "Adds an element to an array"); + +var arr = _arrayOf(0, 1, 2); +assert(_length(arr), 3); + +arr = _push(arr, 3); +assert(_length(arr), 4); +assert(arr[3], 3); + +test_end(); + diff --git a/src/gms2/gdash/objects/obj_gdash_test_1/Other_18.gml b/src/gms2/gdash/objects/obj_gdash_test_1/Other_18.gml new file mode 100644 index 0000000..7abcf63 --- /dev/null +++ b/src/gms2/gdash/objects/obj_gdash_test_1/Other_18.gml @@ -0,0 +1,10 @@ +/// _find +describe("_find", "returns the first element in an array that is truthy in the function"); + +var arr = _arrayOf(0, 1, 2, 3, 40, 5); +var res = _find(arr, __greaterThanThree); + +assert(res, 40); + +test_end(); + diff --git a/src/gms2/gdash/objects/obj_gdash_test_1/Other_19.gml b/src/gms2/gdash/objects/obj_gdash_test_1/Other_19.gml new file mode 100644 index 0000000..e76aca0 --- /dev/null +++ b/src/gms2/gdash/objects/obj_gdash_test_1/Other_19.gml @@ -0,0 +1,18 @@ +/// _filter +describe("_filter", "returns an array with elements removed when they are falsey in the function"); + +var arr = _arrayOf(0, 1, 2, 3, 4, 5, 6); + +var res = _filter(arr, __isEven); + +assert(_contains(res, 0)); +assert(_contains(res, 2)); +assert(_contains(res, 4)); +assert(_contains(res, 6)); + +assert_not(_contains(res, 1)); +assert_not(_contains(res, 3)); +assert_not(_contains(res, 5)); + +test_end(); + diff --git a/src/gms2/gdash/objects/obj_gdash_test_1/Other_20.gml b/src/gms2/gdash/objects/obj_gdash_test_1/Other_20.gml new file mode 100644 index 0000000..7def97c --- /dev/null +++ b/src/gms2/gdash/objects/obj_gdash_test_1/Other_20.gml @@ -0,0 +1,18 @@ +/// _concat +describe("_concat", "Appends one array to another"); + +var arr1 = _arrayOf(0, 1, 2); +var arr2 = _arrayOf(30, 40, 50); + +var res = _concat(arr1, arr2); + +assert(_length(res), 6); + +assert(res[0], 0); +assert(res[1], 1); +assert(res[2], 2); +assert(res[3], 30); +assert(res[4], 40); +assert(res[5], 50); +test_end(); + diff --git a/src/gms2/gdash/objects/obj_gdash_test_1/Other_21.gml b/src/gms2/gdash/objects/obj_gdash_test_1/Other_21.gml new file mode 100644 index 0000000..8114061 --- /dev/null +++ b/src/gms2/gdash/objects/obj_gdash_test_1/Other_21.gml @@ -0,0 +1,18 @@ +/// _indexOf +describe("_indexOf", "Returns the index of a value in a collection"); + +var arr = _arrayOf(1, 2, 3, 4); +var list = ds_list_create(); +list[| 0] = 1; +list[| 1] = 2; +list[| 2] = 3; +list[| 3] = 4; + +assert(_indexOf(arr, 2), 1); +assert(_indexOf(arr, 3), 2); +assert(_indexOf(arr, 6), -1); +assert(_indexOf(list, 2), 1); +assert(_indexOf(list, 100), -1); + +test_end(); + diff --git a/src/gms2/gdash/objects/obj_gdash_test_1/Other_22.gml b/src/gms2/gdash/objects/obj_gdash_test_1/Other_22.gml new file mode 100644 index 0000000..65eba57 --- /dev/null +++ b/src/gms2/gdash/objects/obj_gdash_test_1/Other_22.gml @@ -0,0 +1,11 @@ +/// _set +describe("_set", "Sets a value safely in a deeply nested map"); + +var map = ds_map_create(); +_set(map, "hello.world", 2); + +var hello = map[? "hello"]; +assert(hello[? "world"], 2); + +test_end(); + diff --git a/src/gms2/gdash/objects/obj_gdash_test_1/Other_23.gml b/src/gms2/gdash/objects/obj_gdash_test_1/Other_23.gml new file mode 100644 index 0000000..5f40d0b --- /dev/null +++ b/src/gms2/gdash/objects/obj_gdash_test_1/Other_23.gml @@ -0,0 +1,12 @@ +/// _get +describe("_get", "Retrieves a deeply nested map value"); + +var map = ds_map_create(); +map[? "hello"] = ds_map_create(); +var hello = map[? "hello"]; +hello[? "world"] = 2; + +assert(_get(map, "hello.world"), 2); + +test_end(); + diff --git a/src/gms2/gdash/objects/obj_gdash_test_1/Other_24.gml b/src/gms2/gdash/objects/obj_gdash_test_1/Other_24.gml new file mode 100644 index 0000000..466d172 --- /dev/null +++ b/src/gms2/gdash/objects/obj_gdash_test_1/Other_24.gml @@ -0,0 +1,13 @@ +/// _cloneArray +describe("_cloneArray", "Returns a clone of the given array"); + +var arr = _arrayOf(2, 1, 5, 4, 6); +var cloned = _cloneArray(arr); + +for (var i = 0; i < array_length_1d(arr); i++) { + assert(cloned[i], arr[i]); +} + +test_end(); +game_end(); + diff --git a/src/gms2/gdash/objects/obj_gdash_test_1/obj_gdash_test_1.yy b/src/gms2/gdash/objects/obj_gdash_test_1/obj_gdash_test_1.yy new file mode 100644 index 0000000..863e7e1 --- /dev/null +++ b/src/gms2/gdash/objects/obj_gdash_test_1/obj_gdash_test_1.yy @@ -0,0 +1,188 @@ +{ + "id": "75161d65-d380-49da-b5bd-8506f3d3c411", + "modelName": "GMObject", + "mvc": "1.0", + "name": "obj_gdash_test_1", + "eventList": [ + { + "id": "8632fd84-1520-469f-b3d7-5e4bbbd99107", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 0, + "m_owner": "75161d65-d380-49da-b5bd-8506f3d3c411" + }, + { + "id": "0e173cd1-bd1f-4176-96e0-ddf6dfe91f6d", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 24, + "eventtype": 7, + "m_owner": "75161d65-d380-49da-b5bd-8506f3d3c411" + }, + { + "id": "b30a31c2-4daa-46ab-8faa-8c37ac839dd0", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 23, + "eventtype": 7, + "m_owner": "75161d65-d380-49da-b5bd-8506f3d3c411" + }, + { + "id": "426670be-3809-4dad-ad89-8c8fca128eea", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 22, + "eventtype": 7, + "m_owner": "75161d65-d380-49da-b5bd-8506f3d3c411" + }, + { + "id": "4b6a4f6e-96d2-4522-b9d6-8072ae6af6bb", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 21, + "eventtype": 7, + "m_owner": "75161d65-d380-49da-b5bd-8506f3d3c411" + }, + { + "id": "cb8a198d-3889-41fc-a82f-a8e7774b34d6", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 20, + "eventtype": 7, + "m_owner": "75161d65-d380-49da-b5bd-8506f3d3c411" + }, + { + "id": "29aa07a0-69e1-40a1-bbe9-b782ff439288", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 19, + "eventtype": 7, + "m_owner": "75161d65-d380-49da-b5bd-8506f3d3c411" + }, + { + "id": "6026159a-f235-49c1-a8fb-58cb2305f2ef", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 18, + "eventtype": 7, + "m_owner": "75161d65-d380-49da-b5bd-8506f3d3c411" + }, + { + "id": "e6475fab-3d97-437c-a367-823f1d7dfccd", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 17, + "eventtype": 7, + "m_owner": "75161d65-d380-49da-b5bd-8506f3d3c411" + }, + { + "id": "5d7407e8-e0dc-458c-96e4-f726d9549d32", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 16, + "eventtype": 7, + "m_owner": "75161d65-d380-49da-b5bd-8506f3d3c411" + }, + { + "id": "f541725a-6a06-462e-a000-f4a216d8f4c7", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 15, + "eventtype": 7, + "m_owner": "75161d65-d380-49da-b5bd-8506f3d3c411" + }, + { + "id": "66f9d326-42e4-41a0-a276-857b5334c6fe", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 14, + "eventtype": 7, + "m_owner": "75161d65-d380-49da-b5bd-8506f3d3c411" + }, + { + "id": "aa5184e7-73fa-482f-9422-96502118b36d", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 13, + "eventtype": 7, + "m_owner": "75161d65-d380-49da-b5bd-8506f3d3c411" + }, + { + "id": "867f03f7-8373-4177-8376-901dd266e3b8", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 12, + "eventtype": 7, + "m_owner": "75161d65-d380-49da-b5bd-8506f3d3c411" + }, + { + "id": "0eea83dd-9ee0-413c-881e-64e5a8d431b4", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 11, + "eventtype": 7, + "m_owner": "75161d65-d380-49da-b5bd-8506f3d3c411" + }, + { + "id": "924cd2f3-49bc-4d59-93e2-1139b0cf33cb", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 10, + "eventtype": 7, + "m_owner": "75161d65-d380-49da-b5bd-8506f3d3c411" + } + ], + "maskSpriteId": "00000000-0000-0000-0000-000000000000", + "parentObjectId": "00000000-0000-0000-0000-000000000000", + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 0, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 0, + "physicsShapePoints": [ + + ], + "physicsStartAwake": true, + "solid": false, + "spriteId": "00000000-0000-0000-0000-000000000000", + "visible": true +} \ No newline at end of file diff --git a/src/gms2/gdash/options/linux/options_linux.yy b/src/gms2/gdash/options/linux/options_linux.yy new file mode 100644 index 0000000..06513b8 --- /dev/null +++ b/src/gms2/gdash/options/linux/options_linux.yy @@ -0,0 +1,28 @@ +{ + "id": "a9188620-a624-4a5a-83ae-a1b53faf038b", + "modelName": "GMLinuxOptions", + "mvc": "1.0", + "name": "Linux", + "option_linux_allow_fullscreen": true, + "option_linux_display_name": "gdash", + "option_linux_display_splash": false, + "option_linux_enable_steam": false, + "option_linux_homepage": "http:\/\/www.gdash.com", + "option_linux_icon": "${base_options_dir}\\linux\\icons\\64.png", + "option_linux_interpolate_pixels": false, + "option_linux_long_desc": "gdash", + "option_linux_maintainer_email": "", + "option_linux_resize_window": false, + "option_linux_scale": 0, + "option_linux_short_desc": "gdash", + "option_linux_splash_screen": "${base_options_dir}\\linux\\splash\\splash.png", + "option_linux_start_fullscreen": false, + "option_linux_sync": false, + "option_linux_texture_page": "2048x2048", + "option_linux_version": { + "build": 0, + "major": 1, + "minor": 0, + "revision": 0 + } +} \ No newline at end of file diff --git a/src/gms2/gdash/options/mac/icon512.png b/src/gms2/gdash/options/mac/icon512.png new file mode 100644 index 0000000..e528625 Binary files /dev/null and b/src/gms2/gdash/options/mac/icon512.png differ diff --git a/src/gms2/gdash/options/mac/icons/icon512.png b/src/gms2/gdash/options/mac/icons/icon512.png new file mode 100644 index 0000000..2646edb Binary files /dev/null and b/src/gms2/gdash/options/mac/icons/icon512.png differ diff --git a/src/gms2/gdash/options/mac/options_mac.yy b/src/gms2/gdash/options/mac/options_mac.yy new file mode 100644 index 0000000..31beeb8 --- /dev/null +++ b/src/gms2/gdash/options/mac/options_mac.yy @@ -0,0 +1,34 @@ +{ + "id": "f418569b-3bdd-4706-a0e4-364317f54032", + "modelName": "GMMacOptions", + "mvc": "1.0", + "name": "macOS", + "option_mac_allow_fullscreen": true, + "option_mac_allow_incoming_network": false, + "option_mac_allow_outgoing_network": false, + "option_mac_app_category": "", + "option_mac_app_id": "", + "option_mac_build_app_store": true, + "option_mac_copyright": "(c)2012 CompanyName Ltd...", + "option_mac_display_cursor": true, + "option_mac_display_name": "gdash", + "option_mac_enable_steam": false, + "option_mac_icon_png": "${options_dir}\\mac\\icons\\icon512.png", + "option_mac_interpolate_pixels": false, + "option_mac_menu_dock": false, + "option_mac_output_dir": "~\/GameMaker-Studio\/gdash", + "option_mac_resize_window": false, + "option_mac_scale": 0, + "option_mac_signing_identity": "Developer ID Application:", + "option_mac_splash_png": "${options_dir}\\mac\\splash\\splash.png", + "option_mac_start_fullscreen": false, + "option_mac_team_id": null, + "option_mac_texture_page": "2048x2048", + "option_mac_version": { + "build": 0, + "major": 1, + "minor": 0, + "revision": 0 + }, + "option_mac_vsync": false +} \ No newline at end of file diff --git a/src/gms2/gdash/options/mac/splash.png b/src/gms2/gdash/options/mac/splash.png new file mode 100644 index 0000000..8ebb8ca Binary files /dev/null and b/src/gms2/gdash/options/mac/splash.png differ diff --git a/src/gms2/gdash/options/mac/splash/splash.png b/src/gms2/gdash/options/mac/splash/splash.png new file mode 100644 index 0000000..8ebb8ca Binary files /dev/null and b/src/gms2/gdash/options/mac/splash/splash.png differ diff --git a/src/gms2/gdash/options/main/inherited/options_main.inherited.yy b/src/gms2/gdash/options/main/inherited/options_main.inherited.yy new file mode 100644 index 0000000..e09388e --- /dev/null +++ b/src/gms2/gdash/options/main/inherited/options_main.inherited.yy @@ -0,0 +1,7 @@ +1.0.0â†ed6a955d-5826-4f98-a450-10b414266c27â†ed6a955d-5826-4f98-a450-10b414266c27|{ + "option_gameguid": "{3EF251CB-D808-4812-825B-C05EBDC6FE1B}", + "option_steam_app_id": "0" +}â†1225f6b0-ac20-43bd-a82e-be73fa0b6f4f|{ + "autocrop": false, + "scaled": false +} \ No newline at end of file diff --git a/src/gms2/gdash/options/windows/License.txt b/src/gms2/gdash/options/windows/License.txt new file mode 100644 index 0000000..1842321 --- /dev/null +++ b/src/gms2/gdash/options/windows/License.txt @@ -0,0 +1,42 @@ +This Application was made using GameMaker. GameMaker is the intellectual property of YoYo Games Ltd, a company of the United Kingdom. + +THIS END USER LICENSE AGREEMENT APPLIES TO ALL USE OF THIS APPLICATION. + +Scope +----- +You may: + +Install and use this Application for personal, or commercial use [provided you have paid any license fee, if this applies]; + +You must not: + +use, copy, transfer, distribute modify, adapt, merge, translate, decompile, disassemble, or reverse engineer the Application or part of it except as expressly permitted by this Licence; +remove, modify, or tamper with any copyright, trademark or other notice; +use the Application for any illegal, unlawful or immoral purposes. + + +Term +---- +This License will end automatically if you breach any of the terms. +When this License ends you must stop all use of the Application and destroy and erase any copies you have. + + +Liability +--------- + +YoYo Games Limited (“YoYo Games) is not involved in the creation of this Application except only that it was made using GameMaker. YoYo Games warrants only that GameMaker will function satisfactorily if used properly and on the correct operating system. +YoYo Games does not warrant that the operation of the Appication will be uninterrupted or error free or that errors can be corrected. You install and use the Application at your own risk and in no event will YoYo Games be liable to you for any loss or damage of any kind (except personal injury or death arising from YoYo Games’ negligence) including lost profits or other consequential loss arising from the use of or inability to use the Application or from errors or deficiencies in it whether caused by negligence or otherwise. +To the maximum extent permitted by law, YoYo Games Limited excludes liability for all warranties, conditions and other terms which but for this notice would have effect. + + +General +------- + +All copyright and other intellectual property rights in GameMaker and parts of it included in the Application belong to and vest in YoYo Games. All rights of YoYo Games are hereby asserted and reserved. +All trade marks are the property of their respective owners and YoYo Games makes no warranty or representation in respect of and has no responsibility and excludes all liability for any trade mark or third party content. +The rights granted in this license are non-exclusive. +This license does not affect your statutory rights as a consumer. +This License is governed by English Law and the parties submit to the exclusive jurisdiction of the English Courts. +If you have a problem with this Application please contact the person who made it, not YoYo Games. + +Click “ACCEPT” and accept these terms to install and use this Application. If you do not accept them terms you may not continue with the installation and you must not install, use or run this software on this or any other computer. diff --git a/src/gms2/gdash/options/windows/RunnerInstaller.nsi b/src/gms2/gdash/options/windows/RunnerInstaller.nsi new file mode 100644 index 0000000..cd77b58 --- /dev/null +++ b/src/gms2/gdash/options/windows/RunnerInstaller.nsi @@ -0,0 +1,213 @@ +; RunnerInstaller.nsi +; +; This script is based on example1.nsi, but it remember the directory, +; has uninstall support and (optionally) installs start menu shortcuts. +; +; It will install example2.nsi into a directory that the user selects, + +;-------------------------------- +!include MUI2.nsh + +!ifndef FULL_VERSION +!define FULL_VERSION "1.0.0.0" +!endif +!ifndef SOURCE_DIR +!define SOURCE_DIR "C:\source\temp\InstallerTest\runner" +!endif +!ifndef INSTALLER_FILENAME +!define INSTALLER_FILENAME "C:\source\temp\InstallerTest\RunnerInstaller.exe" +!endif + +!ifndef MAKENSIS +!define MAKENSIS "%appdata%\GameMaker-Studio\makensis" +!endif + +!ifndef COMPANY_NAME +!define COMPANY_NAME "" +!endif + +!ifndef COPYRIGHT_TXT +!define COPYRIGHT_TXT "(c)Copyright 2013" +!endif + +!ifndef FILE_DESC +!define FILE_DESC "Created with GameMaker:Studio" +!endif + +!ifndef LICENSE_NAME +!define LICENSE_NAME "License.txt" +!endif + +!ifndef ICON_FILE +!define ICON_FILE "icon.ico" +!endif + +!ifndef IMAGE_FINISHED +!define IMAGE_FINISHED "Runner_finish.bmp" +!endif + +!ifndef IMAGE_HEADER +!define IMAGE_HEADER "Runner_header.bmp" +!endif + +!ifndef PRODUCT_NAME +!define PRODUCT_NAME "Runner" +!endif + +!define APP_NAME "${PRODUCT_NAME}" +!define SHORT_NAME "${PRODUCT_NAME}" + +!ifndef EXE_NAME +!define EXE_NAME "${PRODUCT_NAME}" +!endif + + +;;USAGE: +!define MIN_FRA_MAJOR "2" +!define MIN_FRA_MINOR "0" +!define MIN_FRA_BUILD "*" + +!addplugindir "." + +;-------------------------------- + +; The name of the installer +Name "${APP_NAME}" +Caption "${APP_NAME}" +BrandingText "${APP_NAME}" + +; The file to write +OutFile "${INSTALLER_FILENAME}" + +; The default installation directory +InstallDir "$PROFILE\${APP_NAME}" + +; Registry key to check for directory (so if you install again, it will +; overwrite the old one automatically) +InstallDirRegKey HKCU "Software\Runner" "Install_Dir" + +; Request application privileges for Windows Vista +RequestExecutionLevel admin + + +VIProductVersion "${FULL_VERSION}" +VIAddVersionKey /LANG=1033 "FileVersion" "${FULL_VERSION}" +VIAddVersionKey /LANG=1033 "ProductVersion" "${FULL_VERSION}" +VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}" +VIAddVersionKey /LANG=1033 "CompanyName" "${PRODUCT_PUBLISHER}" +VIAddVersionKey /LANG=1033 "LegalCopyright" "${COPYRIGHT_TXT}" +VIAddVersionKey /LANG=1033 "FileDescription" "${FILE_DESC}" + + + +!define MUI_HEADERIMAGE +!define MUI_HEADERIMAGE_BITMAP_NOSTRETCH +!define MUI_ICON "${ICON_FILE}" +!define MUI_WELCOMEFINISHPAGE_BITMAP "${IMAGE_FINISHED}" +!define MUI_HEADERIMAGE_BITMAP "${IMAGE_HEADER}" +!define MUI_WELCOMEFINISHPAGE_BITMAP_NOSTRETCH + + +;-------------------------------- + +; Pages +!insertmacro MUI_PAGE_LICENSE "${LICENSE_NAME}" +!insertmacro MUI_PAGE_COMPONENTS +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_INSTFILES + # These indented statements modify settings for MUI_PAGE_FINISH + !define MUI_FINISHPAGE_NOAUTOCLOSE + !define MUI_FINISHPAGE_RUN_TEXT "Start ${PRODUCT_NAME}" + !define MUI_FINISHPAGE_RUN "$INSTDIR\${EXE_NAME}.exe" +!insertmacro MUI_PAGE_FINISH + +Var DirectXSetupError + +UninstPage uninstConfirm +UninstPage instfiles + +!insertmacro MUI_LANGUAGE "English" +;-------------------------------- + +; The stuff to install +Section `${APP_NAME}` + SectionIn RO + + ; Set output path to the installation directory. + SetOutPath $INSTDIR + + ; Put file there + File "${LICENSE_NAME}" + File /r "${SOURCE_DIR}\*.*" + + ; Write the uninstall keys for Windows + WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORT_NAME}" "DisplayName" "${APP_NAME}" + WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORT_NAME}" "UninstallString" '"$INSTDIR\uninstall.exe"' + WriteRegDWORD SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORT_NAME}" "NoModify" 1 + WriteRegDWORD SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORT_NAME}" "NoRepair" 1 + WriteUninstaller "uninstall.exe" + +SectionEnd + +; Optional section (can be disabled by the user) +Section "Start Menu Shortcuts" + + CreateDirectory "$SMPROGRAMS\${APP_NAME}" + CreateShortCut "$SMPROGRAMS\${APP_NAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0 + CreateShortCut "$SMPROGRAMS\${APP_NAME}\${APP_NAME}.lnk" "$INSTDIR\${EXE_NAME}.exe" "" "$INSTDIR\${EXE_NAME}.exe" + CreateShortCut "$SMPROGRAMS\${APP_NAME}\${APP_NAME} License.lnk" "notepad.exe" "$INSTDIR\License.txt" + +SectionEnd + + +; Optional section (can be enabled by the user) +Section /o "Desktop shortcut" + + CreateShortCut "$DESKTOP\${APP_NAME}.lnk" "$INSTDIR\${EXE_NAME}.exe" "" + +SectionEnd + + +;-------------------------------- + +; Uninstaller + +Section "Uninstall" + ; Remove registry keys + DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORT_NAME}" + + ; Remove files and uninstaller (everything) + RMDir /r "$INSTDIR" + + ; Remove desktop icon + Delete "$DESKTOP\${APP_NAME}.lnk" + + ; Remove shortcuts, if any + Delete "$SMPROGRAMS\${APP_NAME}\*.*" + + ; Remove directories used + RMDir "$SMPROGRAMS\${APP_NAME}" + RMDir "$INSTDIR" + +SectionEnd + + +;-------------------------------- +; +; This should be the LAST section available.... +; +Section "DirectX Install" SEC_DIRECTX + + SectionIn RO + + SetOutPath "$TEMP" + File "${MAKENSIS}\dxwebsetup.exe" + DetailPrint "Running DirectX Setup..." + ExecWait '"$TEMP\dxwebsetup.exe" /Q' $DirectXSetupError + DetailPrint "Finished DirectX Setup" + + Delete "$TEMP\dxwebsetup.exe" + + SetOutPath "$INSTDIR" + +SectionEnd diff --git a/src/gms2/gdash/options/windows/Runner_Icon_256.ico b/src/gms2/gdash/options/windows/Runner_Icon_256.ico new file mode 100644 index 0000000..655f1c1 Binary files /dev/null and b/src/gms2/gdash/options/windows/Runner_Icon_256.ico differ diff --git a/src/gms2/gdash/options/windows/Runner_finish.bmp b/src/gms2/gdash/options/windows/Runner_finish.bmp new file mode 100644 index 0000000..01b4a2c Binary files /dev/null and b/src/gms2/gdash/options/windows/Runner_finish.bmp differ diff --git a/src/gms2/gdash/options/windows/Runner_header.bmp b/src/gms2/gdash/options/windows/Runner_header.bmp new file mode 100644 index 0000000..db9ea12 Binary files /dev/null and b/src/gms2/gdash/options/windows/Runner_header.bmp differ diff --git a/src/gms2/gdash/options/windows/installer/license.txt b/src/gms2/gdash/options/windows/installer/license.txt new file mode 100644 index 0000000..1842321 --- /dev/null +++ b/src/gms2/gdash/options/windows/installer/license.txt @@ -0,0 +1,42 @@ +This Application was made using GameMaker. GameMaker is the intellectual property of YoYo Games Ltd, a company of the United Kingdom. + +THIS END USER LICENSE AGREEMENT APPLIES TO ALL USE OF THIS APPLICATION. + +Scope +----- +You may: + +Install and use this Application for personal, or commercial use [provided you have paid any license fee, if this applies]; + +You must not: + +use, copy, transfer, distribute modify, adapt, merge, translate, decompile, disassemble, or reverse engineer the Application or part of it except as expressly permitted by this Licence; +remove, modify, or tamper with any copyright, trademark or other notice; +use the Application for any illegal, unlawful or immoral purposes. + + +Term +---- +This License will end automatically if you breach any of the terms. +When this License ends you must stop all use of the Application and destroy and erase any copies you have. + + +Liability +--------- + +YoYo Games Limited (“YoYo Games) is not involved in the creation of this Application except only that it was made using GameMaker. YoYo Games warrants only that GameMaker will function satisfactorily if used properly and on the correct operating system. +YoYo Games does not warrant that the operation of the Appication will be uninterrupted or error free or that errors can be corrected. You install and use the Application at your own risk and in no event will YoYo Games be liable to you for any loss or damage of any kind (except personal injury or death arising from YoYo Games’ negligence) including lost profits or other consequential loss arising from the use of or inability to use the Application or from errors or deficiencies in it whether caused by negligence or otherwise. +To the maximum extent permitted by law, YoYo Games Limited excludes liability for all warranties, conditions and other terms which but for this notice would have effect. + + +General +------- + +All copyright and other intellectual property rights in GameMaker and parts of it included in the Application belong to and vest in YoYo Games. All rights of YoYo Games are hereby asserted and reserved. +All trade marks are the property of their respective owners and YoYo Games makes no warranty or representation in respect of and has no responsibility and excludes all liability for any trade mark or third party content. +The rights granted in this license are non-exclusive. +This license does not affect your statutory rights as a consumer. +This License is governed by English Law and the parties submit to the exclusive jurisdiction of the English Courts. +If you have a problem with this Application please contact the person who made it, not YoYo Games. + +Click “ACCEPT” and accept these terms to install and use this Application. If you do not accept them terms you may not continue with the installation and you must not install, use or run this software on this or any other computer. diff --git a/src/gms2/gdash/options/windows/installer/runnerinstaller.nsi b/src/gms2/gdash/options/windows/installer/runnerinstaller.nsi new file mode 100644 index 0000000..cd77b58 --- /dev/null +++ b/src/gms2/gdash/options/windows/installer/runnerinstaller.nsi @@ -0,0 +1,213 @@ +; RunnerInstaller.nsi +; +; This script is based on example1.nsi, but it remember the directory, +; has uninstall support and (optionally) installs start menu shortcuts. +; +; It will install example2.nsi into a directory that the user selects, + +;-------------------------------- +!include MUI2.nsh + +!ifndef FULL_VERSION +!define FULL_VERSION "1.0.0.0" +!endif +!ifndef SOURCE_DIR +!define SOURCE_DIR "C:\source\temp\InstallerTest\runner" +!endif +!ifndef INSTALLER_FILENAME +!define INSTALLER_FILENAME "C:\source\temp\InstallerTest\RunnerInstaller.exe" +!endif + +!ifndef MAKENSIS +!define MAKENSIS "%appdata%\GameMaker-Studio\makensis" +!endif + +!ifndef COMPANY_NAME +!define COMPANY_NAME "" +!endif + +!ifndef COPYRIGHT_TXT +!define COPYRIGHT_TXT "(c)Copyright 2013" +!endif + +!ifndef FILE_DESC +!define FILE_DESC "Created with GameMaker:Studio" +!endif + +!ifndef LICENSE_NAME +!define LICENSE_NAME "License.txt" +!endif + +!ifndef ICON_FILE +!define ICON_FILE "icon.ico" +!endif + +!ifndef IMAGE_FINISHED +!define IMAGE_FINISHED "Runner_finish.bmp" +!endif + +!ifndef IMAGE_HEADER +!define IMAGE_HEADER "Runner_header.bmp" +!endif + +!ifndef PRODUCT_NAME +!define PRODUCT_NAME "Runner" +!endif + +!define APP_NAME "${PRODUCT_NAME}" +!define SHORT_NAME "${PRODUCT_NAME}" + +!ifndef EXE_NAME +!define EXE_NAME "${PRODUCT_NAME}" +!endif + + +;;USAGE: +!define MIN_FRA_MAJOR "2" +!define MIN_FRA_MINOR "0" +!define MIN_FRA_BUILD "*" + +!addplugindir "." + +;-------------------------------- + +; The name of the installer +Name "${APP_NAME}" +Caption "${APP_NAME}" +BrandingText "${APP_NAME}" + +; The file to write +OutFile "${INSTALLER_FILENAME}" + +; The default installation directory +InstallDir "$PROFILE\${APP_NAME}" + +; Registry key to check for directory (so if you install again, it will +; overwrite the old one automatically) +InstallDirRegKey HKCU "Software\Runner" "Install_Dir" + +; Request application privileges for Windows Vista +RequestExecutionLevel admin + + +VIProductVersion "${FULL_VERSION}" +VIAddVersionKey /LANG=1033 "FileVersion" "${FULL_VERSION}" +VIAddVersionKey /LANG=1033 "ProductVersion" "${FULL_VERSION}" +VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}" +VIAddVersionKey /LANG=1033 "CompanyName" "${PRODUCT_PUBLISHER}" +VIAddVersionKey /LANG=1033 "LegalCopyright" "${COPYRIGHT_TXT}" +VIAddVersionKey /LANG=1033 "FileDescription" "${FILE_DESC}" + + + +!define MUI_HEADERIMAGE +!define MUI_HEADERIMAGE_BITMAP_NOSTRETCH +!define MUI_ICON "${ICON_FILE}" +!define MUI_WELCOMEFINISHPAGE_BITMAP "${IMAGE_FINISHED}" +!define MUI_HEADERIMAGE_BITMAP "${IMAGE_HEADER}" +!define MUI_WELCOMEFINISHPAGE_BITMAP_NOSTRETCH + + +;-------------------------------- + +; Pages +!insertmacro MUI_PAGE_LICENSE "${LICENSE_NAME}" +!insertmacro MUI_PAGE_COMPONENTS +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_INSTFILES + # These indented statements modify settings for MUI_PAGE_FINISH + !define MUI_FINISHPAGE_NOAUTOCLOSE + !define MUI_FINISHPAGE_RUN_TEXT "Start ${PRODUCT_NAME}" + !define MUI_FINISHPAGE_RUN "$INSTDIR\${EXE_NAME}.exe" +!insertmacro MUI_PAGE_FINISH + +Var DirectXSetupError + +UninstPage uninstConfirm +UninstPage instfiles + +!insertmacro MUI_LANGUAGE "English" +;-------------------------------- + +; The stuff to install +Section `${APP_NAME}` + SectionIn RO + + ; Set output path to the installation directory. + SetOutPath $INSTDIR + + ; Put file there + File "${LICENSE_NAME}" + File /r "${SOURCE_DIR}\*.*" + + ; Write the uninstall keys for Windows + WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORT_NAME}" "DisplayName" "${APP_NAME}" + WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORT_NAME}" "UninstallString" '"$INSTDIR\uninstall.exe"' + WriteRegDWORD SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORT_NAME}" "NoModify" 1 + WriteRegDWORD SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORT_NAME}" "NoRepair" 1 + WriteUninstaller "uninstall.exe" + +SectionEnd + +; Optional section (can be disabled by the user) +Section "Start Menu Shortcuts" + + CreateDirectory "$SMPROGRAMS\${APP_NAME}" + CreateShortCut "$SMPROGRAMS\${APP_NAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0 + CreateShortCut "$SMPROGRAMS\${APP_NAME}\${APP_NAME}.lnk" "$INSTDIR\${EXE_NAME}.exe" "" "$INSTDIR\${EXE_NAME}.exe" + CreateShortCut "$SMPROGRAMS\${APP_NAME}\${APP_NAME} License.lnk" "notepad.exe" "$INSTDIR\License.txt" + +SectionEnd + + +; Optional section (can be enabled by the user) +Section /o "Desktop shortcut" + + CreateShortCut "$DESKTOP\${APP_NAME}.lnk" "$INSTDIR\${EXE_NAME}.exe" "" + +SectionEnd + + +;-------------------------------- + +; Uninstaller + +Section "Uninstall" + ; Remove registry keys + DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SHORT_NAME}" + + ; Remove files and uninstaller (everything) + RMDir /r "$INSTDIR" + + ; Remove desktop icon + Delete "$DESKTOP\${APP_NAME}.lnk" + + ; Remove shortcuts, if any + Delete "$SMPROGRAMS\${APP_NAME}\*.*" + + ; Remove directories used + RMDir "$SMPROGRAMS\${APP_NAME}" + RMDir "$INSTDIR" + +SectionEnd + + +;-------------------------------- +; +; This should be the LAST section available.... +; +Section "DirectX Install" SEC_DIRECTX + + SectionIn RO + + SetOutPath "$TEMP" + File "${MAKENSIS}\dxwebsetup.exe" + DetailPrint "Running DirectX Setup..." + ExecWait '"$TEMP\dxwebsetup.exe" /Q' $DirectXSetupError + DetailPrint "Finished DirectX Setup" + + Delete "$TEMP\dxwebsetup.exe" + + SetOutPath "$INSTDIR" + +SectionEnd diff --git a/src/gms2/gdash/options/windows/options_windows.yy b/src/gms2/gdash/options/windows/options_windows.yy new file mode 100644 index 0000000..de6de3a --- /dev/null +++ b/src/gms2/gdash/options/windows/options_windows.yy @@ -0,0 +1,37 @@ +{ + "id": "cc98d028-7bdd-4680-85f3-c87a7baa481e", + "modelName": "GMWindowsOptions", + "mvc": "1.0", + "name": "Windows", + "option_windows_allow_fullscreen_switching": true, + "option_windows_borderless": false, + "option_windows_company_info": "", + "option_windows_copyright_info": "", + "option_windows_description_info": "A GameMaker:Studio Game", + "option_windows_display_cursor": true, + "option_windows_display_name": "GameMaker: Studio", + "option_windows_enable_steam": false, + "option_windows_executable_name": "${project_name}", + "option_windows_icon": "${options_dir}\\windows\\runner_icon.ico", + "option_windows_installer_finished": "${options_dir}\\windows\\Runner_finish.bmp", + "option_windows_installer_header": "${options_dir}\\windows\\Runner_header.bmp", + "option_windows_interpolate_pixels": true, + "option_windows_license": "${options_dir}\\windows\\installer\\license.txt", + "option_windows_nsis_file": "${options_dir}\\windows\\installer\\runnerinstaller.nsi", + "option_windows_product_info": "", + "option_windows_resize_window": false, + "option_windows_save_location": 0, + "option_windows_scale": 0, + "option_windows_sleep_margin": 1, + "option_windows_splash_screen": "${options_dir}\\windows\\splash.png", + "option_windows_start_fullscreen": false, + "option_windows_texture_page": "2048x2048", + "option_windows_use_splash": true, + "option_windows_version": { + "build": 0, + "major": 1, + "minor": 0, + "revision": 0 + }, + "option_windows_vsync": false +} \ No newline at end of file diff --git a/src/gms2/gdash/options/windows/runner_icon.ico b/src/gms2/gdash/options/windows/runner_icon.ico new file mode 100644 index 0000000..f6c1b44 Binary files /dev/null and b/src/gms2/gdash/options/windows/runner_icon.ico differ diff --git a/src/gms2/gdash/options/windows/splash.png b/src/gms2/gdash/options/windows/splash.png new file mode 100644 index 0000000..d89882f Binary files /dev/null and b/src/gms2/gdash/options/windows/splash.png differ diff --git a/src/gms2/gdash/rooms/room0/room0.yy b/src/gms2/gdash/rooms/room0/room0.yy new file mode 100644 index 0000000..c38b20c --- /dev/null +++ b/src/gms2/gdash/rooms/room0/room0.yy @@ -0,0 +1,289 @@ +{ + "id": "e80bc793-727b-4912-80cd-2a9381ae60e5", + "modelName": "GMRoom", + "mvc": "1.0", + "name": "room0", + "IsDnD": false, + "creationCodeFile": "", + "inheritCode": false, + "inheritCreationOrder": false, + "inheritLayers": false, + "instanceCreationOrderIDs": [ + "7da7fce4-fc68-45f1-b6cb-2c1ff576e80d" + ], + "layers": [ + { + "__type": "GMRInstanceLayer_Model:#YoYoStudio.MVCFormat", + "id": "d3e0d0ce-096e-467c-9bd7-8e91ec487ba5", + "modelName": "GMRInstanceLayer", + "mvc": "1.0", + "depth": 0, + "hierarchyFrozen": false, + "hierarchyVisible": true, + "inheritLayerDepth": false, + "inheritLayerSettings": false, + "inheritSubLayers": false, + "inheritVisibility": false, + "layers": [ + + ], + "m_parentID": "00000000-0000-0000-0000-000000000000", + "m_serialiseFrozen": false, + "name": "Compatibility_Instances_Depth_0", + "userdefined_depth": true, + "visible": true, + "instances": [ + { + "id": "7da7fce4-fc68-45f1-b6cb-2c1ff576e80d", + "modelName": "GMRInstance", + "mvc": "1.0", + "ignore": false, + "inheritItemSettings": false, + "m_originalParentID": "00000000-0000-0000-0000-000000000000", + "m_serialiseFrozen": false, + "name": "inst_8F536844", + "x": 0, + "y": 0, + "IsDnD": false, + "colour": { + "Value": 4294967295 + }, + "creationCodeFile": "", + "creationCodeType": "", + "inheritCode": false, + "name_with_no_file_rename": "inst_8F536844", + "objId": "75161d65-d380-49da-b5bd-8506f3d3c411", + "rotation": 0, + "scaleX": 1, + "scaleY": 1 + } + ] + }, + { + "__type": "GMRBackgroundLayer_Model:#YoYoStudio.MVCFormat", + "id": "b81e10ba-25f0-469d-9498-f9467fd4df07", + "modelName": "GMRBackgroundLayer", + "mvc": "1.0", + "depth": 2147483600, + "hierarchyFrozen": false, + "hierarchyVisible": true, + "inheritLayerDepth": false, + "inheritLayerSettings": false, + "inheritSubLayers": false, + "inheritVisibility": false, + "layers": [ + + ], + "m_parentID": "00000000-0000-0000-0000-000000000000", + "m_serialiseFrozen": false, + "name": "Compatibility_Colour", + "userdefined_depth": true, + "visible": true, + "animationFPS": 15, + "animationSpeedType": 0, + "colour": { + "Value": 4290822336 + }, + "hspeed": 0, + "htiled": false, + "spriteId": "00000000-0000-0000-0000-000000000000", + "stretch": false, + "userdefined_animFPS": false, + "vspeed": 0, + "vtiled": false, + "x": 0, + "y": 0 + } + ], + "parentId": "00000000-0000-0000-0000-000000000000", + "physicsSettings": { + "id": "43925c0d-066b-4892-a37d-60c88d7a36f5", + "modelName": "GMRoomPhysicsSettings", + "mvc": "1.0", + "PhysicsWorld": false, + "PhysicsWorldGravityX": 0, + "PhysicsWorldGravityY": 10, + "PhysicsWorldPixToMeters": 0.1, + "inheritPhysicsSettings": false + }, + "roomSettings": { + "id": "cd6113a7-e37a-453a-ba0c-269db78d9357", + "modelName": "GMRoomSettings", + "mvc": "1.0", + "Height": 768, + "Width": 1024, + "inheritRoomSettings": false, + "persistent": false + }, + "viewSettings": { + "id": "ddcf3594-0630-4e80-8acc-55f8bb3693f2", + "modelName": "GMRoomViewSettings", + "mvc": "1.0", + "clearDisplayBuffer": true, + "clearViewBackground": true, + "enableViews": false, + "inheritViewSettings": false + }, + "views": [ + { + "id": "d2f97d8e-549b-421e-a3fc-79089ab8327a", + "modelName": "GMRView", + "mvc": "1.0", + "hborder": 32, + "hport": 768, + "hspeed": -1, + "hview": 768, + "inherit": false, + "objId": "00000000-0000-0000-0000-000000000000", + "vborder": 32, + "visible": false, + "vspeed": -1, + "wport": 1024, + "wview": 1024, + "xport": 0, + "xview": 0, + "yport": 0, + "yview": 0 + }, + { + "id": "a079a7a2-5d8c-42d6-8ec4-404f89c5a1f4", + "modelName": "GMRView", + "mvc": "1.0", + "hborder": 32, + "hport": 768, + "hspeed": -1, + "hview": 768, + "inherit": false, + "objId": "00000000-0000-0000-0000-000000000000", + "vborder": 32, + "visible": false, + "vspeed": -1, + "wport": 1024, + "wview": 1024, + "xport": 0, + "xview": 0, + "yport": 0, + "yview": 0 + }, + { + "id": "b5de72b6-fb5b-41f9-b40f-67cf52aa378d", + "modelName": "GMRView", + "mvc": "1.0", + "hborder": 32, + "hport": 768, + "hspeed": -1, + "hview": 768, + "inherit": false, + "objId": "00000000-0000-0000-0000-000000000000", + "vborder": 32, + "visible": false, + "vspeed": -1, + "wport": 1024, + "wview": 1024, + "xport": 0, + "xview": 0, + "yport": 0, + "yview": 0 + }, + { + "id": "ee437268-ac47-4bec-a8d1-70f437c64116", + "modelName": "GMRView", + "mvc": "1.0", + "hborder": 32, + "hport": 768, + "hspeed": -1, + "hview": 768, + "inherit": false, + "objId": "00000000-0000-0000-0000-000000000000", + "vborder": 32, + "visible": false, + "vspeed": -1, + "wport": 1024, + "wview": 1024, + "xport": 0, + "xview": 0, + "yport": 0, + "yview": 0 + }, + { + "id": "2ec528c6-75a7-451b-bd41-32c50d0aaa0e", + "modelName": "GMRView", + "mvc": "1.0", + "hborder": 32, + "hport": 768, + "hspeed": -1, + "hview": 768, + "inherit": false, + "objId": "00000000-0000-0000-0000-000000000000", + "vborder": 32, + "visible": false, + "vspeed": -1, + "wport": 1024, + "wview": 1024, + "xport": 0, + "xview": 0, + "yport": 0, + "yview": 0 + }, + { + "id": "6645c53d-a932-4e3b-8254-4ec636f2ce93", + "modelName": "GMRView", + "mvc": "1.0", + "hborder": 32, + "hport": 768, + "hspeed": -1, + "hview": 768, + "inherit": false, + "objId": "00000000-0000-0000-0000-000000000000", + "vborder": 32, + "visible": false, + "vspeed": -1, + "wport": 1024, + "wview": 1024, + "xport": 0, + "xview": 0, + "yport": 0, + "yview": 0 + }, + { + "id": "5ff29a46-f763-43c8-a13c-b6bf76acfbb9", + "modelName": "GMRView", + "mvc": "1.0", + "hborder": 32, + "hport": 768, + "hspeed": -1, + "hview": 768, + "inherit": false, + "objId": "00000000-0000-0000-0000-000000000000", + "vborder": 32, + "visible": false, + "vspeed": -1, + "wport": 1024, + "wview": 1024, + "xport": 0, + "xview": 0, + "yport": 0, + "yview": 0 + }, + { + "id": "0803d151-a616-40b4-a770-41929e8b1636", + "modelName": "GMRView", + "mvc": "1.0", + "hborder": 32, + "hport": 768, + "hspeed": -1, + "hview": 768, + "inherit": false, + "objId": "00000000-0000-0000-0000-000000000000", + "vborder": 32, + "visible": false, + "vspeed": -1, + "wport": 1024, + "wview": 1024, + "xport": 0, + "xview": 0, + "yport": 0, + "yview": 0 + } + ] +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/@instance_create/instance_create.gml b/src/gms2/gdash/scripts/@instance_create/instance_create.gml new file mode 100644 index 0000000..818b240 --- /dev/null +++ b/src/gms2/gdash/scripts/@instance_create/instance_create.gml @@ -0,0 +1,6 @@ +/// @description Creates an instance of a given object at a given position. +/// @param x The x position the object will be created at. +/// @param y The y position the object will be created at. +/// @param obj The object to create an instance of. +var myDepth = object_get_depth( argument2 ); +return instance_create_depth( argument0, argument1, myDepth, argument2 ); diff --git a/src/gms2/gdash/scripts/@instance_create/instance_create.yy b/src/gms2/gdash/scripts/@instance_create/instance_create.yy new file mode 100644 index 0000000..02bf681 --- /dev/null +++ b/src/gms2/gdash/scripts/@instance_create/instance_create.yy @@ -0,0 +1,8 @@ +{ + "id": "565a36f1-6705-454d-b56c-3f536baa2e0e", + "modelName": "GMScript", + "mvc": "1.0", + "name": "instance_create", + "IsCompatibility": true, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/@object_get_depth/object_get_depth.gml b/src/gms2/gdash/scripts/@object_get_depth/object_get_depth.gml new file mode 100644 index 0000000..7775944 --- /dev/null +++ b/src/gms2/gdash/scripts/@object_get_depth/object_get_depth.gml @@ -0,0 +1,10 @@ +/// @description Returns the depth of the specified object. +/// @param {Number} obj The index of the object to check +/// @return {Number} depth of the object + +var objID = argument0; +var ret = 0; +if (objID >= 0) && (objID < array_length_1d(global.__objectID2Depth)) { + ret = global.__objectID2Depth[objID]; +} // end if +return ret; \ No newline at end of file diff --git a/src/gms2/gdash/scripts/@object_get_depth/object_get_depth.yy b/src/gms2/gdash/scripts/@object_get_depth/object_get_depth.yy new file mode 100644 index 0000000..529ed1e --- /dev/null +++ b/src/gms2/gdash/scripts/@object_get_depth/object_get_depth.yy @@ -0,0 +1,8 @@ +{ + "id": "bd2b952d-8cfc-4ace-9fb7-13e008ec8523", + "modelName": "GMScript", + "mvc": "1.0", + "name": "object_get_depth", + "IsCompatibility": true, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/__add/__add.gml b/src/gms2/gdash/scripts/__add/__add.gml new file mode 100644 index 0000000..5d2294b --- /dev/null +++ b/src/gms2/gdash/scripts/__add/__add.gml @@ -0,0 +1 @@ +return argument0 + argument1; diff --git a/src/gms2/gdash/scripts/__add/__add.yy b/src/gms2/gdash/scripts/__add/__add.yy new file mode 100644 index 0000000..2bd27e6 --- /dev/null +++ b/src/gms2/gdash/scripts/__add/__add.yy @@ -0,0 +1,8 @@ +{ + "id": "71fc0e7e-ac29-4c46-920e-a07621c9158d", + "modelName": "GMScript", + "mvc": "1.0", + "name": "__add", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/__double/__double.gml b/src/gms2/gdash/scripts/__double/__double.gml new file mode 100644 index 0000000..82580fc --- /dev/null +++ b/src/gms2/gdash/scripts/__double/__double.gml @@ -0,0 +1 @@ +return argument0 * 2; diff --git a/src/gms2/gdash/scripts/__double/__double.yy b/src/gms2/gdash/scripts/__double/__double.yy new file mode 100644 index 0000000..c73b9ff --- /dev/null +++ b/src/gms2/gdash/scripts/__double/__double.yy @@ -0,0 +1,8 @@ +{ + "id": "a44c3458-a344-402c-8fd1-6eff64583bc8", + "modelName": "GMScript", + "mvc": "1.0", + "name": "__double", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/__global_object_depths/__global_object_depths.gml b/src/gms2/gdash/scripts/__global_object_depths/__global_object_depths.gml new file mode 100644 index 0000000..49ee95d --- /dev/null +++ b/src/gms2/gdash/scripts/__global_object_depths/__global_object_depths.gml @@ -0,0 +1,21 @@ +// Initialise the global array that allows the lookup of the depth of a given object +// GM2.0 does not have a depth on objects so on import from 1.x a global array is created +// NOTE: MacroExpansion is used to insert the array initialisation at import time +gml_pragma( "global", "__global_object_depths()"); + +// insert the generated arrays here +global.__objectDepths[0] = 0; // obj_gdash_test_1 + + +global.__objectNames[0] = "obj_gdash_test_1"; + + +// create another array that has the correct entries +var len = array_length_1d(global.__objectDepths); +global.__objectID2Depth = []; +for( var i=0; i= 0) { + global.__objectID2Depth[ objID ] = global.__objectDepths[i]; + } // end if +} // end for \ No newline at end of file diff --git a/src/gms2/gdash/scripts/__global_object_depths/__global_object_depths.yy b/src/gms2/gdash/scripts/__global_object_depths/__global_object_depths.yy new file mode 100644 index 0000000..13acae0 --- /dev/null +++ b/src/gms2/gdash/scripts/__global_object_depths/__global_object_depths.yy @@ -0,0 +1,8 @@ +{ + "id": "97727621-bd2b-4624-8c61-db3d2d9bf2dd", + "modelName": "GMScript", + "mvc": "1.0", + "name": "__global_object_depths", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/__greaterThanThree/__greaterThanThree.gml b/src/gms2/gdash/scripts/__greaterThanThree/__greaterThanThree.gml new file mode 100644 index 0000000..d5cdcca --- /dev/null +++ b/src/gms2/gdash/scripts/__greaterThanThree/__greaterThanThree.gml @@ -0,0 +1 @@ +return argument0 > 3; diff --git a/src/gms2/gdash/scripts/__greaterThanThree/__greaterThanThree.yy b/src/gms2/gdash/scripts/__greaterThanThree/__greaterThanThree.yy new file mode 100644 index 0000000..5fbf6c4 --- /dev/null +++ b/src/gms2/gdash/scripts/__greaterThanThree/__greaterThanThree.yy @@ -0,0 +1,8 @@ +{ + "id": "73ab2ea6-b1dd-40ce-9fb0-1356bcff5f3e", + "modelName": "GMScript", + "mvc": "1.0", + "name": "__greaterThanThree", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/__isEven/__isEven.gml b/src/gms2/gdash/scripts/__isEven/__isEven.gml new file mode 100644 index 0000000..49a9fef --- /dev/null +++ b/src/gms2/gdash/scripts/__isEven/__isEven.gml @@ -0,0 +1 @@ +return (argument0 % 2) == 0; diff --git a/src/gms2/gdash/scripts/__isEven/__isEven.yy b/src/gms2/gdash/scripts/__isEven/__isEven.yy new file mode 100644 index 0000000..6c4ae6d --- /dev/null +++ b/src/gms2/gdash/scripts/__isEven/__isEven.yy @@ -0,0 +1,8 @@ +{ + "id": "6674cf91-7ea3-4e59-9ebf-1f0caf512692", + "modelName": "GMScript", + "mvc": "1.0", + "name": "__isEven", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/__sum/__sum.gml b/src/gms2/gdash/scripts/__sum/__sum.gml new file mode 100644 index 0000000..1321e15 --- /dev/null +++ b/src/gms2/gdash/scripts/__sum/__sum.gml @@ -0,0 +1,8 @@ +var total = argument[0]; +var addMe = argument[1]; + +if (_typeOf(total) == "undefined") { + return addMe; +} else { + return total + addMe; +} diff --git a/src/gms2/gdash/scripts/__sum/__sum.yy b/src/gms2/gdash/scripts/__sum/__sum.yy new file mode 100644 index 0000000..02548e8 --- /dev/null +++ b/src/gms2/gdash/scripts/__sum/__sum.yy @@ -0,0 +1,8 @@ +{ + "id": "2e2daba8-4764-4076-8526-b2528785accc", + "modelName": "GMScript", + "mvc": "1.0", + "name": "__sum", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/_and/_and.gml b/src/gms2/gdash/scripts/_and/_and.gml new file mode 100644 index 0000000..7df9917 --- /dev/null +++ b/src/gms2/gdash/scripts/_and/_and.gml @@ -0,0 +1,15 @@ +/// @desc Returns the value of the provided arguments after a boolean and +/// @param {*} valueA Some first input +/// @param {*} valueB A value to && the first input with +/// @returns {Boolean} The value of the provided arguments after an && +/* +@example +_and(true, true); +// => true + +_and(false, true); +// => false + +*/ +return argument0 && argument1; + diff --git a/src/gms2/gdash/scripts/_and/_and.yy b/src/gms2/gdash/scripts/_and/_and.yy new file mode 100644 index 0000000..ea7e658 --- /dev/null +++ b/src/gms2/gdash/scripts/_and/_and.yy @@ -0,0 +1,8 @@ +{ + "id": "b37db980-06b5-44b7-b0b6-1dca01f04279", + "modelName": "GMScript", + "mvc": "1.0", + "name": "_and", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/_arrayOf/_arrayOf.gml b/src/gms2/gdash/scripts/_arrayOf/_arrayOf.gml new file mode 100644 index 0000000..6519dfe --- /dev/null +++ b/src/gms2/gdash/scripts/_arrayOf/_arrayOf.gml @@ -0,0 +1,19 @@ +/// @desc Returns an array of the given arguments. +/// @param {*) values... Values to put into an array +/// @returns {Array} An array of the given parameters +/* +@example +_arrayOf(1, 2, 3); +// => [1, 2, 3]; + +_arrayOf('hello', 'world', 'i', 'am', 'an', 'array'); +// => ['hello', 'world', 'i', 'am', 'an', 'array']; +*/ + +var arr; +for (i = 0; i < argument_count; i++) { + arr[i] = argument[i]; +} + +return arr; + diff --git a/src/gms2/gdash/scripts/_arrayOf/_arrayOf.yy b/src/gms2/gdash/scripts/_arrayOf/_arrayOf.yy new file mode 100644 index 0000000..cfad804 --- /dev/null +++ b/src/gms2/gdash/scripts/_arrayOf/_arrayOf.yy @@ -0,0 +1,8 @@ +{ + "id": "a6902058-42c5-4eb6-8658-c430cfa31c1a", + "modelName": "GMScript", + "mvc": "1.0", + "name": "_arrayOf", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/_cloneArray/_cloneArray.gml b/src/gms2/gdash/scripts/_cloneArray/_cloneArray.gml new file mode 100644 index 0000000..56f6575 --- /dev/null +++ b/src/gms2/gdash/scripts/_cloneArray/_cloneArray.gml @@ -0,0 +1,21 @@ +/// @desc Clones a given input array, returning a deep copy. +/// @param {Array} array The array to clone +/// @returns {Array} A copy of the input array +/* +@example +var myArray = _arrayOf(1, 2, 3); +var copyArray = _cloneArray(myArray); +_isEqual(myArray, copyArray) +// => true +*/ + +var inputArray = argument0; + +var outputArray; +outputArray[0] = -1; + +for (var i = 0; i < _length(inputArray); i++) { + outputArray[i] = inputArray[i]; +} + +return outputArray; diff --git a/src/gms2/gdash/scripts/_cloneArray/_cloneArray.yy b/src/gms2/gdash/scripts/_cloneArray/_cloneArray.yy new file mode 100644 index 0000000..928eefc --- /dev/null +++ b/src/gms2/gdash/scripts/_cloneArray/_cloneArray.yy @@ -0,0 +1,8 @@ +{ + "id": "024cd91c-bb54-4636-a223-6ba0a8f98e80", + "modelName": "GMScript", + "mvc": "1.0", + "name": "_cloneArray", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/_collect/_collect.gml b/src/gms2/gdash/scripts/_collect/_collect.gml new file mode 100644 index 0000000..82115a0 --- /dev/null +++ b/src/gms2/gdash/scripts/_collect/_collect.gml @@ -0,0 +1,19 @@ +/// @desc Returns an array of all objects of the provided type +/// @param {ObjectType} objectType The object type to collect +/// @returns {Array} An array of all object IDs of the provided type in the room +/* +@example + +_collect(obj_character); +// => [10001, 10002, 10005] +*/ +var result; +var i = 0; + +with (argument0) { + result[i] = id; + i++; +} + +return result; + diff --git a/src/gms2/gdash/scripts/_collect/_collect.yy b/src/gms2/gdash/scripts/_collect/_collect.yy new file mode 100644 index 0000000..1ed72c4 --- /dev/null +++ b/src/gms2/gdash/scripts/_collect/_collect.yy @@ -0,0 +1,8 @@ +{ + "id": "94e9b58c-1b5c-4e05-8348-05e1155444a6", + "modelName": "GMScript", + "mvc": "1.0", + "name": "_collect", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/_concat/_concat.gml b/src/gms2/gdash/scripts/_concat/_concat.gml new file mode 100644 index 0000000..a9482a2 --- /dev/null +++ b/src/gms2/gdash/scripts/_concat/_concat.gml @@ -0,0 +1,24 @@ +/// @desc Appends the values of one array to another. +/// @param {Array} baseArray The array to append to +/// @param {Array} arrayToAppend The array to append +/// @returns {Array} The concatenated array +/* +@example +_concat(_arrayOf(0, 1, 2), _arrayOf(3, 4, 5)); +// => [0, 1, 2, 3, 4, 5] + +*/ + +var inputArray = argument[0]; +var appendArray = argument[1]; +var i = _length(inputArray), +var n = 0; + +repeat (_length(appendArray)) { + inputArray[i] = appendArray[n]; + n++; + i++; +} + +return inputArray; + diff --git a/src/gms2/gdash/scripts/_concat/_concat.yy b/src/gms2/gdash/scripts/_concat/_concat.yy new file mode 100644 index 0000000..e2ac26c --- /dev/null +++ b/src/gms2/gdash/scripts/_concat/_concat.yy @@ -0,0 +1,8 @@ +{ + "id": "a4a5b8b5-6a80-4608-8d72-d363ee719bcd", + "modelName": "GMScript", + "mvc": "1.0", + "name": "_concat", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/_contains/_contains.gml b/src/gms2/gdash/scripts/_contains/_contains.gml new file mode 100644 index 0000000..b8c142f --- /dev/null +++ b/src/gms2/gdash/scripts/_contains/_contains.gml @@ -0,0 +1,53 @@ +/// @desc Returns true if the given array contains the given value +/// @param {String|Array|DS_Map} collection The collection to search +/// @param {*} value The value to look for +/// @param {Real} optionalFromIndex [0] The index to begin looking from +/// @returns {Boolean} True if the collection contains the target, otherwise false +/* +@example +_contains([1, 2, 3], 1); +// => true + +_contains([1, 2, 3], 1, 1); +// => false + +_contains("hello", "ello"); +// => true +*/ + +var collection = argument[0]; +var target = argument[1] +var fromIndex = 0; + +if (argument_count == 3) { + fromIndex = argument[2]; +} + +if (is_string(collection)) { + + // If it is a string, check to see if the target is in the string. + return string_count(string(target), collection) > 0; +} else if (is_array(collection)) { + + // If it is an array, check if target exists in the array. + for (var i = fromIndex; i < _length(collection); i++) { + if (_typeOf(collection[i]) == _typeOf(target) && collection[i] == target) { + return true; + } + } + return false; +} else if (is_real(collection)) { + + // If it is a real, assume it is a ds ID. + if (ds_exists(collection, ds_type_map)) { + var keys = _keys(collection); + for (var i = fromIndex; i < _length(keys); i++) { + var thisValue = ds_map_find_value(collection, keys[i]) + if (_typeOf(thisValue) == _typeOf(target) && thisValue == target) { + return true; + } + } + return false; + } +} + diff --git a/src/gms2/gdash/scripts/_contains/_contains.yy b/src/gms2/gdash/scripts/_contains/_contains.yy new file mode 100644 index 0000000..f8eae16 --- /dev/null +++ b/src/gms2/gdash/scripts/_contains/_contains.yy @@ -0,0 +1,8 @@ +{ + "id": "cf6d1c85-7152-4e6c-9814-5b6fd0a19260", + "modelName": "GMScript", + "mvc": "1.0", + "name": "_contains", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/_destroy/_destroy.gml b/src/gms2/gdash/scripts/_destroy/_destroy.gml new file mode 100644 index 0000000..6140dc4 --- /dev/null +++ b/src/gms2/gdash/scripts/_destroy/_destroy.gml @@ -0,0 +1,14 @@ +/// @desc Destroys the passed in instance +/// @param {Instance} instance The instance to destroy +/* +@example +_destroy(obj_enemy); + +// Destroy all obj_enemy with no health (hasNoHealth is a script) +_map(_filter(_collect(obj_enemy)), hasNoHealth), _destroy); +*/ + +with (argument0) { + instance_destroy(); +} + diff --git a/src/gms2/gdash/scripts/_destroy/_destroy.yy b/src/gms2/gdash/scripts/_destroy/_destroy.yy new file mode 100644 index 0000000..cce9baa --- /dev/null +++ b/src/gms2/gdash/scripts/_destroy/_destroy.yy @@ -0,0 +1,8 @@ +{ + "id": "695b8b1b-7f66-473f-aeb5-5d9f1431c1a5", + "modelName": "GMScript", + "mvc": "1.0", + "name": "_destroy", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/_filter/_filter.gml b/src/gms2/gdash/scripts/_filter/_filter.gml new file mode 100644 index 0000000..54ae272 --- /dev/null +++ b/src/gms2/gdash/scripts/_filter/_filter.gml @@ -0,0 +1,25 @@ +/// @desc Returns an array where values of the input array are truthy when run through the provided function. +/// @param {Array} inputArray The array to filter +/// @param {Script} filterScript The script to filter with +/// @returns {Array} The filtered array +/* +@example +_filter(_arrayOf(0, 1, 2, 3), lessThanTwo) +// => [0, 1] + +*/ + +var array = argument[0]; +var func = argument[1]; +var result = undefined; +var resultCount = 0; + +for (var i = 0; i < _length(array); i++) { + if (_run(func, array[i])) { + result[resultCount] = array[i]; + resultCount++; + } +} + +return result; + diff --git a/src/gms2/gdash/scripts/_filter/_filter.yy b/src/gms2/gdash/scripts/_filter/_filter.yy new file mode 100644 index 0000000..495ccde --- /dev/null +++ b/src/gms2/gdash/scripts/_filter/_filter.yy @@ -0,0 +1,8 @@ +{ + "id": "10eda2f5-f03f-4f57-83ee-c65c10d22dce", + "modelName": "GMScript", + "mvc": "1.0", + "name": "_filter", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/_find/_find.gml b/src/gms2/gdash/scripts/_find/_find.gml new file mode 100644 index 0000000..2777001 --- /dev/null +++ b/src/gms2/gdash/scripts/_find/_find.gml @@ -0,0 +1,16 @@ +/// @desc Iterates over an array, returning the first element that the given script returns true for. +/// @param {Array} array The array to iterate over +/// @param {Script} findScript The script to run on the given element +/// @returns {*} The first element that returns truthy from the script +/* +@example +_find(_arrayOf(0, 1, 2, 3), __equalsThree); +// => 3 +*/ + +for (var i = 0; i < _length(argument0); i++) { + if (_run(argument1, argument0[i])) { + return argument0[i]; + } +} + diff --git a/src/gms2/gdash/scripts/_find/_find.yy b/src/gms2/gdash/scripts/_find/_find.yy new file mode 100644 index 0000000..1aa51fe --- /dev/null +++ b/src/gms2/gdash/scripts/_find/_find.yy @@ -0,0 +1,8 @@ +{ + "id": "b340ab46-5d6e-4797-8b0c-07b65051d71d", + "modelName": "GMScript", + "mvc": "1.0", + "name": "_find", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/_free/_free.gml b/src/gms2/gdash/scripts/_free/_free.gml new file mode 100644 index 0000000..451a904 --- /dev/null +++ b/src/gms2/gdash/scripts/_free/_free.gml @@ -0,0 +1,32 @@ +/// @desc Frees a partial function from memory +/// @param {Real} resource The partial ID to free +/// @param {DS_TYPE} optionalType The type of resource to free +/* +@example +var __sometihng = _partial(someScript, 1); +__something(2); +_free(__something); + +*/ +var dsId = argument[0]; +var type; + +if (argument_count == 1) { + type = ds_type_map; +} else { + type = argument[1]; +} + +if (_isEqual(type, "partial")) { + type = ds_type_map; +} + +switch (type) { + case ds_type_map: + ds_map_destroy(dsId); + break; + case ds_type_list: + ds_list_destroy(dsId); + break; +} + diff --git a/src/gms2/gdash/scripts/_free/_free.yy b/src/gms2/gdash/scripts/_free/_free.yy new file mode 100644 index 0000000..4efee00 --- /dev/null +++ b/src/gms2/gdash/scripts/_free/_free.yy @@ -0,0 +1,8 @@ +{ + "id": "19877baf-f9bd-4216-b356-45c2b3bf122e", + "modelName": "GMScript", + "mvc": "1.0", + "name": "_free", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/_get/_get.gml b/src/gms2/gdash/scripts/_get/_get.gml new file mode 100644 index 0000000..3188a67 --- /dev/null +++ b/src/gms2/gdash/scripts/_get/_get.gml @@ -0,0 +1,29 @@ +/// @desc Gets a nested value following a dot notation +/// @param {DS_Map} map The map to get data from +/// @param {String} locationString The location of the data to get +/// @returns {Mixed} The data found at the given location +/* +@example +// someMap looks like: +// { nested: {three: {deep: 1}}} +_.get(someMap, 'nested.three.deep'); +// => 1 + +*/ + +var map = argument0; +var location = argument1; +var locationArray = _split(location, "."); + +var temp = map; +for (var i = 0; i < _length(locationArray); i++) { + var thisLoc = locationArray[i]; + if (ds_map_exists(temp, thisLoc)) { + temp = temp[? thisLoc]; + } else { + return undefined; + } +} + +return temp; + diff --git a/src/gms2/gdash/scripts/_get/_get.yy b/src/gms2/gdash/scripts/_get/_get.yy new file mode 100644 index 0000000..d14105c --- /dev/null +++ b/src/gms2/gdash/scripts/_get/_get.yy @@ -0,0 +1,8 @@ +{ + "id": "acbe9db1-5a5b-4ce1-944c-58cf842a7935", + "modelName": "GMScript", + "mvc": "1.0", + "name": "_get", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/_indexOf/_indexOf.gml b/src/gms2/gdash/scripts/_indexOf/_indexOf.gml new file mode 100644 index 0000000..57c3d2e --- /dev/null +++ b/src/gms2/gdash/scripts/_indexOf/_indexOf.gml @@ -0,0 +1,22 @@ +/// @desc Returns the index of the given item in the given array, or -1 +/// @param {Array|DS_List} collection The collection to search +/// @param {*} value The value to look for +/// @returns {Real} The index of the value, or -1 + +var collection = argument0; +var search = argument1; + +// Search lists +if (is_real(collection)) { + return ds_list_find_index(collection, search); +} + +// Search arrays +for (var i = 0; i < _length(collection); i++) { + if (_isEqual(collection[i], search)) { + return i; + } +} + +return -1; + diff --git a/src/gms2/gdash/scripts/_indexOf/_indexOf.yy b/src/gms2/gdash/scripts/_indexOf/_indexOf.yy new file mode 100644 index 0000000..b0f4675 --- /dev/null +++ b/src/gms2/gdash/scripts/_indexOf/_indexOf.yy @@ -0,0 +1,8 @@ +{ + "id": "cfac0abc-4609-4eae-a2d7-af54980b51fd", + "modelName": "GMScript", + "mvc": "1.0", + "name": "_indexOf", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/_isEqual/_isEqual.gml b/src/gms2/gdash/scripts/_isEqual/_isEqual.gml new file mode 100644 index 0000000..6ffb1df --- /dev/null +++ b/src/gms2/gdash/scripts/_isEqual/_isEqual.gml @@ -0,0 +1,81 @@ +/// @desc Checks if two values are equal, being safe about type and checking first-level children of ds_lists and ds_maps. Returns false on type inequality rather than throwing an error. +/// @param {*} firstValue First value to compare +/// @param {*} secondValue Second value to compare +/// @param {ds_type} [Optional] If specified, assumes this type instead of inferring the type. Only specify this if using _isEqual for a ds +/// @returns {Boolean} true if the values are equal, false otherwise +/* +@example + +_isEqual([1, 2, 3], [1, 2, 3]); +// => true + +_isEqual("hello", 1); +// => false + +var map = ds_map_create(); +ds_map_add(map, 'hello', 6); +ds_map_add(map, 'world', 10); +var map2 = ds_map_create(); +ds_map_add(map2, 'hello', 6); +ds_map_add(map2, 'world', 10); +_isEqual(map, map2, ds_type_map); +// => true + +*/ + +var compareA = argument[0]; +var compareB = argument[1]; +var type; + +if (argument_count == 3) { + type = argument[2]; +} else { + if (_typeOf(compareA) != _typeOf(compareB)) { + return false; + } else { + if (_typeOf(compareA) == "array") { + if (_length(compareA) != _length(compareB)) { + return false; + } + + for (var i = 0; i < _length(compareA); i++) { + if (!_isEqual(compareA[i], compareB[i])) { + return false; + } + } + return true; + } else { + return compareA == compareB; + } + } +} + +if (type == ds_type_map) { + var aKeys = _keys(compareA); + var bKeys = _keys(compareB); + if (!_isEqual(aKeys, bKeys)) { + return false; + } + + for (var i = 0; i < _length(aKeys); i++) { + if (!_isEqual(ds_map_find_value(compareA, aKeys[i]), ds_map_find_value(compareB, aKeys[i]))) { + return false; + } + } + + return true; +} else if (type == ds_type_list) { + if (!_isEqual(ds_list_size(compareA), ds_list_size(compareB))) { + return false; + } + + for (var i = 0; i < ds_list_size(compareA); i++) { + if (!_isEqual(ds_list_find_value(compareA, i), ds_list_find_value(compareB, i))) { + return false; + } + } + + return true; + +} + diff --git a/src/gms2/gdash/scripts/_isEqual/_isEqual.yy b/src/gms2/gdash/scripts/_isEqual/_isEqual.yy new file mode 100644 index 0000000..a0a854c --- /dev/null +++ b/src/gms2/gdash/scripts/_isEqual/_isEqual.yy @@ -0,0 +1,8 @@ +{ + "id": "78a96032-6d47-40a1-94e8-dcb78178a134", + "modelName": "GMScript", + "mvc": "1.0", + "name": "_isEqual", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/_join/_join.gml b/src/gms2/gdash/scripts/_join/_join.gml new file mode 100644 index 0000000..df275cd --- /dev/null +++ b/src/gms2/gdash/scripts/_join/_join.gml @@ -0,0 +1,33 @@ +/// @desc Returns a string of the given array combined with the given joiner +/// @param {Array} array The array to join +/// @param {String} joinChar The character to join by +/// @returns {String} The joined array +/* +@example +var arr = _arrayOf('hello', 'world'); +_join(arr, ' '); +// => 'hello world' + +var arr = _arrayOf('Peter', 'Paul', 'Mary'); +_join(arr, ', '); +// => 'Peter, Paul, Mary'; +*/ + +var outString = ""; +var inArray = argument0; +var joiner = argument1; + +var arrLength = _length(inArray); +var maxIndex = arrLength - 1; +var stringJoiner = string(joiner); + +for (var i = 0; i < arrLength; i++) { + outString += string(inArray[i]); + + if (i != maxIndex) { + outString += stringJoiner; + } +} + +return outString; + diff --git a/src/gms2/gdash/scripts/_join/_join.yy b/src/gms2/gdash/scripts/_join/_join.yy new file mode 100644 index 0000000..2706fce --- /dev/null +++ b/src/gms2/gdash/scripts/_join/_join.yy @@ -0,0 +1,8 @@ +{ + "id": "69828e54-01dd-4a2a-b789-7e999d214dca", + "modelName": "GMScript", + "mvc": "1.0", + "name": "_join", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/_keys/_keys.gml b/src/gms2/gdash/scripts/_keys/_keys.gml new file mode 100644 index 0000000..6315aaf --- /dev/null +++ b/src/gms2/gdash/scripts/_keys/_keys.gml @@ -0,0 +1,26 @@ +/// @desc Returns an array contains all keys in a ds_map. Order is not guaranteed due to how ds_maps are stored. +/// @param {DS_Map} map The map to get the keys from +/// @returns {Array} An array of all keys in the map +/* +@example +var map = ds_map_create(); +ds_map_add(map, 'hello', 'world'); +ds_map_add(map, 'health', 100); + +_keys(map); +// => ['hello', 'health'] + +*/ + +var map = argument0; +var keys; +keys[0] = ds_map_find_first(map); +var nextKey = ds_map_find_next(map, keys[0]); + +while (!is_undefined(nextKey)) { + keys[_length(keys)] = nextKey; + nextKey = ds_map_find_next(map, nextKey); +} + +return keys; + diff --git a/src/gms2/gdash/scripts/_keys/_keys.yy b/src/gms2/gdash/scripts/_keys/_keys.yy new file mode 100644 index 0000000..63df475 --- /dev/null +++ b/src/gms2/gdash/scripts/_keys/_keys.yy @@ -0,0 +1,8 @@ +{ + "id": "f008e78e-dd51-41d2-bb3d-95199a8e7c3c", + "modelName": "GMScript", + "mvc": "1.0", + "name": "_keys", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/_length/_length.gml b/src/gms2/gdash/scripts/_length/_length.gml new file mode 100644 index 0000000..3c29b43 --- /dev/null +++ b/src/gms2/gdash/scripts/_length/_length.gml @@ -0,0 +1,26 @@ +/// @desc Returns the length of the given array or ds_list +/// @param {Array|DS_List} collection The collection to determine the length of +/// @returns {Real} The length of the collection +/* +@example +_length([1, 2, 3, 4]); +// => 4 + +_length(some_list_id_of_size_5); +// => 5 +*/ + +if (is_undefined(argument0)) { + return 0; +} + +if (_typeOf(argument0) == "array") { + return array_length_1d(argument0); +} else if (_typeOf(argument0) == "real" && ds_exists(argument0, ds_type_list)) { + return ds_list_size(argument0); +} else if (_typeOf(argument0) == "string") { + return string_length(argument0); +} + + + diff --git a/src/gms2/gdash/scripts/_length/_length.yy b/src/gms2/gdash/scripts/_length/_length.yy new file mode 100644 index 0000000..9ea9c36 --- /dev/null +++ b/src/gms2/gdash/scripts/_length/_length.yy @@ -0,0 +1,8 @@ +{ + "id": "dbd1ee41-adb8-45ec-b8bd-1098a1541bc0", + "modelName": "GMScript", + "mvc": "1.0", + "name": "_length", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/_log/_log.gml b/src/gms2/gdash/scripts/_log/_log.gml new file mode 100644 index 0000000..822ac00 --- /dev/null +++ b/src/gms2/gdash/scripts/_log/_log.gml @@ -0,0 +1,4 @@ +/// @desc Convenience method for show_debug_message(). Automatically convetrs arguments to strings. +/// @param {Mixed} Message The message or value to log +show_debug_message(string(argument0)); + diff --git a/src/gms2/gdash/scripts/_log/_log.yy b/src/gms2/gdash/scripts/_log/_log.yy new file mode 100644 index 0000000..2a4c552 --- /dev/null +++ b/src/gms2/gdash/scripts/_log/_log.yy @@ -0,0 +1,8 @@ +{ + "id": "40753ca5-3efd-4c93-b4b8-ee4bd601c676", + "modelName": "GMScript", + "mvc": "1.0", + "name": "_log", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/_map/_map.gml b/src/gms2/gdash/scripts/_map/_map.gml new file mode 100644 index 0000000..6337a0f --- /dev/null +++ b/src/gms2/gdash/scripts/_map/_map.gml @@ -0,0 +1,50 @@ +/// @desc Iterates over a given collection, running the provided function for each value in the collection. Returns an array of all function results at each index. +/// @param {Array|DS_Map|DS_List} collection The collection to map +/// @param {Script} script The script to map over the collection +/// @param {ds_type|String} optionalType ["array"] The type of collection. Only provide when using a DS +/// @returns {Array} An array of all mapped results +/* +@example + +var arr; +arr[0] = 1; arr[1] = 2; +_map(arr, doubleValue); +// => [2, 4]; + +var map = ds_map_create(); +ds_map_add(map, 'hello', 6); +ds_map_add(map, 'world', 10); +_map(map, divideByTwo, ds_type_map); +// => [3, 5] +*/ + +var collection = argument[0]; +var func = argument[1]; +var type = "array"; + +if (argument_count == 3) { + type = argument[2]; +} + +var resultArray; + +if (_isEqual(type, "array")) { + for (var i = 0; i < _length(collection); i++) { + resultArray[i] = _run(func, collection[i], i); + } + + return resultArray; +} else if (_isEqual(type, ds_type_map)) { + var keys = _keys(collection); + for (var i = 0; i < _length(keys); i++) { + resultArray[i] = _run(func, ds_map_find_value(collection, keys[i]), keys[i]); + } + return resultArray; +} else if (_isEqual(type, ds_type_list)) { + for (var i = 0; i < _length(collection); i++) { + resultArray[i] = _run(func, ds_list_find_value(collection, i), i); + } + return resultArray; +} + + diff --git a/src/gms2/gdash/scripts/_map/_map.yy b/src/gms2/gdash/scripts/_map/_map.yy new file mode 100644 index 0000000..bca7f90 --- /dev/null +++ b/src/gms2/gdash/scripts/_map/_map.yy @@ -0,0 +1,8 @@ +{ + "id": "e873aad6-9ebf-4686-823d-72033eff542a", + "modelName": "GMScript", + "mvc": "1.0", + "name": "_map", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/_partial/_partial.gml b/src/gms2/gdash/scripts/_partial/_partial.gml new file mode 100644 index 0000000..a1fd3dd --- /dev/null +++ b/src/gms2/gdash/scripts/_partial/_partial.gml @@ -0,0 +1,32 @@ +/// @desc Creates a partial function identifier for use in place of raw scripts in gdash functions, or with the use of _run. +/// Partials are to be treated as a data structure, and must be cleaned up with _free() when they are no longer of use. +/// @param {Script} script The script to create a partial of +/// @param {*} partialArguments... Arguments to bind to the partial +/// @returns {Real} The partial ID (a ds_map, internally) +/* +@example +// Script: lessThan +return argument1 < argument0 + +// Meanwhile... +var lessThanTwo = _partial(lessThan, 2); +lessThanTwo(1); +// => true + +lessThanTwo(10); +// => false + +*/ +var func = argument[0]; +var args; +for (var i = 1; i < argument_count; i++) { + args[i - 1] = argument[i]; +} + +var partial = ds_map_create(); +ds_map_add(partial, "function", func); +ds_map_add(partial, "args", args); +ds_map_add(partial, "partial", "partial"); + +return partial; + diff --git a/src/gms2/gdash/scripts/_partial/_partial.yy b/src/gms2/gdash/scripts/_partial/_partial.yy new file mode 100644 index 0000000..1d91d69 --- /dev/null +++ b/src/gms2/gdash/scripts/_partial/_partial.yy @@ -0,0 +1,8 @@ +{ + "id": "b5cea827-b3fd-48e4-9686-ccb08fd5d898", + "modelName": "GMScript", + "mvc": "1.0", + "name": "_partial", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/_push/_push.gml b/src/gms2/gdash/scripts/_push/_push.gml new file mode 100644 index 0000000..653df21 --- /dev/null +++ b/src/gms2/gdash/scripts/_push/_push.gml @@ -0,0 +1,16 @@ +/// @desc Adds a value to the end of an array +/// @param {Array} array The array to add the value to +/// @param {*} value The value to add +/// @returns {Array} The array with the value added +/* +@example +_push(_arrayOf(1, 2), 3); +// => [1, 2, 3] +*/ + +var arr = argument0; +var addMe = argument1; + +arr[_length(arr)] = addMe; +return arr; + diff --git a/src/gms2/gdash/scripts/_push/_push.yy b/src/gms2/gdash/scripts/_push/_push.yy new file mode 100644 index 0000000..df3993f --- /dev/null +++ b/src/gms2/gdash/scripts/_push/_push.yy @@ -0,0 +1,8 @@ +{ + "id": "bd7bc958-28aa-43a9-8251-81041ca0b631", + "modelName": "GMScript", + "mvc": "1.0", + "name": "_push", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/_reduce/_reduce.gml b/src/gms2/gdash/scripts/_reduce/_reduce.gml new file mode 100644 index 0000000..a9344a8 --- /dev/null +++ b/src/gms2/gdash/scripts/_reduce/_reduce.gml @@ -0,0 +1,26 @@ +/// @desc Reduces a collection by iterating over it with a function. Provided script should take 2 arguments: total, value. On the first call, total is undefined. +/// @param {Array} inputArray The array to reduce +/// @param {Script} recuderScript The script to reduce with +/// @returns {*} The reduced value from the given script +/* +@example +var arr = _arrayOf(1, 2, 3, 4, 5); +_reduce(arr, sum); +// => 15 + +var arr = _arrayOf('hello', 'world'); +_reduce(arr, concat); +// => 'helloworld'; +*/ + +var array = argument[0]; +var func = argument[1]; + +var result = _run(func, undefined, array[0]); + +for (var i = 1; i < _length(array); i++) { + result = _run(func, result, array[i]); +} + +return result; + diff --git a/src/gms2/gdash/scripts/_reduce/_reduce.yy b/src/gms2/gdash/scripts/_reduce/_reduce.yy new file mode 100644 index 0000000..f612228 --- /dev/null +++ b/src/gms2/gdash/scripts/_reduce/_reduce.yy @@ -0,0 +1,8 @@ +{ + "id": "477b2a17-84c8-4ddc-ba07-345ab325cd4f", + "modelName": "GMScript", + "mvc": "1.0", + "name": "_reduce", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/_run/_run.gml b/src/gms2/gdash/scripts/_run/_run.gml new file mode 100644 index 0000000..f09c13f --- /dev/null +++ b/src/gms2/gdash/scripts/_run/_run.gml @@ -0,0 +1,31 @@ +/// @desc Executes a script or partial with the provided arguments +/// @param {Script|Real} scriptOrPartial The script to run or the ID of the partial to run +/// @param {*} arguments... Arguments to pass the script +/// @returns {*} The return value of the script +/* +@example +_run(_add, 1, 2); +// => 3 + +var addTwo = _partial(_add, 2); +_run(addTwo, 1); +// => 3 +*/ + +var func = argument[0]; +var args = undefined; +for (var i = 1; i < argument_count; i++) { + args[i - 1] = argument[i]; +} + +// Check if func is a partial (map with 'partial' set to 'partial'); +if (ds_exists(func, ds_type_map) && _isEqual(ds_map_find_value(func, "partial"), "partial")) { + var partialId = func; + func = ds_map_find_value(partialId, "function"); + args = _concat(ds_map_find_value(partialId, "args"), args); +} + +return _spread(func, args); + + + diff --git a/src/gms2/gdash/scripts/_run/_run.yy b/src/gms2/gdash/scripts/_run/_run.yy new file mode 100644 index 0000000..e11d14d --- /dev/null +++ b/src/gms2/gdash/scripts/_run/_run.yy @@ -0,0 +1,8 @@ +{ + "id": "13bccc1f-b0d5-4ec9-aed0-4ec8f6d5078e", + "modelName": "GMScript", + "mvc": "1.0", + "name": "_run", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/_set/_set.gml b/src/gms2/gdash/scripts/_set/_set.gml new file mode 100644 index 0000000..e262209 --- /dev/null +++ b/src/gms2/gdash/scripts/_set/_set.gml @@ -0,0 +1,33 @@ +/// @descSets a nested value following a dot notation. Creates along the way if its not set. +/// @param {DS_Map} map The map to set data in +/// @param {String} locationString The location of the data to set +/// @param {Mixed} value The data to set +/* +@example +// someMap looks like: +// { nested: {three: {deep: 1}}} +_.set(someMap, 'nested.three.deep', 2); +// => someMap now looks like: +// => {nested: {three: {deep: 2}}} + +*/ + +var map = argument0; +var location = argument1; +var value = argument2; +var locationArray = _split(location, "."); +var finalLocation = locationArray[_length(locationArray) - 1]; + +var temp = map; +for (var i = 0; i < _length(locationArray) - 1; i++) { + var thisLoc = locationArray[i]; + var prev = temp; + temp = temp[? thisLoc]; + if (is_undefined(temp)) { + ds_map_add_map(prev, thisLoc, ds_map_create()); + temp = prev[? thisLoc]; + } +} + +temp[? finalLocation] = value; + diff --git a/src/gms2/gdash/scripts/_set/_set.yy b/src/gms2/gdash/scripts/_set/_set.yy new file mode 100644 index 0000000..dc058be --- /dev/null +++ b/src/gms2/gdash/scripts/_set/_set.yy @@ -0,0 +1,8 @@ +{ + "id": "46c29120-6d6b-44ea-86b8-afacfb700cae", + "modelName": "GMScript", + "mvc": "1.0", + "name": "_set", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/_split/_split.gml b/src/gms2/gdash/scripts/_split/_split.gml new file mode 100644 index 0000000..a2c6761 --- /dev/null +++ b/src/gms2/gdash/scripts/_split/_split.gml @@ -0,0 +1,30 @@ +/// @desc Returns an array of strings represnting the given string separated by a given substring +/// @param {String} string The string to split +/// @param {String} splitChar The character to split by +/// @returns {Array} The split string +/* +@example +_split('Hello, world', ','); +// => ['Hello', ' world'] + +_split('Dogs and cats and mice', ' and '); +// => ['Dogs', 'cats', 'mice'] +*/ + +var inputString = argument0; +var splitter = argument1; +var splitterLength = _length(splitter); +var output; +var count = 0; + +while (string_pos(splitter, inputString) > 0) { + var splitterLocation = string_pos(splitter, inputString); + var part = string_copy(inputString, 1, splitterLocation - 1); + output[count] = part; + count++; + inputString = string_delete(inputString, 1, splitterLocation + _length(splitter) - 1); +} + +output[count] = inputString; +return output; + diff --git a/src/gms2/gdash/scripts/_split/_split.yy b/src/gms2/gdash/scripts/_split/_split.yy new file mode 100644 index 0000000..0a11e98 --- /dev/null +++ b/src/gms2/gdash/scripts/_split/_split.yy @@ -0,0 +1,8 @@ +{ + "id": "a1387e7d-9ef7-458e-8194-e706a534715b", + "modelName": "GMScript", + "mvc": "1.0", + "name": "_split", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/_spread/_spread.gml b/src/gms2/gdash/scripts/_spread/_spread.gml new file mode 100644 index 0000000..dbeccf1 --- /dev/null +++ b/src/gms2/gdash/scripts/_spread/_spread.gml @@ -0,0 +1,53 @@ +/// @desc Runs a script with the provided array as arguments +/// Note: This script is disgusting, but useful. +/// @param {Script} script The script to run +/// @param {Array} arrayOfArguments An array to provide as individual arguments +/// @return {*} The return value of the script +/* +@example +_spread(ds_list_add, _arrayOf(listId, 1, 2, 3, 4)); +// => List now contains 1, 2, 3, 4 +*/ + +var func = argument[0]; + +if (is_undefined(argument1)) { + return script_execute(func); +} + +var args = argument[1]; +switch (_length(args)) { + case 1: + return script_execute(func, args[0]); + case 2: + return script_execute(func, args[0], args[1]); + case 3: + return script_execute(func, args[0], args[1], args[2]); + case 4: + return script_execute(func, args[0], args[1], args[2], args[3]); + case 5: + return script_execute(func, args[0], args[1], args[2], args[3], args[4]); + case 6: + return script_execute(func, args[0], args[1], args[2], args[3], args[4], args[5]); + case 7: + return script_execute(func, args[0], args[1], args[2], args[3], args[4], args[5], args[6]); + case 8: + return script_execute(func, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]); + case 9: + return script_execute(func, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8]); + case 10: + return script_execute(func, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9]); + case 11: + return script_execute(func, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9], args[10]); + case 12: + return script_execute(func, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9], args[10], args[11]); + case 13: + return script_execute(func, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9], args[10], args[11], args[12]); + case 14: + return script_execute(func, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9], args[10], args[11], args[12], args[13]); + case 15: + return script_execute(func, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9], args[10], args[11], args[12], args[13], args[14]); +} + + + diff --git a/src/gms2/gdash/scripts/_spread/_spread.yy b/src/gms2/gdash/scripts/_spread/_spread.yy new file mode 100644 index 0000000..779e632 --- /dev/null +++ b/src/gms2/gdash/scripts/_spread/_spread.yy @@ -0,0 +1,8 @@ +{ + "id": "8d7b1a7b-dadd-486c-9b21-deffc695e159", + "modelName": "GMScript", + "mvc": "1.0", + "name": "_spread", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/_times/_times.gml b/src/gms2/gdash/scripts/_times/_times.gml new file mode 100644 index 0000000..cb3eb24 --- /dev/null +++ b/src/gms2/gdash/scripts/_times/_times.gml @@ -0,0 +1,21 @@ +/// @desc Returns an array of the result of a function run the given number of times +/// @param {Real} executeCount The number of times to execute the function +/// @param {Script} script The script to execute +/// @returns {Array} An array of the script results +/* +@example +_times(3, returnTheValue5); +// => [5, 5, 5]; + +*/ +var count = argument[0]; +var func = argument[1]; + +var arr; + +for (var i = 0; i < count; i++) { + arr[i] = _run(func, i); +} + +return arr; + diff --git a/src/gms2/gdash/scripts/_times/_times.yy b/src/gms2/gdash/scripts/_times/_times.yy new file mode 100644 index 0000000..1eafcec --- /dev/null +++ b/src/gms2/gdash/scripts/_times/_times.yy @@ -0,0 +1,8 @@ +{ + "id": "eeb441d7-af5e-4ceb-a389-32557c90856f", + "modelName": "GMScript", + "mvc": "1.0", + "name": "_times", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/_typeOf/_typeOf.gml b/src/gms2/gdash/scripts/_typeOf/_typeOf.gml new file mode 100644 index 0000000..df0bc5e --- /dev/null +++ b/src/gms2/gdash/scripts/_typeOf/_typeOf.gml @@ -0,0 +1,38 @@ +/// @desc Returns the variable type of the given argument +/// @param {*} value A variable to check the type of +/// @returns {String} The type of the variable as a human readable string +/* +@example + +_typeOf(1); +// => "real" + +_typeOf("hello"); +// => "string" + +var arr; +arr[0] = 1; arr[1] = 2; +_typeOf(arr); +// => "array" + +_typeOf(undefined); +// => "undefined"; + +_typeOf(sprite_get_texture(spr_player, 1)); +// => "pointer"; +*/ + +if (is_string(argument0)) { + return "string"; +} else if (is_array(argument0)) { + return "array"; +} else if (is_ptr(argument0)) { + return "pointer"; +} else if (is_undefined(argument0)) { + return "undefined"; +} else if (is_real(argument0)) { + return "real"; +} + + + diff --git a/src/gms2/gdash/scripts/_typeOf/_typeOf.yy b/src/gms2/gdash/scripts/_typeOf/_typeOf.yy new file mode 100644 index 0000000..bea2c80 --- /dev/null +++ b/src/gms2/gdash/scripts/_typeOf/_typeOf.yy @@ -0,0 +1,8 @@ +{ + "id": "1ba92935-c21d-4159-91a1-0a778afcbcf6", + "modelName": "GMScript", + "mvc": "1.0", + "name": "_typeOf", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/_uniq/_uniq.gml b/src/gms2/gdash/scripts/_uniq/_uniq.gml new file mode 100644 index 0000000..08197a3 --- /dev/null +++ b/src/gms2/gdash/scripts/_uniq/_uniq.gml @@ -0,0 +1,21 @@ +/// @desc Returns an array with all duplicate values removed +/// @param {Array} array An array with duplicate values +/// @returns {Array} An array with the duplicate values removed +/* +@example +_uniq(_arrayOf(1, 1, 2, 3)); +// => [1, 2, 3] +*/ + +var arr = argument0; +var result = undefined; + +for (var i = 0; i < _length(arr); i++) { + if (!_contains(result, arr[i])) { + result = _push(result, arr[i]); + } +} + +return result; + + diff --git a/src/gms2/gdash/scripts/_uniq/_uniq.yy b/src/gms2/gdash/scripts/_uniq/_uniq.yy new file mode 100644 index 0000000..8d49565 --- /dev/null +++ b/src/gms2/gdash/scripts/_uniq/_uniq.yy @@ -0,0 +1,8 @@ +{ + "id": "ec3ab82c-0beb-45ba-97e5-236df32ca017", + "modelName": "GMScript", + "mvc": "1.0", + "name": "_uniq", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/assert/assert.gml b/src/gms2/gdash/scripts/assert/assert.gml new file mode 100644 index 0000000..b457f20 --- /dev/null +++ b/src/gms2/gdash/scripts/assert/assert.gml @@ -0,0 +1,21 @@ +/* + * Ensures the passed in argument0 evalutates to argument1. + * If it fails, it will log an error and fail the test. + * + * Example: + * var player = instance_create(0, 0, obj_player); + * player.health = 100; + * hurt_player(10); + * assert(player.health, 90); + */ + +global.testAssertNumber++; +if (argument_count == 1) { + if (argument[0] != true) { + var msg = create_assert_error(string(argument[0]) + " is not true"); + test_fail(msg); + } +} else if (argument[0] != argument[1]) { + var msg = create_assert_error(string(argument[0]) + " is not " + string(argument[1])); + test_fail(msg); +} diff --git a/src/gms2/gdash/scripts/assert/assert.yy b/src/gms2/gdash/scripts/assert/assert.yy new file mode 100644 index 0000000..791848d --- /dev/null +++ b/src/gms2/gdash/scripts/assert/assert.yy @@ -0,0 +1,8 @@ +{ + "id": "d6c7075b-43fa-455a-8242-42de8f43b800", + "modelName": "GMScript", + "mvc": "1.0", + "name": "assert", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/assert_does_not_exist/assert_does_not_exist.gml b/src/gms2/gdash/scripts/assert_does_not_exist/assert_does_not_exist.gml new file mode 100644 index 0000000..61d1f2a --- /dev/null +++ b/src/gms2/gdash/scripts/assert_does_not_exist/assert_does_not_exist.gml @@ -0,0 +1,13 @@ +/* + * Ensures that an instance of the given object exists. + * If it fails, it will log an error and fail the test. + * + * Example: + * kill_boss(); + * assert_does_not_exist(obj_boss); + */ +global.testAssertNumber++; +if (instance_exists(argument0)) { + var msg = create_assert_error(string(argument0) + " should not exist"); + test_fail(msg); +} diff --git a/src/gms2/gdash/scripts/assert_does_not_exist/assert_does_not_exist.yy b/src/gms2/gdash/scripts/assert_does_not_exist/assert_does_not_exist.yy new file mode 100644 index 0000000..2bac38c --- /dev/null +++ b/src/gms2/gdash/scripts/assert_does_not_exist/assert_does_not_exist.yy @@ -0,0 +1,8 @@ +{ + "id": "0901360a-a162-4c78-b640-eb7ae5bd87e1", + "modelName": "GMScript", + "mvc": "1.0", + "name": "assert_does_not_exist", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/assert_exists/assert_exists.gml b/src/gms2/gdash/scripts/assert_exists/assert_exists.gml new file mode 100644 index 0000000..fd70459 --- /dev/null +++ b/src/gms2/gdash/scripts/assert_exists/assert_exists.gml @@ -0,0 +1,13 @@ +/* + * Ensures that an instance of the given object exists. + * If it fails, it will log an error and fail the test. + * + * Example: + * spawn_boss(); + * assert_exists(obj_boss); + */ +global.testAssertNumber++; +if (!instance_exists(argument0)) { + var msg = create_assert_error(string(argument0) + " has no instances"); + test_fail(msg); +} diff --git a/src/gms2/gdash/scripts/assert_exists/assert_exists.yy b/src/gms2/gdash/scripts/assert_exists/assert_exists.yy new file mode 100644 index 0000000..2f87910 --- /dev/null +++ b/src/gms2/gdash/scripts/assert_exists/assert_exists.yy @@ -0,0 +1,8 @@ +{ + "id": "0b6ab207-c224-4f47-915c-8286414f04b1", + "modelName": "GMScript", + "mvc": "1.0", + "name": "assert_exists", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/assert_not/assert_not.gml b/src/gms2/gdash/scripts/assert_not/assert_not.gml new file mode 100644 index 0000000..725e9b9 --- /dev/null +++ b/src/gms2/gdash/scripts/assert_not/assert_not.gml @@ -0,0 +1,21 @@ +/* + * Ensures the passed in argument0 does not evalutate to argument1. + * If it fails, it will log an error and fail the test. + * + * Example: + * var player = instance_create(0, 0, obj_player); + * var previous_health = player.health; + * deal_random_damage(player); + * assert_not(player.health, previous_health); + */ + +global.testAssertNumber++; +if (argument_count == 1) { + if (argument[0] == true) { + var msg = create_assert_error(string(argument[0]) + " shouldn\'t be true"); + test_fail(msg); + } +} else if (argument[0] == argument[1]) { + var msg = create_assert_error(string(argument[0]) + " shouldn\'t be " + string(argument[1])); + test_fail(msg); +} diff --git a/src/gms2/gdash/scripts/assert_not/assert_not.yy b/src/gms2/gdash/scripts/assert_not/assert_not.yy new file mode 100644 index 0000000..cfd0101 --- /dev/null +++ b/src/gms2/gdash/scripts/assert_not/assert_not.yy @@ -0,0 +1,8 @@ +{ + "id": "42399293-59c8-4d21-9b4c-ebca4668426b", + "modelName": "GMScript", + "mvc": "1.0", + "name": "assert_not", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/create_assert_error/create_assert_error.gml b/src/gms2/gdash/scripts/create_assert_error/create_assert_error.gml new file mode 100644 index 0000000..00320fe --- /dev/null +++ b/src/gms2/gdash/scripts/create_assert_error/create_assert_error.gml @@ -0,0 +1,5 @@ +/* + * Helper method for asserts to create standardized error + * messages. Not meant for external use. + */ +return "ASSERT ERROR - " + string(argument0) + " - ASSERT #" + string(global.testAssertNumber); diff --git a/src/gms2/gdash/scripts/create_assert_error/create_assert_error.yy b/src/gms2/gdash/scripts/create_assert_error/create_assert_error.yy new file mode 100644 index 0000000..e91e0f1 --- /dev/null +++ b/src/gms2/gdash/scripts/create_assert_error/create_assert_error.yy @@ -0,0 +1,8 @@ +{ + "id": "37a9a856-63f6-44d9-91f7-ae3bda6f0d00", + "modelName": "GMScript", + "mvc": "1.0", + "name": "create_assert_error", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/describe/describe.gml b/src/gms2/gdash/scripts/describe/describe.gml new file mode 100644 index 0000000..336021f --- /dev/null +++ b/src/gms2/gdash/scripts/describe/describe.gml @@ -0,0 +1,14 @@ +/* + * Sets the description of the currently running test or exits + * if the previous test fails. Use this to define specific tests + * within a given test suite. + * Example: + * describe("Player Death", "The player should die at 0 health"); + */ +if (global.testPassed) { + global.testName = argument0; + global.testDescription = argument1; + global.testCount++; +} else { + game_end(); +} diff --git a/src/gms2/gdash/scripts/describe/describe.yy b/src/gms2/gdash/scripts/describe/describe.yy new file mode 100644 index 0000000..ee7b71c --- /dev/null +++ b/src/gms2/gdash/scripts/describe/describe.yy @@ -0,0 +1,8 @@ +{ + "id": "e0fc46fa-4a3f-4dff-9f7c-bbbacf49757e", + "modelName": "GMScript", + "mvc": "1.0", + "name": "describe", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/info/info.gml b/src/gms2/gdash/scripts/info/info.gml new file mode 100644 index 0000000..d7699f3 --- /dev/null +++ b/src/gms2/gdash/scripts/info/info.gml @@ -0,0 +1,10 @@ +/* + * Simplified logging. Prints all arguments to the output console. + * If you are not using a version of GameMaker with an output console, you + * may want to edit this script to output to a file or something else. + */ +var output = string(argument[0]); +for (var i = 1; i < argument_count; i++) { + output += " " + string(argument[i]) +} +show_debug_message(output); diff --git a/src/gms2/gdash/scripts/info/info.yy b/src/gms2/gdash/scripts/info/info.yy new file mode 100644 index 0000000..222ae74 --- /dev/null +++ b/src/gms2/gdash/scripts/info/info.yy @@ -0,0 +1,8 @@ +{ + "id": "c9e911b4-e0a5-44b2-94f6-6a6dc9106a01", + "modelName": "GMScript", + "mvc": "1.0", + "name": "info", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/int_to_event/int_to_event.gml b/src/gms2/gdash/scripts/int_to_event/int_to_event.gml new file mode 100644 index 0000000..72d9635 --- /dev/null +++ b/src/gms2/gdash/scripts/int_to_event/int_to_event.gml @@ -0,0 +1,60 @@ +/* Converts a number to an ev_user event + + Arguments: + 0 - Event number +*/ + +switch (argument0) { + case 0: + return ev_user0; + break; + case 1: + return ev_user1; + break; + case 2: + return ev_user2; + break; + case 3: + return ev_user3; + break; + case 4: + return ev_user4; + break; + case 5: + return ev_user5; + break; + case 6: + return ev_user6; + break; + case 7: + return ev_user7; + break; + case 8: + return ev_user8; + break; + case 9: + return ev_user9; + break; + case 10: + return ev_user10; + break; + case 11: + return ev_user11; + break; + case 12: + return ev_user12; + break; + case 13: + return ev_user13; + break; + case 14: + return ev_user14; + break; + case 15: + return ev_user15; + break; + default: + return ev_user0; + break; +} + diff --git a/src/gms2/gdash/scripts/int_to_event/int_to_event.yy b/src/gms2/gdash/scripts/int_to_event/int_to_event.yy new file mode 100644 index 0000000..1e552de --- /dev/null +++ b/src/gms2/gdash/scripts/int_to_event/int_to_event.yy @@ -0,0 +1,8 @@ +{ + "id": "a406ae11-12ec-49cd-b1cc-45a333ccd935", + "modelName": "GMScript", + "mvc": "1.0", + "name": "int_to_event", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/macros/macros.gml b/src/gms2/gdash/scripts/macros/macros.gml new file mode 100644 index 0000000..e69de29 diff --git a/src/gms2/gdash/scripts/macros/macros.yy b/src/gms2/gdash/scripts/macros/macros.yy new file mode 100644 index 0000000..9099c91 --- /dev/null +++ b/src/gms2/gdash/scripts/macros/macros.yy @@ -0,0 +1,8 @@ +{ + "id": "6d5ae3be-c018-4481-abe0-66e69da4ed59", + "modelName": "GMScript", + "mvc": "1.0", + "name": "macros", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/test_end/test_end.gml b/src/gms2/gdash/scripts/test_end/test_end.gml new file mode 100644 index 0000000..fb0b60b --- /dev/null +++ b/src/gms2/gdash/scripts/test_end/test_end.gml @@ -0,0 +1,13 @@ +/* + * Concludes an individual test in a test suite. + * If the test passed, prints a success message and moves on + * to the next test, otherwise, fails the test and exits. + */ +if (global.testPassed) { + info("TEST PASSED: " + global.testName); + test_next(); +} else { + info("TEST FAILED: " + global.testName); + info("TEST SUITE FAILED: " + global.testSuiteName); + game_end(); +} diff --git a/src/gms2/gdash/scripts/test_end/test_end.yy b/src/gms2/gdash/scripts/test_end/test_end.yy new file mode 100644 index 0000000..e7f35e3 --- /dev/null +++ b/src/gms2/gdash/scripts/test_end/test_end.yy @@ -0,0 +1,8 @@ +{ + "id": "ba3e7b6b-21ed-494e-971b-cb1b202bd637", + "modelName": "GMScript", + "mvc": "1.0", + "name": "test_end", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/test_fail/test_fail.gml b/src/gms2/gdash/scripts/test_fail/test_fail.gml new file mode 100644 index 0000000..6f10129 --- /dev/null +++ b/src/gms2/gdash/scripts/test_fail/test_fail.gml @@ -0,0 +1,10 @@ +/* + * Fails a test, printing the message and test info. This is used + * internally by asserts, but can also be used to manually fail + * tests if need be. + */ + var msg = argument0; +info(msg); +info("In suite " + global.testSuiteName); +info("In test " + global.testName + ": " + global.testDescription); +global.testPassed = false; diff --git a/src/gms2/gdash/scripts/test_fail/test_fail.yy b/src/gms2/gdash/scripts/test_fail/test_fail.yy new file mode 100644 index 0000000..5c35093 --- /dev/null +++ b/src/gms2/gdash/scripts/test_fail/test_fail.yy @@ -0,0 +1,8 @@ +{ + "id": "0a73cea8-e08e-4ed5-b60e-dbf42d1ac111", + "modelName": "GMScript", + "mvc": "1.0", + "name": "test_fail", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/test_init/test_init.gml b/src/gms2/gdash/scripts/test_init/test_init.gml new file mode 100644 index 0000000..153354b --- /dev/null +++ b/src/gms2/gdash/scripts/test_init/test_init.gml @@ -0,0 +1,10 @@ +/* + * Initializes a test in an empty room + */ +global.testPassed = true; +global.testCount = 0; +global.testSuiteName = argument0; +global.testNumber = 0; +global.testAssertNumber = 0; +info("TESTING SUITE: " + argument0); +test_next(); diff --git a/src/gms2/gdash/scripts/test_init/test_init.yy b/src/gms2/gdash/scripts/test_init/test_init.yy new file mode 100644 index 0000000..e216a30 --- /dev/null +++ b/src/gms2/gdash/scripts/test_init/test_init.yy @@ -0,0 +1,8 @@ +{ + "id": "e811c9f1-b116-489f-940c-6e2575a6fc0b", + "modelName": "GMScript", + "mvc": "1.0", + "name": "test_init", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/test_next/test_next.gml b/src/gms2/gdash/scripts/test_next/test_next.gml new file mode 100644 index 0000000..ab83225 --- /dev/null +++ b/src/gms2/gdash/scripts/test_next/test_next.gml @@ -0,0 +1,7 @@ +/* + * Kicks off the next test in a suite (the next user defined + * action). Used internally in end_test(). Use directly with + * caution, as this is not supported for direct developer use + * within the test automation suite. + */ +event_perform(ev_other, int_to_event(global.testNumber++)); diff --git a/src/gms2/gdash/scripts/test_next/test_next.yy b/src/gms2/gdash/scripts/test_next/test_next.yy new file mode 100644 index 0000000..0ca103b --- /dev/null +++ b/src/gms2/gdash/scripts/test_next/test_next.yy @@ -0,0 +1,8 @@ +{ + "id": "a257ac2f-1258-4606-a6c6-a51a5aaf32b2", + "modelName": "GMScript", + "mvc": "1.0", + "name": "test_next", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/scripts/test_suite_pass/test_suite_pass.gml b/src/gms2/gdash/scripts/test_suite_pass/test_suite_pass.gml new file mode 100644 index 0000000..35b33f6 --- /dev/null +++ b/src/gms2/gdash/scripts/test_suite_pass/test_suite_pass.gml @@ -0,0 +1,12 @@ +/* + * Finishes the test suite and moves on if there are more tests/rooms, + * otherwise, quits. This should be called by itself in the last user + * defined action on your test controller object. + */ +info("TEST SUITE PASSED: " + global.testSuiteName); +if (room != room_last) { + room_goto_next(); +} else { + info("ALL TESTS PASSING"); + game_end(); +} diff --git a/src/gms2/gdash/scripts/test_suite_pass/test_suite_pass.yy b/src/gms2/gdash/scripts/test_suite_pass/test_suite_pass.yy new file mode 100644 index 0000000..f601606 --- /dev/null +++ b/src/gms2/gdash/scripts/test_suite_pass/test_suite_pass.yy @@ -0,0 +1,8 @@ +{ + "id": "dbf428c1-1e51-44a8-81d8-8099f5757ec1", + "modelName": "GMScript", + "mvc": "1.0", + "name": "test_suite_pass", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/src/gms2/gdash/views/03e6bf78-c9fc-4f10-9549-7dc253ca0bfc.yy b/src/gms2/gdash/views/03e6bf78-c9fc-4f10-9549-7dc253ca0bfc.yy new file mode 100644 index 0000000..b9b7f41 --- /dev/null +++ b/src/gms2/gdash/views/03e6bf78-c9fc-4f10-9549-7dc253ca0bfc.yy @@ -0,0 +1,17 @@ +{ + "id": "03e6bf78-c9fc-4f10-9549-7dc253ca0bfc", + "modelName": "GMFolder", + "mvc": "1.1", + "name": "03e6bf78-c9fc-4f10-9549-7dc253ca0bfc", + "children": [ + "a44c3458-a344-402c-8fd1-6eff64583bc8", + "71fc0e7e-ac29-4c46-920e-a07621c9158d", + "2e2daba8-4764-4076-8526-b2528785accc", + "73ab2ea6-b1dd-40ce-9fb0-1356bcff5f3e", + "6674cf91-7ea3-4e59-9ebf-1f0caf512692" + ], + "filterType": "GMScript", + "folderName": "test_functions", + "isDefaultView": false, + "localisedFolderName": "" +} \ No newline at end of file diff --git a/src/gms2/gdash/views/06188c03-8a58-4be1-b30b-7286b73779ee.yy b/src/gms2/gdash/views/06188c03-8a58-4be1-b30b-7286b73779ee.yy new file mode 100644 index 0000000..674e64e --- /dev/null +++ b/src/gms2/gdash/views/06188c03-8a58-4be1-b30b-7286b73779ee.yy @@ -0,0 +1,13 @@ +{ + "id": "06188c03-8a58-4be1-b30b-7286b73779ee", + "modelName": "GMFolder", + "mvc": "1.1", + "name": "06188c03-8a58-4be1-b30b-7286b73779ee", + "children": [ + + ], + "filterType": "GMTileSet", + "folderName": "tilesets", + "isDefaultView": false, + "localisedFolderName": "ResourceTree_Tilesets" +} \ No newline at end of file diff --git a/src/gms2/gdash/views/2481bf08-af5f-487f-8ba3-de56222d643f.yy b/src/gms2/gdash/views/2481bf08-af5f-487f-8ba3-de56222d643f.yy new file mode 100644 index 0000000..3a2adc6 --- /dev/null +++ b/src/gms2/gdash/views/2481bf08-af5f-487f-8ba3-de56222d643f.yy @@ -0,0 +1,27 @@ +{ + "id": "2481bf08-af5f-487f-8ba3-de56222d643f", + "modelName": "GMFolder", + "mvc": "1.1", + "name": "2481bf08-af5f-487f-8ba3-de56222d643f", + "children": [ + "3d4c1a45-cb51-440d-93f7-4508fb15da2d", + "06188c03-8a58-4be1-b30b-7286b73779ee", + "aaa232fc-30a0-4c62-950f-a776d3fef239", + "ef1f07da-8677-4904-9251-8af85ce5ae10", + "c180f1aa-9fbf-4693-a798-00a3c87790d1", + "ecfa581b-ebf3-43f2-b17d-cd091ea11541", + "a4eea40d-a933-497b-b91f-7e386fa9a986", + "5f7a0fdf-5764-4afb-8e56-a4e70ee39bd9", + "94736fe3-0d88-4094-9ad3-af09d1fd4782", + "3df7296c-6ac7-4b71-8f67-7202521cb283", + "cfd80378-4324-4b7a-9b8d-fd071e4b1e80", + "47c9dcf3-db98-49b6-b391-9e8d4ad93ccb", + "dc6060fd-690b-4fe2-8ac8-c86faf2e04c0", + "2c55db64-9b48-4e9d-946e-d61128133698", + "411563b4-d20f-4313-8e25-baafa8501c71" + ], + "filterType": "root", + "folderName": "Default", + "isDefaultView": true, + "localisedFolderName": "" +} \ No newline at end of file diff --git a/src/gms2/gdash/views/2c55db64-9b48-4e9d-946e-d61128133698.yy b/src/gms2/gdash/views/2c55db64-9b48-4e9d-946e-d61128133698.yy new file mode 100644 index 0000000..41b7a2a --- /dev/null +++ b/src/gms2/gdash/views/2c55db64-9b48-4e9d-946e-d61128133698.yy @@ -0,0 +1,16 @@ +{ + "id": "2c55db64-9b48-4e9d-946e-d61128133698", + "modelName": "GMFolder", + "mvc": "1.1", + "name": "2c55db64-9b48-4e9d-946e-d61128133698", + "children": [ + "ed6a955d-5826-4f98-a450-10b414266c27", + "a9188620-a624-4a5a-83ae-a1b53faf038b", + "cc98d028-7bdd-4680-85f3-c87a7baa481e", + "f418569b-3bdd-4706-a0e4-364317f54032" + ], + "filterType": "GMOptions", + "folderName": "options", + "isDefaultView": false, + "localisedFolderName": "ResourceTree_Options" +} \ No newline at end of file diff --git a/src/gms2/gdash/views/3d4c1a45-cb51-440d-93f7-4508fb15da2d.yy b/src/gms2/gdash/views/3d4c1a45-cb51-440d-93f7-4508fb15da2d.yy new file mode 100644 index 0000000..0ba27bd --- /dev/null +++ b/src/gms2/gdash/views/3d4c1a45-cb51-440d-93f7-4508fb15da2d.yy @@ -0,0 +1,13 @@ +{ + "id": "3d4c1a45-cb51-440d-93f7-4508fb15da2d", + "modelName": "GMFolder", + "mvc": "1.1", + "name": "3d4c1a45-cb51-440d-93f7-4508fb15da2d", + "children": [ + + ], + "filterType": "GMSprite", + "folderName": "sprites", + "isDefaultView": false, + "localisedFolderName": "ResourceTree_Sprites" +} \ No newline at end of file diff --git a/src/gms2/gdash/views/3df7296c-6ac7-4b71-8f67-7202521cb283.yy b/src/gms2/gdash/views/3df7296c-6ac7-4b71-8f67-7202521cb283.yy new file mode 100644 index 0000000..c70741c --- /dev/null +++ b/src/gms2/gdash/views/3df7296c-6ac7-4b71-8f67-7202521cb283.yy @@ -0,0 +1,13 @@ +{ + "id": "3df7296c-6ac7-4b71-8f67-7202521cb283", + "modelName": "GMFolder", + "mvc": "1.1", + "name": "3df7296c-6ac7-4b71-8f67-7202521cb283", + "children": [ + "e80bc793-727b-4912-80cd-2a9381ae60e5" + ], + "filterType": "GMRoom", + "folderName": "rooms", + "isDefaultView": false, + "localisedFolderName": "ResourceTree_Rooms" +} \ No newline at end of file diff --git a/src/gms2/gdash/views/411563b4-d20f-4313-8e25-baafa8501c71.yy b/src/gms2/gdash/views/411563b4-d20f-4313-8e25-baafa8501c71.yy new file mode 100644 index 0000000..536f674 --- /dev/null +++ b/src/gms2/gdash/views/411563b4-d20f-4313-8e25-baafa8501c71.yy @@ -0,0 +1,13 @@ +{ + "id": "411563b4-d20f-4313-8e25-baafa8501c71", + "modelName": "GMFolder", + "mvc": "1.1", + "name": "411563b4-d20f-4313-8e25-baafa8501c71", + "children": [ + + ], + "filterType": "GMConfig", + "folderName": "configs", + "isDefaultView": false, + "localisedFolderName": "ResourceTree_Configs" +} \ No newline at end of file diff --git a/src/gms2/gdash/views/47c9dcf3-db98-49b6-b391-9e8d4ad93ccb.yy b/src/gms2/gdash/views/47c9dcf3-db98-49b6-b391-9e8d4ad93ccb.yy new file mode 100644 index 0000000..6d09db1 --- /dev/null +++ b/src/gms2/gdash/views/47c9dcf3-db98-49b6-b391-9e8d4ad93ccb.yy @@ -0,0 +1,13 @@ +{ + "id": "47c9dcf3-db98-49b6-b391-9e8d4ad93ccb", + "modelName": "GMFolder", + "mvc": "1.1", + "name": "47c9dcf3-db98-49b6-b391-9e8d4ad93ccb", + "children": [ + + ], + "filterType": "GMIncludedFile", + "folderName": "datafiles", + "isDefaultView": false, + "localisedFolderName": "ResourceTree_IncludedFiles" +} \ No newline at end of file diff --git a/src/gms2/gdash/views/4b2720a1-e8f2-435e-b526-fecdfa79b961.yy b/src/gms2/gdash/views/4b2720a1-e8f2-435e-b526-fecdfa79b961.yy new file mode 100644 index 0000000..cce6c9a --- /dev/null +++ b/src/gms2/gdash/views/4b2720a1-e8f2-435e-b526-fecdfa79b961.yy @@ -0,0 +1,25 @@ +{ + "id": "4b2720a1-e8f2-435e-b526-fecdfa79b961", + "modelName": "GMFolder", + "mvc": "1.1", + "name": "4b2720a1-e8f2-435e-b526-fecdfa79b961", + "children": [ + "d6c7075b-43fa-455a-8242-42de8f43b800", + "0901360a-a162-4c78-b640-eb7ae5bd87e1", + "0b6ab207-c224-4f47-915c-8286414f04b1", + "42399293-59c8-4d21-9b4c-ebca4668426b", + "37a9a856-63f6-44d9-91f7-ae3bda6f0d00", + "e0fc46fa-4a3f-4dff-9f7c-bbbacf49757e", + "c9e911b4-e0a5-44b2-94f6-6a6dc9106a01", + "a406ae11-12ec-49cd-b1cc-45a333ccd935", + "ba3e7b6b-21ed-494e-971b-cb1b202bd637", + "0a73cea8-e08e-4ed5-b60e-dbf42d1ac111", + "e811c9f1-b116-489f-940c-6e2575a6fc0b", + "a257ac2f-1258-4606-a6c6-a51a5aaf32b2", + "dbf428c1-1e51-44a8-81d8-8099f5757ec1" + ], + "filterType": "GMScript", + "folderName": "gamatas", + "isDefaultView": false, + "localisedFolderName": "" +} \ No newline at end of file diff --git a/src/gms2/gdash/views/505546f7-b585-45b1-b369-4161fccd19b6.yy b/src/gms2/gdash/views/505546f7-b585-45b1-b369-4161fccd19b6.yy new file mode 100644 index 0000000..cf78dcf --- /dev/null +++ b/src/gms2/gdash/views/505546f7-b585-45b1-b369-4161fccd19b6.yy @@ -0,0 +1,13 @@ +{ + "id": "505546f7-b585-45b1-b369-4161fccd19b6", + "modelName": "GMFolder", + "mvc": "1.1", + "name": "505546f7-b585-45b1-b369-4161fccd19b6", + "children": [ + "565a36f1-6705-454d-b56c-3f536baa2e0e" + ], + "filterType": "GMScript", + "folderName": "instance", + "isDefaultView": false, + "localisedFolderName": "" +} \ No newline at end of file diff --git a/src/gms2/gdash/views/5f7a0fdf-5764-4afb-8e56-a4e70ee39bd9.yy b/src/gms2/gdash/views/5f7a0fdf-5764-4afb-8e56-a4e70ee39bd9.yy new file mode 100644 index 0000000..2b68daf --- /dev/null +++ b/src/gms2/gdash/views/5f7a0fdf-5764-4afb-8e56-a4e70ee39bd9.yy @@ -0,0 +1,13 @@ +{ + "id": "5f7a0fdf-5764-4afb-8e56-a4e70ee39bd9", + "modelName": "GMFolder", + "mvc": "1.1", + "name": "5f7a0fdf-5764-4afb-8e56-a4e70ee39bd9", + "children": [ + + ], + "filterType": "GMTimeline", + "folderName": "timelines", + "isDefaultView": false, + "localisedFolderName": "ResourceTree_Timelines" +} \ No newline at end of file diff --git a/src/gms2/gdash/views/64593d4e-15ef-4f3d-8662-12fd73e7efe9.yy b/src/gms2/gdash/views/64593d4e-15ef-4f3d-8662-12fd73e7efe9.yy new file mode 100644 index 0000000..59c4dc4 --- /dev/null +++ b/src/gms2/gdash/views/64593d4e-15ef-4f3d-8662-12fd73e7efe9.yy @@ -0,0 +1,13 @@ +{ + "id": "64593d4e-15ef-4f3d-8662-12fd73e7efe9", + "modelName": "GMFolder", + "mvc": "1.1", + "name": "64593d4e-15ef-4f3d-8662-12fd73e7efe9", + "children": [ + "bd2b952d-8cfc-4ace-9fb7-13e008ec8523" + ], + "filterType": "GMScript", + "folderName": "object", + "isDefaultView": false, + "localisedFolderName": "" +} \ No newline at end of file diff --git a/src/gms2/gdash/views/89db00f9-3361-426a-ba04-cae6a2664a3e.yy b/src/gms2/gdash/views/89db00f9-3361-426a-ba04-cae6a2664a3e.yy new file mode 100644 index 0000000..dd65c6b --- /dev/null +++ b/src/gms2/gdash/views/89db00f9-3361-426a-ba04-cae6a2664a3e.yy @@ -0,0 +1,15 @@ +{ + "id": "89db00f9-3361-426a-ba04-cae6a2664a3e", + "modelName": "GMFolder", + "mvc": "1.1", + "name": "89db00f9-3361-426a-ba04-cae6a2664a3e", + "children": [ + "505546f7-b585-45b1-b369-4161fccd19b6", + "64593d4e-15ef-4f3d-8662-12fd73e7efe9", + "97727621-bd2b-4624-8c61-db3d2d9bf2dd" + ], + "filterType": "GMScript", + "folderName": "compatibility", + "isDefaultView": false, + "localisedFolderName": "" +} \ No newline at end of file diff --git a/src/gms2/gdash/views/8ebd4763-7203-42aa-9554-cc55d03a802b.yy b/src/gms2/gdash/views/8ebd4763-7203-42aa-9554-cc55d03a802b.yy new file mode 100644 index 0000000..d221571 --- /dev/null +++ b/src/gms2/gdash/views/8ebd4763-7203-42aa-9554-cc55d03a802b.yy @@ -0,0 +1,41 @@ +{ + "id": "8ebd4763-7203-42aa-9554-cc55d03a802b", + "modelName": "GMFolder", + "mvc": "1.1", + "name": "8ebd4763-7203-42aa-9554-cc55d03a802b", + "children": [ + "cf6d1c85-7152-4e6c-9814-5b6fd0a19260", + "1ba92935-c21d-4159-91a1-0a778afcbcf6", + "78a96032-6d47-40a1-94e8-dcb78178a134", + "477b2a17-84c8-4ddc-ba07-345ab325cd4f", + "decb6bcf-028b-4e5e-b0dc-deff5f0bc88f", + "eeb441d7-af5e-4ceb-a389-32557c90856f", + "94e9b58c-1b5c-4e05-8348-05e1155444a6", + "10eda2f5-f03f-4f57-83ee-c65c10d22dce", + "a4a5b8b5-6a80-4608-8d72-d363ee719bcd", + "695b8b1b-7f66-473f-aeb5-5d9f1431c1a5", + "b5cea827-b3fd-48e4-9686-ccb08fd5d898", + "a6902058-42c5-4eb6-8658-c430cfa31c1a", + "13bccc1f-b0d5-4ec9-aed0-4ec8f6d5078e", + "bd7bc958-28aa-43a9-8251-81041ca0b631", + "e873aad6-9ebf-4686-823d-72033eff542a", + "ec3ab82c-0beb-45ba-97e5-236df32ca017", + "b37db980-06b5-44b7-b0b6-1dca01f04279", + "b340ab46-5d6e-4797-8b0c-07b65051d71d", + "f008e78e-dd51-41d2-bb3d-95199a8e7c3c", + "19877baf-f9bd-4216-b356-45c2b3bf122e", + "8d7b1a7b-dadd-486c-9b21-deffc695e159", + "dbd1ee41-adb8-45ec-b8bd-1098a1541bc0", + "acbe9db1-5a5b-4ce1-944c-58cf842a7935", + "46c29120-6d6b-44ea-86b8-afacfb700cae", + "40753ca5-3efd-4c93-b4b8-ee4bd601c676", + "cfac0abc-4609-4eae-a2d7-af54980b51fd", + "a1387e7d-9ef7-458e-8194-e706a534715b", + "69828e54-01dd-4a2a-b789-7e999d214dca", + "024cd91c-bb54-4636-a223-6ba0a8f98e80" + ], + "filterType": "GMScript", + "folderName": "gdash", + "isDefaultView": false, + "localisedFolderName": "" +} \ No newline at end of file diff --git a/src/gms2/gdash/views/94736fe3-0d88-4094-9ad3-af09d1fd4782.yy b/src/gms2/gdash/views/94736fe3-0d88-4094-9ad3-af09d1fd4782.yy new file mode 100644 index 0000000..f70db8a --- /dev/null +++ b/src/gms2/gdash/views/94736fe3-0d88-4094-9ad3-af09d1fd4782.yy @@ -0,0 +1,13 @@ +{ + "id": "94736fe3-0d88-4094-9ad3-af09d1fd4782", + "modelName": "GMFolder", + "mvc": "1.1", + "name": "94736fe3-0d88-4094-9ad3-af09d1fd4782", + "children": [ + "e03eb5fc-f39c-4961-9abd-4347303a7909" + ], + "filterType": "GMObject", + "folderName": "objects", + "isDefaultView": false, + "localisedFolderName": "ResourceTree_Objects" +} \ No newline at end of file diff --git a/src/gms2/gdash/views/a4eea40d-a933-497b-b91f-7e386fa9a986.yy b/src/gms2/gdash/views/a4eea40d-a933-497b-b91f-7e386fa9a986.yy new file mode 100644 index 0000000..3cc6a9e --- /dev/null +++ b/src/gms2/gdash/views/a4eea40d-a933-497b-b91f-7e386fa9a986.yy @@ -0,0 +1,13 @@ +{ + "id": "a4eea40d-a933-497b-b91f-7e386fa9a986", + "modelName": "GMFolder", + "mvc": "1.1", + "name": "a4eea40d-a933-497b-b91f-7e386fa9a986", + "children": [ + + ], + "filterType": "GMFont", + "folderName": "fonts", + "isDefaultView": false, + "localisedFolderName": "ResourceTree_Fonts" +} \ No newline at end of file diff --git a/src/gms2/gdash/views/aaa232fc-30a0-4c62-950f-a776d3fef239.yy b/src/gms2/gdash/views/aaa232fc-30a0-4c62-950f-a776d3fef239.yy new file mode 100644 index 0000000..d44ab57 --- /dev/null +++ b/src/gms2/gdash/views/aaa232fc-30a0-4c62-950f-a776d3fef239.yy @@ -0,0 +1,13 @@ +{ + "id": "aaa232fc-30a0-4c62-950f-a776d3fef239", + "modelName": "GMFolder", + "mvc": "1.1", + "name": "aaa232fc-30a0-4c62-950f-a776d3fef239", + "children": [ + + ], + "filterType": "GMSound", + "folderName": "sounds", + "isDefaultView": false, + "localisedFolderName": "ResourceTree_Sounds" +} \ No newline at end of file diff --git a/src/gms2/gdash/views/c180f1aa-9fbf-4693-a798-00a3c87790d1.yy b/src/gms2/gdash/views/c180f1aa-9fbf-4693-a798-00a3c87790d1.yy new file mode 100644 index 0000000..60ddbb3 --- /dev/null +++ b/src/gms2/gdash/views/c180f1aa-9fbf-4693-a798-00a3c87790d1.yy @@ -0,0 +1,17 @@ +{ + "id": "c180f1aa-9fbf-4693-a798-00a3c87790d1", + "modelName": "GMFolder", + "mvc": "1.1", + "name": "c180f1aa-9fbf-4693-a798-00a3c87790d1", + "children": [ + "6d5ae3be-c018-4481-abe0-66e69da4ed59", + "89db00f9-3361-426a-ba04-cae6a2664a3e", + "4b2720a1-e8f2-435e-b526-fecdfa79b961", + "03e6bf78-c9fc-4f10-9549-7dc253ca0bfc", + "8ebd4763-7203-42aa-9554-cc55d03a802b" + ], + "filterType": "GMScript", + "folderName": "scripts", + "isDefaultView": false, + "localisedFolderName": "ResourceTree_Scripts" +} \ No newline at end of file diff --git a/src/gms2/gdash/views/cfd80378-4324-4b7a-9b8d-fd071e4b1e80.yy b/src/gms2/gdash/views/cfd80378-4324-4b7a-9b8d-fd071e4b1e80.yy new file mode 100644 index 0000000..d2ccedd --- /dev/null +++ b/src/gms2/gdash/views/cfd80378-4324-4b7a-9b8d-fd071e4b1e80.yy @@ -0,0 +1,14 @@ +{ + "id": "cfd80378-4324-4b7a-9b8d-fd071e4b1e80", + "modelName": "GMFolder", + "mvc": "1.1", + "name": "cfd80378-4324-4b7a-9b8d-fd071e4b1e80", + "children": [ + "6e0279a3-8932-432e-b399-b4c2f985b0c5", + "35170da1-3c2d-439d-ae70-2fcf78b4ca36" + ], + "filterType": "GMNotes", + "folderName": "notes", + "isDefaultView": false, + "localisedFolderName": "ResourceTree_Notes" +} \ No newline at end of file diff --git a/src/gms2/gdash/views/dc6060fd-690b-4fe2-8ac8-c86faf2e04c0.yy b/src/gms2/gdash/views/dc6060fd-690b-4fe2-8ac8-c86faf2e04c0.yy new file mode 100644 index 0000000..313105e --- /dev/null +++ b/src/gms2/gdash/views/dc6060fd-690b-4fe2-8ac8-c86faf2e04c0.yy @@ -0,0 +1,13 @@ +{ + "id": "dc6060fd-690b-4fe2-8ac8-c86faf2e04c0", + "modelName": "GMFolder", + "mvc": "1.1", + "name": "dc6060fd-690b-4fe2-8ac8-c86faf2e04c0", + "children": [ + + ], + "filterType": "GMExtension", + "folderName": "extensions", + "isDefaultView": false, + "localisedFolderName": "ResourceTree_Extensions" +} \ No newline at end of file diff --git a/src/gms2/gdash/views/e03eb5fc-f39c-4961-9abd-4347303a7909.yy b/src/gms2/gdash/views/e03eb5fc-f39c-4961-9abd-4347303a7909.yy new file mode 100644 index 0000000..957098a --- /dev/null +++ b/src/gms2/gdash/views/e03eb5fc-f39c-4961-9abd-4347303a7909.yy @@ -0,0 +1,13 @@ +{ + "id": "e03eb5fc-f39c-4961-9abd-4347303a7909", + "modelName": "GMFolder", + "mvc": "1.1", + "name": "e03eb5fc-f39c-4961-9abd-4347303a7909", + "children": [ + "75161d65-d380-49da-b5bd-8506f3d3c411" + ], + "filterType": "GMObject", + "folderName": "test_automation", + "isDefaultView": false, + "localisedFolderName": "" +} \ No newline at end of file diff --git a/src/gms2/gdash/views/ecfa581b-ebf3-43f2-b17d-cd091ea11541.yy b/src/gms2/gdash/views/ecfa581b-ebf3-43f2-b17d-cd091ea11541.yy new file mode 100644 index 0000000..f0a84f4 --- /dev/null +++ b/src/gms2/gdash/views/ecfa581b-ebf3-43f2-b17d-cd091ea11541.yy @@ -0,0 +1,13 @@ +{ + "id": "ecfa581b-ebf3-43f2-b17d-cd091ea11541", + "modelName": "GMFolder", + "mvc": "1.1", + "name": "ecfa581b-ebf3-43f2-b17d-cd091ea11541", + "children": [ + + ], + "filterType": "GMShader", + "folderName": "shaders", + "isDefaultView": false, + "localisedFolderName": "ResourceTree_Shaders" +} \ No newline at end of file diff --git a/src/gms2/gdash/views/ef1f07da-8677-4904-9251-8af85ce5ae10.yy b/src/gms2/gdash/views/ef1f07da-8677-4904-9251-8af85ce5ae10.yy new file mode 100644 index 0000000..7b954cf --- /dev/null +++ b/src/gms2/gdash/views/ef1f07da-8677-4904-9251-8af85ce5ae10.yy @@ -0,0 +1,13 @@ +{ + "id": "ef1f07da-8677-4904-9251-8af85ce5ae10", + "modelName": "GMFolder", + "mvc": "1.1", + "name": "ef1f07da-8677-4904-9251-8af85ce5ae10", + "children": [ + + ], + "filterType": "GMPath", + "folderName": "paths", + "isDefaultView": false, + "localisedFolderName": "ResourceTree_Paths" +} \ No newline at end of file