GameDev/2DHackAndSlay
GameDev/2DHackAndSlay
Archived
4
0
Fork 0
Code Issues 2 Pull requests Projects 1 Releases 1 Wiki Activity Actions

Resolve Conflicts #10

Merged
Snoweuph merged 8 commits from dev-scene into dev-base 2023-01-31 11:43:28 +00:00
Conversation 0 Commits 8 Files changed 118 +10 -10
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 058cc9258a - Show all commits

2
.gitignore vendored
View file

@ -1,2 +1,2 @@
# Godot 4+ specific ignores
.godot/
.godot/**/*

18
.godot/editor/filesystem_cache8
View file

@ -1,15 +1,15 @@
0b7126e0c6e86d3ec295a72f5aa6e0bd
::res://::1675163851
default_env.tres::Environment::-1::1675162542::0::1::::<><>::
::res://::1675165180
default_env.tres::Environment::-1::1675165062::0::1::::<><>::
README.md::TextFile::-1::1675151959::0::1::::<><>::
::res://Assets/::1675151972
::res://Assets/Sounds/::1675151972
::res://Assets/Textures/::1675151972
::res://Assets/Textures/Tilesets/::1675163491
colony-db32.png::CompressedTexture2D::4404450484946637002::1675151972::1675163491::1::::<><>::
colony.png::CompressedTexture2D::1480709910974171110::1675151972::1675163462::1::::<><>::
::res://Assets/Tilesets/::1675163543
colony.tres::TileSet::2791284901075920162::1675163543::0::1::::<><>::uid://vdjct0e80o51
::res://Scenes/::1675163662
Test Scene.tscn::PackedScene::1781344238643980781::1675163662::0::1::::<><>::uid://bf1eb4aogv8ru
::res://Assets/Textures/Tilesets/::1675165062
colony-db32.png::CompressedTexture2D::4404450484946637002::1675151972::1675165062::1::::<><>::
colony.png::CompressedTexture2D::1480709910974171110::1675151972::1675165062::1::::<><>::
::res://Assets/Tilesets/::1675165154
colony.tres::TileSet::2791284901075920162::1675165154::0::1::::<><>::uid://vdjct0e80o51
::res://Scenes/::1675165154
Test Scene.tscn::PackedScene::1781344238643980781::1675165154::0::1::::<><>::uid://bf1eb4aogv8ru
::res://Scripts/::1675162112