sjkillen
/
hurrmmm
2
1
Fork 0
Code Issues 21 Pull Requests Packages Projects 1 Releases Wiki Activity

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

This commit is contained in:
Spencer Killen 2023-11-12 03:06:35 -07:00
parent 1bd93c1161 d9002b2171
commit e827cbad8f
Signed by: sjkillen
GPG Key ID: 3AF3117BA6FBB75B
6 changed files with 87 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
godot/igloo_Igloo_Colour.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

36
godot/igloo_Igloo_Colour.png.import Normal file
View File

@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://cubs5wn64bh8j"
path.s3tc="res://.godot/imported/igloo_Igloo_Colour.png-53ffaa4f01ab126b02b022a48d701737.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
generator_parameters={}
[deps]
source_file="res://igloo_Igloo_Colour.png"
dest_files=["res://.godot/imported/igloo_Igloo_Colour.png-53ffaa4f01ab126b02b022a48d701737.s3tc.ctex"]
[params]
compress/mode=2
compress/high_quality=false
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

BIN
godot/igloo_Igloo_Normal.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

36
godot/igloo_Igloo_Normal.png.import Normal file
View File

@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://gsn7icv0cccu"
path.s3tc="res://.godot/imported/igloo_Igloo_Normal.png-c26a5981ba757b6a9728ef855805e1dd.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
generator_parameters={}
[deps]
source_file="res://igloo_Igloo_Normal.png"
dest_files=["res://.godot/imported/igloo_Igloo_Normal.png-c26a5981ba757b6a9728ef855805e1dd.s3tc.ctex"]
[params]
compress/mode=2
compress/high_quality=false
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

6
godot/tests/TAS_system/TAS_test_003.tscn
View File

@ -1,10 +1,11 @@
[gd_scene load_steps=7 format=3 uid="uid://1wrwvnt1xuwr"]
[gd_scene load_steps=8 format=3 uid="uid://1wrwvnt1xuwr"]
[ext_resource type="PackedScene" uid="uid://bua7f25rpewkp" path="res://small_room.glb" id="1_m1abe"]
[ext_resource type="PackedScene" uid="uid://drmb4sitb74fx" path="res://control_scheme/controller.tscn" id="2_1yuny"]
[ext_resource type="PackedScene" uid="uid://c43pr474qofhl" path="res://physics/grape.tscn" id="3_kg8e8"]
[ext_resource type="PackedScene" uid="uid://b1uf31ed6h0ir" path="res://UI/TAS UI/TAS UI.tscn" id="4_jskxr"]
[ext_resource type="PackedScene" uid="uid://cfpiau12q3fut" path="res://Objects/child/child.tscn" id="5_jytdk"]
[ext_resource type="PackedScene" uid="uid://dfkyytk42ecwk" path="res://Objects/igloo/igloo.tscn" id="6_wha2i"]
[sub_resource type="Environment" id="Environment_f0m14"]
ambient_light_source = 2
@ -37,3 +38,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.94627, 0)
[node name="child" parent="." index="8" instance=ExtResource("5_jytdk")]
transform = Transform3D(0.4398, 0, 0, 0, 0.4398, 0, 0, 0, 0.4398, 1.40884, 1.45777, 0.000309944)
[node name="igloo" parent="." index="9" instance=ExtResource("6_wha2i")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0205169, 0.381115, -0.0260147)

5
godot/tests/control_scheme/test_basic_controls.tscn
View File

@ -1,4 +1,4 @@
[gd_scene load_steps=8 format=3 uid="uid://70bb2yncbl"]
[gd_scene load_steps=9 format=3 uid="uid://70bb2yncbl"]
[ext_resource type="PackedScene" uid="uid://bua7f25rpewkp" path="res://small_room.glb" id="1_2ticn"]
[ext_resource type="PackedScene" uid="uid://drmb4sitb74fx" path="res://control_scheme/controller.tscn" id="2_dcvuq"]
@ -6,6 +6,7 @@
[ext_resource type="PackedScene" uid="uid://b1uf31ed6h0ir" path="res://UI/TAS UI/TAS UI.tscn" id="4_8yatx"]
[ext_resource type="PackedScene" uid="uid://cx4ohbn84hmc3" path="res://cake.tscn" id="5_udc7s"]
[ext_resource type="PackedScene" uid="uid://cfpiau12q3fut" path="res://Objects/child/child.tscn" id="6_52mue"]
[ext_resource type="PackedScene" uid="uid://dfkyytk42ecwk" path="res://Objects/igloo/igloo.tscn" id="7_ifsxo"]
[sub_resource type="Environment" id="Environment_f0m14"]
ambient_light_source = 2
@ -40,3 +41,5 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.45077, 0)
[node name="child" parent="." index="9" instance=ExtResource("6_52mue")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -2.93688)
[node name="igloo" parent="." index="10" instance=ExtResource("7_ifsxo")]