Juan Linietsky 082e3fbb29 Merge branch 'master' of https://github.com/okamstudio/godot ...

Conflicts:
	main/main.cpp

2015-11-24 10:52:41 -03:00

..

addheader

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

bmfhdr

GODOT IS OPEN SOURCE

2014-02-09 22:10:30 -03:00

buildstuff

GODOT IS OPEN SOURCE

2014-02-09 22:10:30 -03:00

collada

Cosmetic fixes to SCons buildsystem

2015-11-01 20:53:26 +01:00

doc

Fixes the make_doc.sh, <, > and & signs in descriptions that cause the parser to break.

2015-11-19 22:01:42 +11:00

docdump

Fixes the make_doc.sh, <, > and & signs in descriptions that cause the parser to break.

2015-11-19 22:01:42 +11:00

editor

Merge branch 'master' of https://github.com/okamstudio/godot

2015-11-24 10:52:41 -03:00

export/blender25

Remove of use_exclude_ctrl_bones (was removed in io_scene_dae by Sergey Lapin, commit 4210d5e459) in godot_export_manager.py

2015-11-12 17:47:04 +03:00

freetype

Cosmetic fixes to SCons buildsystem

2015-11-01 20:53:26 +01:00

glwrapper

GODOT IS OPEN SOURCE

2014-02-09 22:10:30 -03:00

Godot.app/Contents

Add icon to exe file in windows export

2015-11-09 02:23:58 +03:30

html_fs

HTML5 exporter Improvements

2015-09-10 00:10:54 -03:00

ios_xcode_template

-fix bug in cache for atlas import/export

2014-03-13 22:57:24 -03:00

osx_template.app/Contents

Add icon to exe file in windows export

2015-11-09 02:23:58 +03:30

pck

Cosmetic fixes to SCons buildsystem

2015-11-01 20:53:26 +01:00

pe_bliss

removed iconv dependency from pe_bliss

2015-11-19 11:15:32 -03:00

script_plugins

Changed *_scene() to *_tree()

2015-03-05 23:05:30 +01:00

scripts

Add icon to exe file in windows export

2015-11-09 02:23:58 +03:30

memsort.py

GODOT IS OPEN SOURCE

2014-02-09 22:10:30 -03:00

SCsub

Merge pull request #2518 from masoudbh3/godot-icons

2015-11-19 00:08:47 -03:00