Merge branch 'master' of https://git.sjkillen.ca/sjkillen/hurrmmm

blends/export.py

@@ -23,8 +23,8 @@ def export(path: str):
         use_selection=True,
         export_colors=False,
         export_apply=True,
-        export_animation_mode="NLA_TRACKS",
+        #export_animation_mode="NLA_TRACKS",
-        export_anim_slide_to_zero=True,
+        #export_anim_slide_to_zero=True,
     )
 
 try:

godot/Objects/igloo/igloo.tscn

@@ -0,0 +1,5 @@
+[gd_scene load_steps=2 format=3 uid="uid://dfkyytk42ecwk"]
+
+[ext_resource type="PackedScene" uid="uid://rknk84nhdmnt" path="res://igloo.glb" id="1_0yjwi"]
+
+[node name="igloo" instance=ExtResource("1_0yjwi")]

godot/Objects/igloo/igloo_Igloo_Colour.png.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cbqufebenynym"
+path.bptc="res://.godot/imported/igloo_Igloo_Colour.png-3593c486967c2287e44aad91030db888.bptc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+generator_parameters={}
+
+[deps]
+
+source_file="res://Objects/igloo/igloo_Igloo_Colour.png"
+dest_files=["res://.godot/imported/igloo_Igloo_Colour.png-3593c486967c2287e44aad91030db888.bptc.ctex"]
+
+[params]
+
+compress/mode=2
+compress/high_quality=true
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=0

godot/Objects/igloo/igloo_Igloo_Normal.png.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://7w2x04tm1opn"
+path.bptc="res://.godot/imported/igloo_Igloo_Normal.png-ca22887363a6b45a9fd447d212cdb2df.bptc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+generator_parameters={}
+
+[deps]
+
+source_file="res://Objects/igloo/igloo_Igloo_Normal.png"
+dest_files=["res://.godot/imported/igloo_Igloo_Normal.png-ca22887363a6b45a9fd447d212cdb2df.bptc.ctex"]
+
+[params]
+
+compress/mode=2
+compress/high_quality=true
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=1
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=1
+roughness/src_normal="res://igloo_Igloo_Normal.png"
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=0

godot/UI/TAS UI/RegressButton.cs

@@ -10,9 +10,11 @@ public partial class RegressButton : Button
 	public override void _Ready()
 	{
 		TAS = GetNode<TAS_System>("/root/TAS_System");
-		this.Pressed += () => { TAS.Regress(1); };
+		this.Pressed += () => { 
+			TAS.Regress(1);
+		};
 
-		this.ButtonDown += () => { this.isButtonPressed = true; };
+		this.ButtonDown += () => { this.isButtonPressed = true; TAS.StopIncrementingFrames(); };
 		this.ButtonUp 	+= () => { this.isButtonPressed = false; };
 	}
 

godot/igloo.glb.import

@@ -0,0 +1,32 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://rknk84nhdmnt"
+path="res://.godot/imported/igloo.glb-af63bca172bd1192d88b1bdb1f5af7dc.scn"
+
+[deps]
+
+source_file="res://igloo.glb"
+dest_files=["res://.godot/imported/igloo.glb-af63bca172bd1192d88b1bdb1f5af7dc.scn"]
+
+[params]
+
+nodes/root_type="Node3D"
+nodes/root_name="Scene Root"
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+import_script/path=""
+_subresources={}
+gltf/embedded_image_handling=1