diff --git a/.gitignore b/.gitignore index db15a97..1a13f68 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,40 @@ # Project exclude paths /cmake-build-debug/ /cmake-build-release/ +/engine_log.txt .idea/ -*.DS_Store -engine_log.txt -shooter \ No newline at end of file +shooter + +# Compiled source # +*.com +*.class +*.dll +*.exe +*.o +*.so + +# Packages # +# it's better to unpack these files and commit the raw source +# git has its own built in compression methods +*.7z +*.dmg +*.gz +*.iso +*.jar +*.rar +*.tar +*.zip + +# Logs and databases # +*.log +*.sql +*.sqlite + +# OS generated files # +.DS_Store +.DS_Store? +._* +.Spotlight-V100 +.Trashes +ehthumbs.db +Thumbs.db diff --git a/3dzavr b/3dzavr index a6c37ff..a24f300 160000 --- a/3dzavr +++ b/3dzavr @@ -1 +1 @@ -Subproject commit a6c37ff6cfb910ed49d764ccc570761b530cfeb3 +Subproject commit a24f300e0c546b67008a29a7c3823f4042c8b077