Skip to content

Commit f76b5c0

Browse files
committed
v0.3.1
1 parent b0ba9ed commit f76b5c0

File tree

6 files changed

+66
-7
lines changed

6 files changed

+66
-7
lines changed

AM2R.project.gmx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5455,6 +5455,7 @@
54555455
<object>objects\oEditorInfo</object>
54565456
<object>objects\oEditorHelp</object>
54575457
<object>objects\oDemoRecord</object>
5458+
<object>objects\oDemoPlayback</object>
54585459
<object>objects\oTTAmmoField</object>
54595460
<object>objects\oTTHealField</object>
54605461
</objects>

objects/oDemoPlayback.object.gmx

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
2+
<object>
3+
<spriteName>&lt;undefined&gt;</spriteName>
4+
<solid>0</solid>
5+
<visible>-1</visible>
6+
<depth>0</depth>
7+
<persistent>0</persistent>
8+
<parentName>&lt;undefined&gt;</parentName>
9+
<maskName>&lt;undefined&gt;</maskName>
10+
<events>
11+
<event eventtype="0" enumb="0">
12+
<action>
13+
<libid>1</libid>
14+
<id>603</id>
15+
<kind>7</kind>
16+
<userelative>0</userelative>
17+
<isquestion>0</isquestion>
18+
<useapplyto>-1</useapplyto>
19+
<exetype>2</exetype>
20+
<functionname></functionname>
21+
<codestring></codestring>
22+
<whoName>self</whoName>
23+
<relative>0</relative>
24+
<isnot>0</isnot>
25+
<arguments>
26+
<argument>
27+
<kind>1</kind>
28+
<string>demo_valid = 1;
29+
demo_inputs = 0;
30+
31+
demo_uppr = 0;
32+
demo_dnpr = 0;
33+
demo_rtpr = 0;
34+
demo_lfpr = 0;
35+
36+
demo_frpr = 0;
37+
demo_jppr = 0;
38+
</string>
39+
</argument>
40+
</arguments>
41+
</action>
42+
</event>
43+
</events>
44+
<PhysicsObject>0</PhysicsObject>
45+
<PhysicsObjectSensor>0</PhysicsObjectSensor>
46+
<PhysicsObjectShape>0</PhysicsObjectShape>
47+
<PhysicsObjectDensity>0.5</PhysicsObjectDensity>
48+
<PhysicsObjectRestitution>0.100000001490116</PhysicsObjectRestitution>
49+
<PhysicsObjectGroup>0</PhysicsObjectGroup>
50+
<PhysicsObjectLinearDamping>0.100000001490116</PhysicsObjectLinearDamping>
51+
<PhysicsObjectAngularDamping>0.100000001490116</PhysicsObjectAngularDamping>
52+
<PhysicsObjectFriction>0.200000002980232</PhysicsObjectFriction>
53+
<PhysicsObjectAwake>-1</PhysicsObjectAwake>
54+
<PhysicsObjectKinematic>0</PhysicsObjectKinematic>
55+
<PhysicsShapePoints/>
56+
</object>

objects/oSkipMain.object.gmx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<arguments>
2626
<argument>
2727
<kind>1</kind>
28-
<string>global.tt_vers = "v0.3";
28+
<string>global.tt_vers = "v0.3.1";
2929
global.tt_verr = 2;
3030
if (global.skip_mMenu == 1){ // skip to trial select
3131
room_change(trialselectroom,0);

objects/oTTSpace.object.gmx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@
4949
<argument>
5050
<kind>1</kind>
5151
<string>audio_stop_sound(sndMessage);
52+
audio_stop_sound(sndSpinJump);
53+
audio_stop_sound(sndScrewAttack);
5254
sfx_play(sndMessage);
5355
make_notification("New Item","Space Jump Acquired",140,"","");
5456
global.spacejump = 1;

scripts/convert_level.gml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//convert_level(filename);
2-
show_debug_message("Attempting to convert level "+string(argument0));
2+
//show_debug_message("Attempting to convert level "+string(argument0));
33
var ver_num = -1;
44
var file_check = file_text_open_read("stages/"+argument0); // open file for checking version
55
if (file_text_read_string(file_check) == "==== AM2R TIME TRIALS ===="){ // v0.3+
@@ -11,17 +11,17 @@ if (file_text_read_string(file_check) == "==== AM2R TIME TRIALS ===="){ // v0.3+
1111
file_text_close(file_check);
1212

1313
if (ver_num > global.tt_verr){
14-
show_debug_message("Level version is higher than game version! Aborting..");
14+
//show_debug_message("Level version is higher than game version! Aborting..");
1515
exit;
1616
}
1717

1818
if (ver_num == global.tt_verr){
19-
show_debug_message("Level version is same as game version. Aborting..");
19+
//show_debug_message("Level version is same as game version. Aborting..");
2020
exit;
2121
}
2222

2323
if (ver_num < 2){ // v0.1/v0.2 conversions
24-
show_debug_message("Converting file using v0.1/v0.2 to v0.3 conversion");
24+
//show_debug_message("Converting file using v0.1/v0.2 to v0.3 conversion");
2525
var file1 = file_text_open_read("stages/"+argument0); // read file (for file 2)
2626
var file2 = file_text_open_write("stages/"+argument0); // write file
2727

@@ -66,4 +66,4 @@ if (ver_num < 2){ // v0.1/v0.2 conversions
6666
file_text_close(file2); // overwrite file1 with file2
6767
}
6868

69-
show_debug_message("Conversion complete");
69+
//show_debug_message("Conversion complete");

scripts/split_object_string.gml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ for (var i = 1; i < string_length(argument0)+1; ++i;){
1111
}
1212
}
1313

14-
show_debug_message(argument0+" -> '"+s_part[0]+","+s_part[1]+","+s_part[2]+"'");
14+
//show_debug_message(argument0+" -> '"+s_part[0]+","+s_part[1]+","+s_part[2]+"'");

0 commit comments

Comments
 (0)