Skip to content

Commit

Permalink
Merge branch 'master' of github.com:bitDecayGames/GMTK2024
Browse files Browse the repository at this point in the history
  • Loading branch information
MondayHopscotch committed Aug 19, 2024
2 parents e5b5aaa + 771757c commit 656a598
Show file tree
Hide file tree
Showing 27 changed files with 1,028 additions and 157 deletions.
Binary file modified assets/fmod/Desktop/Master.bank
Binary file not shown.
Binary file modified assets/fmod/Desktop/Master.strings.bank
Binary file not shown.
355 changes: 248 additions & 107 deletions assets/ldtk/test.ldtk

Large diffs are not rendered by default.

Binary file added audio/sfx/collector/grinding.ogg
Binary file not shown.
Binary file added audio/sfx/guns/gunget.ogg
Binary file not shown.
Binary file added audio/sfx/guns/gungetjingle.ogg
Binary file not shown.
Binary file added audio/sfx/guns/gunspawn.ogg
Binary file not shown.
Binary file modified audio/sfx/sfx.flp
Binary file not shown.
Binary file added fmod/Assets/grinding.ogg
Binary file not shown.
Binary file added fmod/Assets/gunget.ogg
Binary file not shown.
Binary file added fmod/Assets/gungetjingle.ogg
Binary file not shown.
Binary file added fmod/Assets/gunspawn.ogg
Binary file not shown.
20 changes: 20 additions & 0 deletions fmod/Metadata/AudioFile/{1791acf4-2d1d-4f68-b315-6a1600105d35}.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.00.00">
<object class="AudioFile" id="{1791acf4-2d1d-4f68-b315-6a1600105d35}">
<property name="assetPath">
<value>gunspawn.ogg</value>
</property>
<property name="frequencyInKHz">
<value>48</value>
</property>
<property name="channelCount">
<value>2</value>
</property>
<property name="length">
<value>0.94712499999999999</value>
</property>
<relationship name="masterAssetFolder">
<destination>{8437bb97-ead8-45e7-929a-eda2e732a050}</destination>
</relationship>
</object>
</objects>
20 changes: 20 additions & 0 deletions fmod/Metadata/AudioFile/{4e2cfe8d-e19b-49e6-88aa-4fc03ede1011}.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.00.00">
<object class="AudioFile" id="{4e2cfe8d-e19b-49e6-88aa-4fc03ede1011}">
<property name="assetPath">
<value>grinding.ogg</value>
</property>
<property name="frequencyInKHz">
<value>48</value>
</property>
<property name="channelCount">
<value>2</value>
</property>
<property name="length">
<value>3.6971250000000002</value>
</property>
<relationship name="masterAssetFolder">
<destination>{8437bb97-ead8-45e7-929a-eda2e732a050}</destination>
</relationship>
</object>
</objects>
20 changes: 20 additions & 0 deletions fmod/Metadata/AudioFile/{5a0c6507-269e-43a3-93ec-cf678825b948}.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.00.00">
<object class="AudioFile" id="{5a0c6507-269e-43a3-93ec-cf678825b948}">
<property name="assetPath">
<value>gunget.ogg</value>
</property>
<property name="frequencyInKHz">
<value>48</value>
</property>
<property name="channelCount">
<value>2</value>
</property>
<property name="length">
<value>0.92787500000000001</value>
</property>
<relationship name="masterAssetFolder">
<destination>{8437bb97-ead8-45e7-929a-eda2e732a050}</destination>
</relationship>
</object>
</objects>
20 changes: 20 additions & 0 deletions fmod/Metadata/AudioFile/{f269bb2c-b530-4603-b5c4-9b87d3568994}.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.00.00">
<object class="AudioFile" id="{f269bb2c-b530-4603-b5c4-9b87d3568994}">
<property name="assetPath">
<value>gungetjingle.ogg</value>
</property>
<property name="frequencyInKHz">
<value>48</value>
</property>
<property name="channelCount">
<value>2</value>
</property>
<property name="length">
<value>4.1009583333333337</value>
</property>
<relationship name="masterAssetFolder">
<destination>{8437bb97-ead8-45e7-929a-eda2e732a050}</destination>
</relationship>
</object>
</objects>
128 changes: 128 additions & 0 deletions fmod/Metadata/Event/{174fe4f1-c022-4d2e-84cb-5bf3178047cb}.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.00.00">
<object class="Event" id="{174fe4f1-c022-4d2e-84cb-5bf3178047cb}">
<property name="name">
<value>GunGetJingle</value>
</property>
<property name="outputFormat">
<value>1</value>
</property>
<relationship name="folder">
<destination>{3c4b0972-a34e-4007-8835-4d9bdcf07cae}</destination>
</relationship>
<relationship name="mixer">
<destination>{d1d29d68-daba-4176-9a85-20ccd070f415}</destination>
</relationship>
<relationship name="masterTrack">
<destination>{f43a93d0-0c08-4c00-b290-0816d8678bc1}</destination>
</relationship>
<relationship name="mixerInput">
<destination>{92df98a0-f4ad-46ae-ae3c-0474c3828aff}</destination>
</relationship>
<relationship name="automatableProperties">
<destination>{cf75793a-a451-4cfd-80fb-da5aa7730154}</destination>
</relationship>
<relationship name="markerTracks">
<destination>{f8b5600b-de63-41e7-bfa1-70b77cee63d2}</destination>
</relationship>
<relationship name="groupTracks">
<destination>{6c3e00b3-2d3b-48cb-abc4-2691f7d73f43}</destination>
</relationship>
<relationship name="timeline">
<destination>{cc889956-8006-40be-8fed-33ecf9f9d0a3}</destination>
</relationship>
<relationship name="banks">
<destination>{38e93d37-e0be-4ba7-b763-cb48050b58a0}</destination>
</relationship>
</object>
<object class="EventMixer" id="{d1d29d68-daba-4176-9a85-20ccd070f415}">
<relationship name="masterBus">
<destination>{8b0ee81b-8e72-4caa-9af8-2e7a53006d58}</destination>
</relationship>
</object>
<object class="MasterTrack" id="{f43a93d0-0c08-4c00-b290-0816d8678bc1}">
<relationship name="mixerGroup">
<destination>{8b0ee81b-8e72-4caa-9af8-2e7a53006d58}</destination>
</relationship>
</object>
<object class="MixerInput" id="{92df98a0-f4ad-46ae-ae3c-0474c3828aff}">
<relationship name="effectChain">
<destination>{ce24797a-28cb-4420-941b-eade74970a20}</destination>
</relationship>
<relationship name="panner">
<destination>{8aeef44c-c220-4943-9549-cea34724de33}</destination>
</relationship>
<relationship name="output">
<destination>{40c4223a-8ffc-4670-9117-448edcd107e0}</destination>
</relationship>
</object>
<object class="EventAutomatableProperties" id="{cf75793a-a451-4cfd-80fb-da5aa7730154}" />
<object class="MarkerTrack" id="{f8b5600b-de63-41e7-bfa1-70b77cee63d2}" />
<object class="GroupTrack" id="{6c3e00b3-2d3b-48cb-abc4-2691f7d73f43}">
<relationship name="modules">
<destination>{73226ab5-680e-48ed-984b-6a713ab86a89}</destination>
</relationship>
<relationship name="mixerGroup">
<destination>{422fb4ef-9615-4596-bcf3-fda84dfcf909}</destination>
</relationship>
</object>
<object class="Timeline" id="{cc889956-8006-40be-8fed-33ecf9f9d0a3}">
<relationship name="modules">
<destination>{73226ab5-680e-48ed-984b-6a713ab86a89}</destination>
</relationship>
</object>
<object class="EventMixerMaster" id="{8b0ee81b-8e72-4caa-9af8-2e7a53006d58}">
<relationship name="effectChain">
<destination>{ca3f15ef-a376-4057-bc4b-59ac4bbd3e13}</destination>
</relationship>
<relationship name="panner">
<destination>{1a432d67-26e5-42ed-8053-5a23d0a4d976}</destination>
</relationship>
<relationship name="mixer">
<destination>{d1d29d68-daba-4176-9a85-20ccd070f415}</destination>
</relationship>
</object>
<object class="MixerBusEffectChain" id="{ce24797a-28cb-4420-941b-eade74970a20}">
<relationship name="effects">
<destination>{de7d7fea-9182-4668-a7a4-14fca5433a0d}</destination>
</relationship>
</object>
<object class="MixerBusPanner" id="{8aeef44c-c220-4943-9549-cea34724de33}" />
<object class="SingleSound" id="{73226ab5-680e-48ed-984b-6a713ab86a89}">
<property name="length">
<value>4.1009583333333337</value>
</property>
<relationship name="audioFile">
<destination>{f269bb2c-b530-4603-b5c4-9b87d3568994}</destination>
</relationship>
</object>
<object class="EventMixerGroup" id="{422fb4ef-9615-4596-bcf3-fda84dfcf909}">
<property name="name">
<value>Audio 1</value>
</property>
<relationship name="effectChain">
<destination>{51584adc-3e2e-40be-b592-0bf0a5e098b1}</destination>
</relationship>
<relationship name="panner">
<destination>{6a172e16-71dc-447b-a14c-9a91e94c32db}</destination>
</relationship>
<relationship name="output">
<destination>{8b0ee81b-8e72-4caa-9af8-2e7a53006d58}</destination>
</relationship>
</object>
<object class="MixerBusEffectChain" id="{ca3f15ef-a376-4057-bc4b-59ac4bbd3e13}">
<relationship name="effects">
<destination>{cb576a8d-55c3-4577-ae31-ad184126a551}</destination>
</relationship>
</object>
<object class="MixerBusPanner" id="{1a432d67-26e5-42ed-8053-5a23d0a4d976}" />
<object class="MixerBusFader" id="{de7d7fea-9182-4668-a7a4-14fca5433a0d}" />
<object class="MixerBusEffectChain" id="{51584adc-3e2e-40be-b592-0bf0a5e098b1}">
<relationship name="effects">
<destination>{29e96316-837e-4e5b-bcbc-19701c462fd2}</destination>
</relationship>
</object>
<object class="MixerBusPanner" id="{6a172e16-71dc-447b-a14c-9a91e94c32db}" />
<object class="MixerBusFader" id="{cb576a8d-55c3-4577-ae31-ad184126a551}" />
<object class="MixerBusFader" id="{29e96316-837e-4e5b-bcbc-19701c462fd2}" />
</objects>
128 changes: 128 additions & 0 deletions fmod/Metadata/Event/{1e931d07-6e4a-4ece-af52-6b766c059421}.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.00.00">
<object class="Event" id="{1e931d07-6e4a-4ece-af52-6b766c059421}">
<property name="name">
<value>GunGet</value>
</property>
<property name="outputFormat">
<value>1</value>
</property>
<relationship name="folder">
<destination>{3c4b0972-a34e-4007-8835-4d9bdcf07cae}</destination>
</relationship>
<relationship name="mixer">
<destination>{ce1c9b74-0e09-43ad-af28-00bf59bbab2e}</destination>
</relationship>
<relationship name="masterTrack">
<destination>{be056e5a-6881-4b82-a735-31ee57e6a153}</destination>
</relationship>
<relationship name="mixerInput">
<destination>{31d03ff1-d22f-4b0d-8973-519acfb51725}</destination>
</relationship>
<relationship name="automatableProperties">
<destination>{0f7aece8-a5f2-48ce-8718-c4180d102c74}</destination>
</relationship>
<relationship name="markerTracks">
<destination>{2c15c771-ee7e-4439-80ed-a992e5d69b65}</destination>
</relationship>
<relationship name="groupTracks">
<destination>{3f26f576-ef22-40ef-a7c4-86e05863e6a5}</destination>
</relationship>
<relationship name="timeline">
<destination>{b1fe45c9-858c-4586-8c8e-d04239ded877}</destination>
</relationship>
<relationship name="banks">
<destination>{38e93d37-e0be-4ba7-b763-cb48050b58a0}</destination>
</relationship>
</object>
<object class="EventMixer" id="{ce1c9b74-0e09-43ad-af28-00bf59bbab2e}">
<relationship name="masterBus">
<destination>{1f98ebb0-9c4c-4c6d-92ee-964688b0aea5}</destination>
</relationship>
</object>
<object class="MasterTrack" id="{be056e5a-6881-4b82-a735-31ee57e6a153}">
<relationship name="mixerGroup">
<destination>{1f98ebb0-9c4c-4c6d-92ee-964688b0aea5}</destination>
</relationship>
</object>
<object class="MixerInput" id="{31d03ff1-d22f-4b0d-8973-519acfb51725}">
<relationship name="effectChain">
<destination>{9d384c6b-708f-4e62-97c7-9451eb3e37b6}</destination>
</relationship>
<relationship name="panner">
<destination>{699c3713-e712-4db1-806f-f523bcf651d5}</destination>
</relationship>
<relationship name="output">
<destination>{40c4223a-8ffc-4670-9117-448edcd107e0}</destination>
</relationship>
</object>
<object class="EventAutomatableProperties" id="{0f7aece8-a5f2-48ce-8718-c4180d102c74}" />
<object class="MarkerTrack" id="{2c15c771-ee7e-4439-80ed-a992e5d69b65}" />
<object class="GroupTrack" id="{3f26f576-ef22-40ef-a7c4-86e05863e6a5}">
<relationship name="modules">
<destination>{cec8be12-90e7-4507-860d-d495e573b8f4}</destination>
</relationship>
<relationship name="mixerGroup">
<destination>{951aa019-c472-40c6-8ad6-d47e3e29d17e}</destination>
</relationship>
</object>
<object class="Timeline" id="{b1fe45c9-858c-4586-8c8e-d04239ded877}">
<relationship name="modules">
<destination>{cec8be12-90e7-4507-860d-d495e573b8f4}</destination>
</relationship>
</object>
<object class="EventMixerMaster" id="{1f98ebb0-9c4c-4c6d-92ee-964688b0aea5}">
<relationship name="effectChain">
<destination>{6c2f298b-0251-4315-8535-7c2fa75a5315}</destination>
</relationship>
<relationship name="panner">
<destination>{3ac60c27-6d06-4631-8c6f-d865a046e808}</destination>
</relationship>
<relationship name="mixer">
<destination>{ce1c9b74-0e09-43ad-af28-00bf59bbab2e}</destination>
</relationship>
</object>
<object class="MixerBusEffectChain" id="{9d384c6b-708f-4e62-97c7-9451eb3e37b6}">
<relationship name="effects">
<destination>{d1ee9d48-1230-40bd-8548-63dcd8c44e00}</destination>
</relationship>
</object>
<object class="MixerBusPanner" id="{699c3713-e712-4db1-806f-f523bcf651d5}" />
<object class="SingleSound" id="{cec8be12-90e7-4507-860d-d495e573b8f4}">
<property name="length">
<value>0.92787500000000001</value>
</property>
<relationship name="audioFile">
<destination>{5a0c6507-269e-43a3-93ec-cf678825b948}</destination>
</relationship>
</object>
<object class="EventMixerGroup" id="{951aa019-c472-40c6-8ad6-d47e3e29d17e}">
<property name="name">
<value>Audio 1</value>
</property>
<relationship name="effectChain">
<destination>{c9f2a8a1-67ae-491b-afa6-11fd21bc818e}</destination>
</relationship>
<relationship name="panner">
<destination>{8e5e71d7-feb5-42a1-b65c-787f55b0fd29}</destination>
</relationship>
<relationship name="output">
<destination>{1f98ebb0-9c4c-4c6d-92ee-964688b0aea5}</destination>
</relationship>
</object>
<object class="MixerBusEffectChain" id="{6c2f298b-0251-4315-8535-7c2fa75a5315}">
<relationship name="effects">
<destination>{90054363-bdc4-4e08-8ae5-cebbe23584bf}</destination>
</relationship>
</object>
<object class="MixerBusPanner" id="{3ac60c27-6d06-4631-8c6f-d865a046e808}" />
<object class="MixerBusFader" id="{d1ee9d48-1230-40bd-8548-63dcd8c44e00}" />
<object class="MixerBusEffectChain" id="{c9f2a8a1-67ae-491b-afa6-11fd21bc818e}">
<relationship name="effects">
<destination>{fa7741f0-40f7-43c3-ac15-53b5c4955337}</destination>
</relationship>
</object>
<object class="MixerBusPanner" id="{8e5e71d7-feb5-42a1-b65c-787f55b0fd29}" />
<object class="MixerBusFader" id="{90054363-bdc4-4e08-8ae5-cebbe23584bf}" />
<object class="MixerBusFader" id="{fa7741f0-40f7-43c3-ac15-53b5c4955337}" />
</objects>
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@
</relationship>
</object>
<object class="EventMixerGroup" id="{9b324d5e-b17b-4407-ad8e-fc2f18f5071d}">
<property name="volume">
<value>-6.5</value>
</property>
<property name="name">
<value>Audio 1</value>
</property>
Expand Down
Loading

0 comments on commit 656a598

Please sign in to comment.