giantroostergames/LD54
4
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

metz' changes #1

Merged
mtrx merged 3 commits from broken into main 2023-10-01 21:55:53 +02:00
Conversation 0 Commits 3 Files changed 12 -4
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 4caa694e04 - Show all commits

4
src/game/player.tscn
View file

@ -1,8 +1,4 @@
<<<<<<< HEAD
[gd_scene load_steps=6 format=3 uid="uid://ckau5s2tsb3oc"]
=======
[gd_scene load_steps=8 format=3 uid="uid://ckau5s2tsb3oc"] [gd_scene load_steps=8 format=3 uid="uid://ckau5s2tsb3oc"]
>>>>>>> 687604fc054965ceb81bf5299befc599e0bb90ed
[ext_resource type="Script" path="res://src/game/player_controller.gd" id="1_g4ij8"] [ext_resource type="Script" path="res://src/game/player_controller.gd" id="1_g4ij8"]
[ext_resource type="Texture2D" uid="uid://bx4nammvn7hea" path="res://assets/vehicle2.png" id="2_ifw0w"] [ext_resource type="Texture2D" uid="uid://bx4nammvn7hea" path="res://assets/vehicle2.png" id="2_ifw0w"]