diff --git a/assets/Sounds/.gitkeep b/Assets/Sounds/.gitkeep similarity index 100% rename from assets/Sounds/.gitkeep rename to Assets/Sounds/.gitkeep diff --git a/assets/Textures/.gitkeep b/Assets/Textures/.gitkeep similarity index 100% rename from assets/Textures/.gitkeep rename to Assets/Textures/.gitkeep diff --git a/Assets/Textures/Tilesets/colony-db32.png b/Assets/Textures/Tilesets/colony-db32.png new file mode 100644 index 0000000..68577b1 Binary files /dev/null and b/Assets/Textures/Tilesets/colony-db32.png differ diff --git a/Assets/Textures/Tilesets/colony-db32.png.import b/Assets/Textures/Tilesets/colony-db32.png.import new file mode 100644 index 0000000..a0be1ec --- /dev/null +++ b/Assets/Textures/Tilesets/colony-db32.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/colony-db32.png-15441baa6f893f3d7ac9b44cad974223.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Textures/Tilesets/colony-db32.png" +dest_files=[ "res://.import/colony-db32.png-15441baa6f893f3d7ac9b44cad974223.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Assets/Textures/Tilesets/colony.png b/Assets/Textures/Tilesets/colony.png new file mode 100644 index 0000000..c640079 Binary files /dev/null and b/Assets/Textures/Tilesets/colony.png differ diff --git a/Assets/Textures/Tilesets/colony.png.import b/Assets/Textures/Tilesets/colony.png.import new file mode 100644 index 0000000..d6fb4e8 --- /dev/null +++ b/Assets/Textures/Tilesets/colony.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/colony.png-7e0f1c6e1f6ff8cbe6d6c840c822d3ba.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Textures/Tilesets/colony.png" +dest_files=[ "res://.import/colony.png-7e0f1c6e1f6ff8cbe6d6c840c822d3ba.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/README.md b/README.md index d709770..734d066 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,14 @@ # 2DHackAndSlay +## Branches + +- [stable](https://git.euph.dev/GameDev/2DHackAndSlay/src/branch/stable) - This is the Most stable branch and only will get PRs from [nightly](https://git.euph.dev/GameDev/2DHackAndSlay/src/branch/nightly) +- [nightly](https://git.euph.dev/GameDev/2DHackAndSlay/src/branch/nightly) - This Branch will only get PRs from [dev-base](https://git.euph.dev/GameDev/2DHackAndSlay/src/branch/dev-base)its meant for testing +- [dev-base](https://git.euph.dev/GameDev/2DHackAndSlay/src/branch/dev-base) - On This branch the Diffrent dev branches will be merged and code may be written to combine everything. when this branch is at a somewhat stable branch it gets a PR to [nightly](https://git.euph.dev/GameDev/2DHackAndSlay/src/branch/nightly) +- dev-* - Dev branches with their respective goal which will be merged into dev-base + +## Resources used: + +### Game Art + +- https://opengameart.org/content/colony-sim-assets diff --git a/scenes/.gitkeep b/Scenes/.gitkeep similarity index 100% rename from scenes/.gitkeep rename to Scenes/.gitkeep diff --git a/scripts/.gitkeep b/Scripts/.gitkeep similarity index 100% rename from scripts/.gitkeep rename to Scripts/.gitkeep