Commit Graph

21 Commits

Author SHA1 Message Date
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