Skip to content

Commit

Permalink
6.1.4 (alpha)
Browse files Browse the repository at this point in the history
  • Loading branch information
JujuAdams committed Sep 18, 2024
1 parent 95ce4ae commit d498660
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 19 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<p align="center"><img src="https://raw.githubusercontent.com/JujuAdams/vinyl/master/LOGO.png" style="display:block; margin:auto; width:300px"></p>
<h1 align="center">Vinyl 6.1.3</h1>
<h1 align="center">Vinyl 6.1.4</h1>

<p align="center">Audio tooling for GameMaker 2024.8 (and later)</p>

Expand Down
2 changes: 1 addition & 1 deletion objects/oTest/Draw_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ shader_reset();
draw_set_font(fntText);

UIStart(10, 10, undefined, undefined, true);
UITextInline(string_concat("Vinyl ", __VINYL_VERSION, ", ", __VINYL_DATE, " by Juju Adams\nChicken Nuggets by Wangle Line"));
UITextInline(string_concat("Vinyl ", VINYL_VERSION, ", ", VINYL_DATE, " by Juju Adams\nChicken Nuggets by Wangle Line"));
UINewline();
UINewline();
UITextInline(string_concat("\"Test\" mix gain = ", VinylMixGetGain("Test")));
Expand Down
2 changes: 1 addition & 1 deletion options/windows/options_windows.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions scripts/__VinylConstants/__VinylConstants.gml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// Feather disable all

#macro VINYL_VERSION "6.1.4"
#macro VINYL_DATE "2024-09-18"
13 changes: 13 additions & 0 deletions scripts/__VinylConstants/__VinylConstants.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion scripts/__VinylError/__VinylError.gml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ function __VinylError()
++_i;
}

show_debug_message("Vinyl " + __VINYL_VERSION + ": " + string_replace_all(_string, "\n", "\n "));
show_debug_message("Vinyl " + VINYL_VERSION + ": " + string_replace_all(_string, "\n", "\n "));
show_error("Vinyl:\n" + _string + "\n ", true);
}
5 changes: 1 addition & 4 deletions scripts/__VinylSystem/__VinylSystem.gml
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
// Feather disable all

#macro __VINYL_VERSION "6.1.3"
#macro __VINYL_DATE "2024-09-16"

#macro __VINYL_RUNNING_FROM_IDE (GM_build_type == "run")

#macro __VINYL_DEFAULT_DUCK_RATE_OF_GAIN 1
Expand Down Expand Up @@ -35,7 +32,7 @@ function __VinylSystem()
{
if (__VINYL_DEBUG_SHOW_FRAMES) __frame = 0;

__VinylTrace("Welcome to Vinyl! This is version ", __VINYL_VERSION, ", ", __VINYL_DATE);
__VinylTrace("Welcome to Vinyl! This is version ", VINYL_VERSION, ", ", VINYL_DATE);
if (__VINYL_RUNNING_FROM_IDE) global.Vinyl = self;

__toUpdateArray = VINYL_LIVE_EDIT? [] : undefined;
Expand Down
23 changes: 12 additions & 11 deletions vinyl.resource_order
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@
"FolderOrderSettings":[
{"name":"Sounds","order":4,"path":"folders/Sounds.yy",},
{"name":"UI","order":5,"path":"folders/UI.yy",},
{"name":"(Internals)","order":12,"path":"folders/Vinyl/(Internals).yy",},
{"name":"(Internals)","order":13,"path":"folders/Vinyl/(Internals).yy",},
{"name":"Classes","order":9,"path":"folders/Vinyl/(Internals)/Classes.yy",},
{"name":"Patterns","order":3,"path":"folders/Vinyl/(Internals)/Classes/Patterns.yy",},
{"name":"Voice","order":2,"path":"folders/Vinyl/(Internals)/Classes/Voice.yy",},
{"name":"Deprecated","order":26,"path":"folders/Vinyl/(Internals)/Deprecated.yy",},
{"name":"PRNG","order":10,"path":"folders/Vinyl/(Internals)/PRNG.yy",},
{"name":"Blend Voices","order":8,"path":"folders/Vinyl/Blend Voices.yy",},
{"name":"Config","order":2,"path":"folders/Vinyl/Config.yy",},
{"name":"Ducker","order":7,"path":"folders/Vinyl/Ducker.yy",},
{"name":"Gain & Pitch","order":5,"path":"folders/Vinyl/Gain & Pitch.yy",},
{"name":"Metadata","order":10,"path":"folders/Vinyl/Metadata.yy",},
{"name":"Miscellaneous","order":11,"path":"folders/Vinyl/Miscellaneous.yy",},
{"name":"Mixes","order":6,"path":"folders/Vinyl/Mixes.yy",},
{"name":"Playback","order":4,"path":"folders/Vinyl/Playback.yy",},
{"name":"Queues","order":9,"path":"folders/Vinyl/Queues.yy",},
{"name":"Runtime Setup","order":3,"path":"folders/Vinyl/Runtime Setup.yy",},
{"name":"Blend Voices","order":9,"path":"folders/Vinyl/Blend Voices.yy",},
{"name":"Config","order":3,"path":"folders/Vinyl/Config.yy",},
{"name":"Ducker","order":8,"path":"folders/Vinyl/Ducker.yy",},
{"name":"Gain & Pitch","order":6,"path":"folders/Vinyl/Gain & Pitch.yy",},
{"name":"Metadata","order":11,"path":"folders/Vinyl/Metadata.yy",},
{"name":"Miscellaneous","order":12,"path":"folders/Vinyl/Miscellaneous.yy",},
{"name":"Mixes","order":7,"path":"folders/Vinyl/Mixes.yy",},
{"name":"Playback","order":5,"path":"folders/Vinyl/Playback.yy",},
{"name":"Queues","order":10,"path":"folders/Vinyl/Queues.yy",},
{"name":"Runtime Setup","order":4,"path":"folders/Vinyl/Runtime Setup.yy",},
],
"ResourceOrderSettings":[
{"name":"acTest","order":10,"path":"animcurves/acTest/acTest.yy",},
Expand All @@ -41,6 +41,7 @@
{"name":"__VinylClassVoiceSound","order":1,"path":"scripts/__VinylClassVoiceSound/__VinylClassVoiceSound.yy",},
{"name":"__VinylCompiledSoundArrayEnsure","order":25,"path":"scripts/__VinylCompiledSoundArrayEnsure/__VinylCompiledSoundArrayEnsure.yy",},
{"name":"__VinylConfigJSON","order":2,"path":"scripts/__VinylConfigJSON/__VinylConfigJSON.yy",},
{"name":"__VinylConstants","order":2,"path":"scripts/__VinylConstants/__VinylConstants.yy",},
{"name":"__VinylError","order":5,"path":"scripts/__VinylError/__VinylError.yy",},
{"name":"__VinylFindMatchingAudioAssets","order":24,"path":"scripts/__VinylFindMatchingAudioAssets/__VinylFindMatchingAudioAssets.yy",},
{"name":"__VinylGetMixMacro","order":12,"path":"scripts/__VinylGetMixMacro/__VinylGetMixMacro.yy",},
Expand Down
1 change: 1 addition & 0 deletions vinyl.yyp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit d498660

Please sign in to comment.