Commit Graph

53 Commits

Author SHA1 Message Date
Ray Koopa 134d87a338 Ignore .vs folder, fix .vscode comment
(cherry picked from commit ac6ef54500)
2017-05-26 18:08:02 +02:00
Rémi Verschelde fb8cee9af9 Ignore gles3 artifacts to ease git branch switching 2017-04-28 15:19:08 +02:00
Rémi Verschelde 3b687c5474 Move VERSION_MKSTRING logic to version.h
Fixes a bug where the VERSION_PATCH define is not yet in scope if
typedefs.h is included before version.h at compilation time.
2017-04-10 23:08:28 +02:00
Rémi Verschelde 45bf6d9f20 .gitignore: Add app_icon.h and splash.h generated headers
Also sort alphabetically for clarity.
2017-04-10 18:36:31 +02:00
Rémi Verschelde 1b0e2b0c39 Refactoring: rename tools/editor/ to editor/
The other subfolders of tools/ had already been moved to either
editor/, misc/ or thirdparty/, so the hiding the editor code that
deep was no longer meaningful.

(Manual redo of 49c065d29c)
2017-03-18 23:45:45 +01:00
Jakub Grzesik 280a75ac6c added KDevelop project files to gitignore 2016-07-14 13:28:39 +02:00
Pedro J. Estébanez e7b2626707 Make Android build smarter (SCons + Gradle)
Upgrade Gradle and Android plugin for Gradle
Disable all signing and zip-aligning for the export templates
Give correct names to generated APKs
Put .so files built by SCons right where Gradle has to pick them according to arch & build type
Downgrade NDK platform to 14 to match minSdkVersion
2016-06-27 10:49:15 +02:00
George Marques 408c26ce0b
Remove Make-related flags from Android build
They were wrongly placed, creating a file named "-fpic" instead of
applying "-fpic" to the build. This file was in .gitignore, which made it
less noticiable.

This also adds build.gradle to .gitignore.
2016-06-01 21:14:57 -03:00
Juan Linietsky 3e8eb396d7 Finalized DynamicFont implementation
-DynamicFont uses Freetype by default
-Editor fonts are now scalable thanks to this
-Cleaned up documentation browser and added fonts for this
2016-05-29 11:37:52 -03:00
Aleksandar Danilovic ca876191e5 Fix MS Visual Studio build settings
NMake was not setup by the vsproj=yes compilation
parameter. After attempting other possible options,
this is the best fix for our current requirements.
Compiling via NMake is implementing an alternative
to SCons, so this fix escapes out of NMake
environment while also supporting different target
builds and IDE error list integration.

Also sets -j setting to 2 so that it's easy for
people to change it to a propper value and speed it
up a bit for those that do not.

Adds two missing .gitignore Visual Studio temp files
present in Visual Studio's .gitignore.
2016-05-28 17:15:12 +02:00
Juan Linietsky bccdc11dde Added translation support to Godot
included is a French translation!
2016-05-27 19:58:28 -03:00
Michele Valente 49f31197f2 Adds the ".vscode" folder from Visual Studio Code to ".gitignore"
Adds to ".gitignore" the ".vscode" folder which is created when using
Visual Studio Code together with the "C/C++" extension.
2016-05-04 23:42:27 +02:00
Juan Linietsky f338a0c944 base for translation 2016-05-04 09:47:47 -03:00
Rémi Verschelde d3811b490d Remove last NACL references 2016-04-25 19:08:22 +02:00
Kyle Luce feef563f3f Fixes the month consistency issue in enums and get_date etc
- Also updated the docs to reflect this.
- Added some vim temp files to gitignore
- Changed NaCL to be consistent with the other OS_Unix::get_date implementation
   (added 1 to month to map to 1-12)

Ticket:
https://github.com/godotengine/godot/issues/4025
2016-03-13 15:27:39 -07:00
Juan Linietsky 8b1dcbfe4d -Made editor support SSL certs by default (embedded them)
-Made asset sharing support https
-Many fixes to HTTPRequest
-Added an asset installer dialog
-Visual cleanups to asset sharing tab
-Fixed some issues in ScrollContainer, hope it does not break things
-Asset sharing tab is not visible (hidden on purpose) for now.
2016-03-12 10:46:38 -03:00
est31 f0b3bf6a1b Add gradle files to gitignore 2016-01-26 17:54:09 +01:00
Rémi Verschelde 410e418aea Add a Makefile to generate classes doc in various formats
All the generated documentation is put in doc/_build.
2015-12-13 00:01:04 +01:00
Rémi Verschelde 61eb037d5d Remove outdated documentation 2015-12-12 21:18:33 +01:00
est31 e1d02e4831 Make the setting unix-only.
For this, put the detection into the OS class and its subclass.
2015-11-30 02:35:59 +01:00
est31 15f6d3cebf Add way to look for templates at system wide level too
Useful for everybody wanting to package godot.
Fixes #1026.

