Compare commits
2 commits
dev-player
...
master
Author | SHA1 | Date | |
---|---|---|---|
4deb8e5daf | |||
7bc189a976 |
2 changed files with 32 additions and 0 deletions
20
.gitattributes
vendored
Normal file
20
.gitattributes
vendored
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
# Properly detect languages
|
||||||
|
*.h linguist-language=cpp
|
||||||
|
*.inc linguist-language=cpp
|
||||||
|
thirdparty/* linguist-vendored
|
||||||
|
|
||||||
|
# Normalize EOL for all files that Git considers text files
|
||||||
|
* text=auto eol=lf
|
||||||
|
# Except for bat files, which are Windows only files
|
||||||
|
*.bat eol=crlf
|
||||||
|
# And some test files where the EOL matters
|
||||||
|
*.test.txt -text
|
||||||
|
|
||||||
|
# The above only works properly for Git 2.10+, so for older versions
|
||||||
|
# we need to manually list the binary files we don't want modified.
|
||||||
|
*.icns binary
|
||||||
|
*.ico binary
|
||||||
|
*.jar binary
|
||||||
|
*.png binary
|
||||||
|
*.ttf binary
|
||||||
|
*.tza binary
|
12
README.md
12
README.md
|
@ -1,2 +1,14 @@
|
||||||
# 2DHackAndSlay
|
# 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
|
||||||
|
|
Reference in a new issue