aboutsummaryrefslogtreecommitdiffstats
path: root/godot/assets
diff options
context:
space:
mode:
authorLibravatar IcECreAm777 <31211782+IcECreAm777@users.noreply.github.com>2022-07-17 14:31:56 +0200
committerLibravatar IcECreAm777 <31211782+IcECreAm777@users.noreply.github.com>2022-07-17 14:31:56 +0200
commit9e9101b8c27d723696367692ac7ba24e5248ce37 (patch)
treef50df3a5602c472592b12b58fa2dba17de437f88 /godot/assets
parentb1ad6a28e2b0e44ffcd36909efd66c05701baad6 (diff)
parent0d2293cc5277f9c61970e35011bbbb27470156f8 (diff)
download2022-9e9101b8c27d723696367692ac7ba24e5248ce37.tar.gz
2022-9e9101b8c27d723696367692ac7ba24e5248ce37.tar.bz2
2022-9e9101b8c27d723696367692ac7ba24e5248ce37.zip
Merge branch 'main' of https://codeberg.org/code-your-friends/gmtk2022
Diffstat (limited to 'godot/assets')
-rw-r--r--godot/assets/game_objects/carTire(Clone).material4
-rw-r--r--godot/assets/game_objects/level2_track.glbbin329320 -> 392072 bytes
-rw-r--r--godot/assets/game_objects/stone(Clone).material4
-rw-r--r--godot/assets/game_objects/wood(Clone).material4
4 files changed, 6 insertions, 6 deletions
diff --git a/godot/assets/game_objects/carTire(Clone).material b/godot/assets/game_objects/carTire(Clone).material
index 3c9b0af..74e662a 100644
--- a/godot/assets/game_objects/carTire(Clone).material
+++ b/godot/assets/game_objects/carTire(Clone).material
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:309e6bb7f91f0005bbebc9d7df56d653a9b61923cea1e7be6c4d57c6a7578711
-size 1638
+oid sha256:d80bbc8df69427ba449023c1e786e8dd761ac30b2e3423d2d5a390f11d07faff
+size 292
diff --git a/godot/assets/game_objects/level2_track.glb b/godot/assets/game_objects/level2_track.glb
index 9a9c2c3..d8bd7c9 100644
--- a/godot/assets/game_objects/level2_track.glb
+++ b/godot/assets/game_objects/level2_track.glb
Binary files differ
diff --git a/godot/assets/game_objects/stone(Clone).material b/godot/assets/game_objects/stone(Clone).material
index d3491ac..dd7a6bb 100644
--- a/godot/assets/game_objects/stone(Clone).material
+++ b/godot/assets/game_objects/stone(Clone).material
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:b3315e564b72e2de9bf36f21cd409a72bd23dc87811c4cc98701cdf4a926d680
-size 1634
+oid sha256:6bda96ce6a9969c5bca66bec269f889f463d65184797c048469a8ce43ba9b99e
+size 757
diff --git a/godot/assets/game_objects/wood(Clone).material b/godot/assets/game_objects/wood(Clone).material
index a2b99fc..8f2744d 100644
--- a/godot/assets/game_objects/wood(Clone).material
+++ b/godot/assets/game_objects/wood(Clone).material
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:dec0442f5e823ccb503c5334c767b22f47ba29312a4ae74a7998a860768a28f3
-size 1632
+oid sha256:1ee77734bd2240a0421671f73052e7b26dde28009983e59f3f7f071e5e4f0137
+size 292