-> Retain the old behaviour: path in error msg only when exporting.
-> User templates override system templates
2015-11-30 01:36:08 +01:00
Brickcaster f7b090f94a Added windows specific file
godot_res.res is showing up as a changed file when compiling for
windows.  Need to ignore it.
2015-11-23 08:00:52 -05:00
Juan Linietsky 40f8b1d2ea Merge pull request #2434 from cverdes/vsproj
Ignore some extension of files created by Visual Studio 2013
2015-10-17 10:41:42 -03:00
Juan Linietsky 1d800a681b Merge pull request #2457 from firefly2442/doxygen-fix
Fix absolute paths used in doxygen, ignore generated documentation in Git
2015-10-17 10:27:35 -03:00
George Marques 6e87314d83
Add support for Opus audio format 2015-10-02 14:25:38 -03:00
firefly2442 0e60b959cd Fix absolute paths used in doxygen, ignore generated documentation in Git 2015-09-09 02:55:47 -05:00
Cesar Verdes e8223a90e4 Ignore some extension of files created by Visual Studio 2013 2015-09-06 12:17:50 -03:00
Peace Sells aa4211d477 Hide projects folder. 2015-06-19 21:42:11 -06:00
Juan Linietsky c76900beb8 draw button focus before text and icon
closes #2047
2015-06-08 10:36:27 -03:00
Juan Linietsky 12bd89a39c small description improvement 2015-05-17 17:19:12 -03:00
Guilherme Felipe c41ef699bc Ignore etags, ctags, gtags and cscope. 2015-05-13 23:54:31 -03:00
V.VamsiKrishna 1d45cd0ff1 Fix Javascript build. 2015-03-19 10:31:36 +05:30
Juan Linietsky 878e805665 ignore make.bat 2015-02-10 19:18:00 -03:00
Bil Bas (Spooner) 58d7678947 Merge branch 'master' of https://github.com/okamstudio/godot into add_sprintf
Conflicts:
	.gitignore
2015-02-10 00:42:28 +00:00
Juan Linietsky b3ab07ecd8 Merge pull request #1251 from adolson/fscache-stuff
ignore and remove .fscache files. closes #1249
2015-02-09 21:32:07 -03:00
Bil Bas (Spooner) 2c1a3dfed6 Merge branch 'master' of https://github.com/okamstudio/godot into add_sprintf 2015-02-01 20:29:11 +00:00
Juan Linietsky a0511ed59a Color Ramp and Curve Map added to visual shader editing.
Added Color Ramp and Curve Map to shader nodes.
Fixed an issue that crashed Godot Editor right when opened.
2015-01-19 02:39:58 -03:00
Dana Olson eac0de398f ignore and remove .fscache files. closes #1249 2015-01-17 14:19:57 -05:00
Bil Bas (Spooner) d6d85a23c9 Ignored more generated files. 2015-01-10 20:42:28 +00:00
Dana Olson 88591af4ac fix saving texture flags to *.png.flags file, closes #399 2015-01-10 02:37:00 -05:00
marynate 1378c49a2e More gitignore 2014-06-13 11:02:51 +08:00
marynate 40affa8760 Add android x86 build 2014-05-28 15:27:30 +08:00
marynate f5421cdaf3 Auto generate editor_icons.cpp to make it more easy to update editor icons 2014-05-13 23:13:08 +08:00
Hilton Medeiros b771d20070 Ignore doc_data_compressed.h 2014-03-27 11:36:09 -03:00
reduz 188a892195 Merge pull request #169 from bibby/makedoc
Closes bb-code tags, allowing make_doc.sh to finish
2014-03-12 08:58:00 -07:00
Moritz Wundke caa1586480 Adding CodeLite hidden folder to .gitignore 2014-03-08 20:46:04 +01:00
Moritz Wundke 5634da9934 Adding CodeLite and KDE files to .gitignore 2014-03-08 20:44:18 +01:00
bibby 141b313595 Closes bb-code tags, allowing make_doc.sh to finish 2014-03-05 07:53:33 -08:00
C4NCER 68fa537c3e add logo.h to .gitignore 2014-02-25 21:38:38 +13:00
okamstudio 287a6347e6 Merge pull request #74 from rrockru/master
Fixed build issue on linux (missing webp include path).
2014-02-20 23:56:27 -02:00