41 Commits

Author SHA1 Message Date
673ef0cf88 Ignore some 2.1-specific files 2016-06-25 02:04:27 +02:00
6d45fc0717 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.

(cherry picked from commit 408c26ce0b)
2016-06-04 22:20:02 +02:00
24e5755e72 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.

(cherry picked from commit ca876191e5)
2016-06-04 22:20:02 +02:00
9023a84a93 Remove last NACL references
(cherry picked from commit d3811b490d)
2016-04-27 20:19:12 +02:00
f0b3bf6a1b Add gradle files to gitignore 2016-01-26 17:54:09 +01:00
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
61eb037d5d Remove outdated documentation 2015-12-12 21:18:33 +01:00
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
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
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
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
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
6e87314d83 Add support for Opus audio format 2015-10-02 14:25:38 -03:00
0e60b959cd Fix absolute paths used in doxygen, ignore generated documentation in Git 2015-09-09 02:55:47 -05:00
e8223a90e4 Ignore some extension of files created by Visual Studio 2013 2015-09-06 12:17:50 -03:00
aa4211d477 Hide projects folder. 2015-06-19 21:42:11 -06:00
c76900beb8 draw button focus before text and icon
closes #2047
2015-06-08 10:36:27 -03:00
12bd89a39c small description improvement 2015-05-17 17:19:12 -03:00
c41ef699bc Ignore etags, ctags, gtags and cscope. 2015-05-13 23:54:31 -03:00
1d45cd0ff1 Fix Javascript build. 2015-03-19 10:31:36 +05:30
878e805665 ignore make.bat 2015-02-10 19:18:00 -03:00
58d7678947 Merge branch 'master' of https://github.com/okamstudio/godot into add_sprintf
Conflicts:
	.gitignore
2015-02-10 00:42:28 +00:00
b3ab07ecd8 Merge pull request #1251 from adolson/fscache-stuff
ignore and remove .fscache files. closes #1249
2015-02-09 21:32:07 -03:00
2c1a3dfed6 Merge branch 'master' of https://github.com/okamstudio/godot into add_sprintf 2015-02-01 20:29:11 +00:00
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
eac0de398f ignore and remove .fscache files. closes #1249 2015-01-17 14:19:57 -05:00
d6d85a23c9 Ignored more generated files. 2015-01-10 20:42:28 +00:00
88591af4ac fix saving texture flags to *.png.flags file, closes #399 2015-01-10 02:37:00 -05:00
1378c49a2e More gitignore 2014-06-13 11:02:51 +08:00
40affa8760 Add android x86 build 2014-05-28 15:27:30 +08:00
f5421cdaf3 Auto generate editor_icons.cpp to make it more easy to update editor icons 2014-05-13 23:13:08 +08:00
b771d20070 Ignore doc_data_compressed.h 2014-03-27 11:36:09 -03:00
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
caa1586480 Adding CodeLite hidden folder to .gitignore 2014-03-08 20:46:04 +01:00
5634da9934 Adding CodeLite and KDE files to .gitignore 2014-03-08 20:44:18 +01:00
141b313595 Closes bb-code tags, allowing make_doc.sh to finish 2014-03-05 07:53:33 -08:00
68fa537c3e add logo.h to .gitignore 2014-02-25 21:38:38 +13:00
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
2dac11d044 More gitignore 2014-02-15 22:57:40 +08:00
a17d76e60b Fixed build issue on linux (missing webp include path).
Tested on ArchLinux.
2014-02-14 18:45:20 +04:00
6afd1fd2cb Add .gitignore to ignore autogenerated files in source repository 2014-02-13 23:41:54 +08:00