Merge pull request 'develop' (#3) from develop into master

Reviewed-on: Proyecto-Titulo/juego#3
This commit is contained in:
Chris Cromer 2022-04-05 15:08:59 -04:00
commit 7ca849f361
2 changed files with 4 additions and 43 deletions

4
.gitignore vendored
View File

@ -4,6 +4,9 @@
# Godot Serialisations
api.json
# Visual Studio Code Project file
source.code-workspace
# Visual Studio Cache
.vs/
@ -36,3 +39,4 @@ compile_commands.json
# docs
docs/

View File

@ -1,43 +0,0 @@
{
"folders": [
{
"path": "."
}
],
"settings": {
"files.exclude": {
"**/*.cpp": false,
"**/*.h": false,
"**/*.o": true,
"**/*.svg": true,
"**/*.png": true,
"**/*.a": true,
"**/*.os": true,
"**/*.so": true,
"**/*.dll": true,
"**/*.tmx": true,
"**/*.tsx": true,
"**/SConstruct": false,
"**/__pycache__": true,
"**/.git": true,
"**/*.yml": true,
"**/SCsub": true,
"**/Makefile": false,
"**/bin": true,
"**/build": true,
"godot/android": true,
"godot": true,
"docs": true,
"**/.import": true,
"**/*.import": true,
"compile_commands.json": true,
"**/.sconsign.dblite": true
},
"cSpell.words": [
"gdnative",
"godot",
"lerp",
"tscn"
]
}
}