diff --git a/.gitignore b/.gitignore index 771ca51..541d594 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,8 @@ source/fmod_gml/extensions/FMOD/*.nrr source/fmod_gml/extensions/FMOD/**/fmod.jar source/fmod_gml/extensions/FMOD/**/*fmodL*.* source/fmod_gml/extensions/FMOD/**/*fmodstudioL*.* +source/fmod_gml/extensions/FMOD/**/Fmod Core/ +source/fmod_gml/extensions/FMOD/**/Fmod Studio/ # YYFMOD build solutions (temp & output) source/fmod_gml/extensions/FMOD/fmod_android/out/ @@ -45,3 +47,4 @@ xcuserdata/ *.sh-e output/ + diff --git a/metadata.json b/metadata.json index 1ef8c2f..49d622c 100644 --- a/metadata.json +++ b/metadata.json @@ -1 +1 @@ -{"gitHubUrl":"https://github.com/YoYoGames/GMEXT-FMOD","projectFile":"source/fmod_gml/FMOD.yyp","projectVersion":"LTS22","releaseTemplate":"templates/release_body.md","extensionMetaData":[{"extensionFile":"source/fmod_gml/extensions/FMOD/FMOD.yy","packageId":"com.yoyogames.fmodext","packageName":"FMOD Ext","packageVersion":"0.0.4","packageFormat":"LTS22","includeFolders":null,"includeResources":null,"excludeFolders":null,"excludeResources":null,"postRemovals":["**/.vs/","**/.vsc/","extensions/FMOD/YYFMOD_xbox*.dll","extensions/FMOD/*.prx","extensions/FMOD/*.nro","extensions/FMOD/*.nrr","extensions/FMOD/**/fmod.jar","extensions/FMOD/**/*fmodL*.*","extensions/FMOD/**/*fmodstudioL*.*","extensions/FMOD/fmod_android/out/","extensions/FMOD/fmod_gdk/**/Gaming.Xbox.*.x64/","extensions/FMOD/fmod_playstation/**/ORBIS/","extensions/FMOD/fmod_playstation/**/Prospero/","extensions/FMOD/fmod_switch/**/NX64/","extensions/FMOD/fmod_windows/**/x64/","*.user","xcuserdata/","!extensions/FMOD/libfmodL.dylib","!extensions/FMOD/libfmodstudioL.dylib","*.sh-e"]}]} \ No newline at end of file +{"gitHubUrl":"https://github.com/YoYoGames/GMEXT-FMOD","projectFile":"source/fmod_gml/FMOD.yyp","projectVersion":"LTS22","releaseTemplate":"templates/release_body.md","extensionMetaData":[{"extensionFile":"source/fmod_gml/extensions/FMOD/FMOD.yy","packageId":"com.yoyogames.fmodext","packageName":"FMOD Ext","packageVersion":"0.0.5","packageFormat":"LTS22","includeFolders":null,"includeResources":null,"excludeFolders":null,"excludeResources":null,"postRemovals":["**/.vs/","**/.vsc/","extensions/FMOD/YYFMOD_xbox*.dll","extensions/FMOD/*.prx","extensions/FMOD/*.nro","extensions/FMOD/*.nrr","extensions/FMOD/**/fmod.jar","extensions/FMOD/**/*fmodL*.*","extensions/FMOD/**/*fmodstudioL*.*","extensions/FMOD/**/Fmod Core/","extensions/FMOD/**/Fmod Studio/","extensions/FMOD/fmod_android/out/","extensions/FMOD/fmod_gdk/**/Gaming.Xbox.*.x64/","extensions/FMOD/fmod_playstation/**/ORBIS/","extensions/FMOD/fmod_playstation/**/Prospero/","extensions/FMOD/fmod_switch/**/NX64/","extensions/FMOD/fmod_windows/**/x64/","*.user","xcuserdata/","!extensions/FMOD/libfmodL.dylib","!extensions/FMOD/libfmodstudioL.dylib","*.sh-e"]}]} \ No newline at end of file diff --git a/source/fmod_gml/extensions/FMOD/FMOD.yy b/source/fmod_gml/extensions/FMOD/FMOD.yy index 3e229f4..6dc5878 100644 --- a/source/fmod_gml/extensions/FMOD/FMOD.yy +++ b/source/fmod_gml/extensions/FMOD/FMOD.yy @@ -16,7 +16,7 @@ "copyToTargets": 3035426170322551022, "description": "", "exportToGame": true, - "extensionVersion": "0.0.4", + "extensionVersion": "0.0.5", "files": [ {"$GMExtensionFile":"","%Name":"YYFMOD.dll","constants":[],"copyToTargets":3035426170322550990,"filename":"YYFMOD.dll","final":"","functions":[ {"$GMExtensionFunction":"","%Name":"fmod_channel_set_frequency","argCount":0,"args":[2,2,],"documentation":"/// @desc\n\r/// @param {real} channel_ref \n\r/// @param {real} frequency \n\r/// @returns {real}\n\r","externalName":"fmod_channel_set_frequency","help":"fmod_channel_set_frequency(channel_ref, frequency)","hidden":false,"kind":1,"name":"fmod_channel_set_frequency","resourceType":"GMExtensionFunction","resourceVersion":"2.0","returnType":2,}, diff --git a/source/fmod_gml/objects/obj_fmod_play_sound/obj_fmod_play_sound.yy b/source/fmod_gml/objects/obj_fmod_play_sound/obj_fmod_play_sound.yy index 05ce188..c953465 100644 --- a/source/fmod_gml/objects/obj_fmod_play_sound/obj_fmod_play_sound.yy +++ b/source/fmod_gml/objects/obj_fmod_play_sound/obj_fmod_play_sound.yy @@ -33,7 +33,7 @@ "physicsShapePoints":[], "physicsStartAwake":true, "properties":[ - {"$GMObjectProperty":"v1","%Name":"sound_file","filters":[],"listItems":[],"multiselect":false,"name":"sound_file","rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"resource":null,"resourceType":"GMObjectProperty","resourceVersion":"2.0","value":"0","varType":2,}, + {"$GMObjectProperty":"v1","%Name":"sound_file","filters":[],"listItems":[],"multiselect":false,"name":"sound_file","rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"resourceType":"GMObjectProperty","resourceVersion":"2.0","value":"0","varType":2,}, ], "resourceType":"GMObject", "resourceVersion":"2.0", diff --git a/source/fmod_gml/rooms/rm_fmod_play_sound/rm_fmod_play_sound.yy b/source/fmod_gml/rooms/rm_fmod_play_sound/rm_fmod_play_sound.yy index 761f0b4..71a42ab 100644 --- a/source/fmod_gml/rooms/rm_fmod_play_sound/rm_fmod_play_sound.yy +++ b/source/fmod_gml/rooms/rm_fmod_play_sound/rm_fmod_play_sound.yy @@ -16,10 +16,10 @@ {"$GMRAssetLayer":"","%Name":"Assets_1","assets":[],"depth":0,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"name":"Assets_1","properties":[],"resourceType":"GMRAssetLayer","resourceVersion":"2.0","userdefinedDepth":false,"visible":true,}, {"$GMRInstanceLayer":"","%Name":"Instances","depth":100,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ {"$GMRInstance":"","%Name":"inst_49ABF649","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_49ABF649","objectId":{"name":"obj_fmod_play_sound","path":"objects/obj_fmod_play_sound/obj_fmod_play_sound.yy",},"properties":[ - {"$GMOverriddenProperty":"v1","%Name":"","name":"","objectId":{"name":"obj_fmod_play_sound","path":"objects/obj_fmod_play_sound/obj_fmod_play_sound.yy",},"propertyId":{"name":"sound_file","path":"objects/obj_fmod_play_sound/obj_fmod_play_sound.yy",},"resource":null,"resourceType":"GMOverriddenProperty","resourceVersion":"2.0","value":"jaguar.wav",}, + {"$GMOverriddenProperty":"v1","%Name":"","name":"","objectId":{"name":"obj_fmod_play_sound","path":"objects/obj_fmod_play_sound/obj_fmod_play_sound.yy",},"propertyId":{"name":"sound_file","path":"objects/obj_fmod_play_sound/obj_fmod_play_sound.yy",},"resourceType":"GMOverriddenProperty","resourceVersion":"2.0","value":"jaguar.wav",}, ],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":5.0,"scaleY":1.0,"x":672.0,"y":288.0,}, {"$GMRInstance":"","%Name":"inst_7FC7C1BF","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7FC7C1BF","objectId":{"name":"obj_fmod_play_sound","path":"objects/obj_fmod_play_sound/obj_fmod_play_sound.yy",},"properties":[ - {"$GMOverriddenProperty":"v1","%Name":"","name":"","objectId":{"name":"obj_fmod_play_sound","path":"objects/obj_fmod_play_sound/obj_fmod_play_sound.yy",},"propertyId":{"name":"sound_file","path":"objects/obj_fmod_play_sound/obj_fmod_play_sound.yy",},"resource":null,"resourceType":"GMOverriddenProperty","resourceVersion":"2.0","value":"drumloop.wav",}, + {"$GMOverriddenProperty":"v1","%Name":"","name":"","objectId":{"name":"obj_fmod_play_sound","path":"objects/obj_fmod_play_sound/obj_fmod_play_sound.yy",},"propertyId":{"name":"sound_file","path":"objects/obj_fmod_play_sound/obj_fmod_play_sound.yy",},"resourceType":"GMOverriddenProperty","resourceVersion":"2.0","value":"drumloop.wav",}, ],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":5.0,"scaleY":1.0,"x":672.0,"y":448.0,}, {"$GMRInstance":"","%Name":"inst_2EC8AE30","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2EC8AE30","objectId":{"name":"obj_fmod_goto","path":"objects/obj_fmod_goto/obj_fmod_goto.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":5.0,"scaleY":1.0,"x":672.0,"y":640.0,}, {"$GMRInstance":"","%Name":"inst_A6A5BD7","colour":4294967295,"frozen":false,"hasCreationCode":true,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A6A5BD7","objectId":{"name":"obj_gm_text","path":"objects/obj_gm_text/obj_gm_text.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":352.0,"y":44.0,},