This repository has been archived by the owner on Nov 14, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
git subrepo pull (merge) --force godot
subrepo: subdir: "godot" merged: "2dc08f1be7" upstream: origin: "https://github.com/V-Sekai/godot.git" branch: "groups-4.4" commit: "2dc08f1be7" git-subrepo: version: "0.4.6" origin: "https://github.com/ingydotnet/git-subrepo" commit: "73a0129" git subrepo pull (merge) --force godot subrepo: subdir: "godot" merged: "4054245829" upstream: origin: "https://github.com/V-Sekai/godot.git" branch: "groups-4.4" commit: "4054245829" git-subrepo: version: "0.4.6" origin: "https://github.com/ingydotnet/git-subrepo" commit: "73a0129"
- Loading branch information
Showing
32 changed files
with
276,954 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,383 @@ | ||
| # Godot auto generated files | ||
| *.gen.* | ||
| .import/ | ||
|
|
||
| # Documentation generated by doxygen or from classes.xml | ||
| doc/_build/ | ||
|
|
||
| # Javascript specific | ||
| *.bc | ||
|
|
||
| # CLion | ||
| cmake-build-debug | ||
|
|
||
| # Android specific | ||
| .gradle | ||
| local.properties | ||
| *.iml | ||
| .idea | ||
| .gradletasknamecache | ||
| project.properties | ||
| platform/android/java/lib/.cxx/ | ||
| platform/android/java/libs/* | ||
| platform/android/java/app/libs/* | ||
| platform/android/java/lib/.cxx/* | ||
|
|
||
| # General c++ generated files | ||
| *.lib | ||
| *.o | ||
| *.ox | ||
| *.a | ||
| *.ax | ||
| *.d | ||
| *.so | ||
| *.os | ||
| *.Plo | ||
| *.lo | ||
|
|
||
| # Libs generated files | ||
| .deps/* | ||
| .dirstamp | ||
|
|
||
| # Gprof output | ||
| gmon.out | ||
|
|
||
| # Vim temp files | ||
| *.swo | ||
| *.swp | ||
|
|
||
| # Qt project files | ||
| *.config | ||
| *.creator | ||
| *.creator.* | ||
| *.files | ||
| *.includes | ||
| *.cflags | ||
| *.cxxflags | ||
|
|
||
| # Code::Blocks files | ||
| *.cbp | ||
| *.layout | ||
| *.depend | ||
|
|
||
| # Eclipse CDT files | ||
| .cproject | ||
| .settings/ | ||
| *.pydevproject | ||
| *.launch | ||
|
|
||
| # Geany/geany-plugins files | ||
| *.geany | ||
| .geanyprj | ||
|
|
||
| # Jetbrains IDEs | ||
| .idea/ | ||
|
|
||
| # Misc | ||
| .DS_Store | ||
| __MACOSX | ||
| logs/ | ||
|
|
||
| # for projects that use SCons for building: http://http://www.scons.org/ | ||
| .sconf_temp | ||
| .sconsign*.dblite | ||
| *.pyc | ||
|
|
||
| # https://github.com/github/gitignore/blob/master/VisualStudio.gitignore | ||
| ## Ignore Visual Studio temporary files, build results, and | ||
| ## files generated by popular Visual Studio add-ons. | ||
|
|
||
| # User-specific files | ||
| *.suo | ||
| *.user | ||
| *.sln.docstates | ||
| *.sln | ||
| *.vcxproj* | ||
|
|
||
| # Custom SCons configuration override | ||
| /custom.py | ||
|
|
||
| # Build results | ||
| [Dd]ebug/ | ||
| [Dd]ebugPublic/ | ||
| [Rr]elease/ | ||
| x64/ | ||
| build/ | ||
| bld/ | ||
| [Bb]in/ | ||
| [Oo]bj/ | ||
| *.debug | ||
| *.dSYM | ||
|
|
||
| # Visual Studio cache/options directory | ||
| .vs/ | ||
|
|
||
| # MSTest test Results | ||
| [Tt]est[Rr]esult*/ | ||
| [Bb]uild[Ll]og.* | ||
|
|
||
| # Hints for improving IntelliSense, created together with VS project | ||
| cpp.hint | ||
|
|
||
| #NUNIT | ||
| *.VisualState.xml | ||
| TestResult.xml | ||
|
|
||
| *.o | ||
| *.a | ||
| *_i.c | ||
| *_p.c | ||
| *_i.h | ||
| *.ilk | ||
| *.meta | ||
| *.obj | ||
| *.pch | ||
| *.pdb | ||
| *.pgc | ||
| *.pgd | ||
| *.rsp | ||
| *.sbr | ||
| *.tlb | ||
| *.tli | ||
| *.tlh | ||
| *.tmp | ||
| *.tmp_proj | ||
| *.bak | ||
| *.log | ||
| *.vspscc | ||
| *.vssscc | ||
| .builds | ||
| *.pidb | ||
| *.svclog | ||
| *.scc | ||
| *.nib | ||
|
|
||
| # Chutzpah Test files | ||
| _Chutzpah* | ||
|
|
||
| # Visual C++ cache files | ||
| ipch/ | ||
| *.aps | ||
| *.ncb | ||
| *.opensdf | ||
| *.sdf | ||
| *.cachefile | ||
| *.VC.db | ||
| *.VC.opendb | ||
| *.VC.VC.opendb | ||
| enc_temp_folder/ | ||
|
|
||
| # Visual Studio profiler | ||
| *.psess | ||
| *.vsp | ||
| *.vspx | ||
|
|
||
| # CodeLite project files | ||
| *.project | ||
| *.workspace | ||
| .codelite/ | ||
|
|
||
| # TFS 2012 Local Workspace | ||
| $tf/ | ||
|
|
||
| # Guidance Automation Toolkit | ||
| *.gpState | ||
|
|
||
| # ReSharper is a .NET coding add-in | ||
| _ReSharper*/ | ||
| *.[Rr]e[Ss]harper | ||
| *.DotSettings.user | ||
|
|
||
| # JustCode is a .NET coding addin-in | ||
| .JustCode | ||
|
|
||
| # TeamCity is a build add-in | ||
| _TeamCity* | ||
|
|
||
| # DotCover is a Code Coverage Tool | ||
| *.dotCover | ||
|
|
||
| # NCrunch | ||
| *.ncrunch* | ||
| _NCrunch_* | ||
| .*crunch*.local.xml | ||
|
|
||
| # MightyMoose | ||
| *.mm.* | ||
| AutoTest.Net/ | ||
|
|
||
| # Web workbench (sass) | ||
| .sass-cache/ | ||
|
|
||
| # Installshield output folder | ||
| [Ee]xpress/ | ||
|
|
||
| # DocProject is a documentation generator add-in | ||
| DocProject/buildhelp/ | ||
| DocProject/Help/*.HxT | ||
| DocProject/Help/*.HxC | ||
| DocProject/Help/*.hhc | ||
| DocProject/Help/*.hhk | ||
| DocProject/Help/*.hhp | ||
| DocProject/Help/Html2 | ||
| DocProject/Help/html | ||
|
|
||
| # Click-Once directory | ||
| publish/ | ||
|
|
||
| # Publish Web Output | ||
| *.[Pp]ublish.xml | ||
| *.azurePubxml | ||
|
|
||
| # NuGet Packages Directory | ||
| ## TODO: If you have NuGet Package Restore enabled, uncomment the next line | ||
| #packages/* | ||
| ## TODO: If the tool you use requires repositories.config, also uncomment the next line | ||
| #!packages/repositories.config | ||
|
|
||
| # Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets | ||
| # This line needs to be after the ignore of the build folder (and the packages folder if the line above has been uncommented) | ||
| !packages/build/ | ||
|
|
||
| # Windows Azure Build Output | ||
| csx/ | ||
| *.build.csdef | ||
|
|
||
| # Windows Store app package directory | ||
| AppPackages/ | ||
|
|
||
| # Others | ||
| sql/ | ||
| *.Cache | ||
| ClientBin/ | ||
| [Ss]tyle[Cc]op.* | ||
| ~$* | ||
| *~ | ||
| *.dbmdl | ||
| *.dbproj.schemaview | ||
| *.pfx | ||
| *.publishsettings | ||
| node_modules/ | ||
| __pycache__/ | ||
|
|
||
| # KDE | ||
| .directory | ||
|
|
||
| #Kdevelop project files | ||
| *.kdev4 | ||
|
|
||
| # Xcode | ||
| xcuserdata/ | ||
| *.xcscmblueprint | ||
| *.xccheckout | ||
| *.xcodeproj/* | ||
|
|
||
| # RIA/Silverlight projects | ||
| Generated_Code/ | ||
|
|
||
| # Backup & report files from converting an old project file to a newer | ||
| # Visual Studio version. Backup files are not needed, because we have git ;-) | ||
| _UpgradeReport_Files/ | ||
| Backup*/ | ||
| UpgradeLog*.XML | ||
| UpgradeLog*.htm | ||
|
|
||
| # SQL Server files | ||
| App_Data/*.mdf | ||
| App_Data/*.ldf | ||
|
|
||
| # Business Intelligence projects | ||
| *.rdl.data | ||
| *.bim.layout | ||
| *.bim_*.settings | ||
|
|
||
| # Microsoft Fakes | ||
| FakesAssemblies/ | ||
|
|
||
| # ========================= | ||
| # Windows detritus | ||
| # ========================= | ||
|
|
||
| # Windows image file caches | ||
| [Tt]humbs.db | ||
| [Tt]humbs.db:encryptable | ||
| ehthumbs.db | ||
| ehthumbs_vista.db | ||
|
|
||
| # Windows stackdumps | ||
| *.stackdump | ||
|
|
||
| # Windows shortcuts | ||
| *.lnk | ||
|
|
||
| # Folder config file | ||
| [Dd]esktop.ini | ||
|
|
||
| # Recycle Bin used on file shares | ||
| $RECYCLE.BIN/ | ||
| logo.h | ||
| *.autosave | ||
|
|
||
| # https://github.com/github/gitignore/blob/master/Global/Tags.gitignore | ||
| # Ignore tags created by etags, ctags, gtags (GNU global) and cscope | ||
| TAGS | ||
| !TAGS/ | ||
| tags | ||
| *.tags | ||
| !tags/ | ||
| gtags.files | ||
| GTAGS | ||
| GRTAGS | ||
| GPATH | ||
| cscope.files | ||
| cscope.out | ||
| cscope.in.out | ||
| cscope.po.out | ||
| godot.creator.* | ||
|
|
||
| projects/ | ||
| platform/windows/godot_res.res | ||
|
|
||
| # Visual Studio 2017 and Visual Studio Code workspace folder | ||
| /.vs | ||
| /.vscode | ||
|
|
||
| # Visual Studio Code workspace file | ||
| *.code-workspace | ||
|
|
||
| # Scons construction environment dump | ||
| .scons_env.json | ||
|
|
||
| # Scons progress indicator | ||
| .scons_node_count | ||
|
|
||
| # ccls cache (https://github.com/MaskRay/ccls) | ||
| .ccls-cache/ | ||
|
|
||
| # compile commands (https://clang.llvm.org/docs/JSONCompilationDatabase.html) | ||
| compile_commands.json | ||
|
|
||
| # Cppcheck | ||
| *.cppcheck | ||
| cppcheck-cppcheck-build-dir/ | ||
|
|
||
| # Gcov and Lcov code coverage | ||
| *.gcno | ||
| *.gcda | ||
| *.gcov.html | ||
| *.func.html | ||
| *.func-sort-c.html | ||
| *index-sort-f.html | ||
| *index-sort-l.html | ||
| *index.html | ||
| MachineIndependent/ | ||
| godot.info | ||
| amber.png | ||
| emerald.png | ||
| glass.png | ||
| ruby.png | ||
| snow.png | ||
| updown.png | ||
| gcov.css | ||
|
|
||
| demo/.godot/ |
Oops, something went wrong.