Mariano Javier Suligoy c688b55019 Merge branch 'master' of https://github.com/okamstudio/godot ...

# Solved Conflicts:
#	tools/editor/property_editor.cpp
#	tools/editor/property_editor.h

2015-08-30 02:48:45 -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

Several performance improvements, mainly in loading and instancing scenes and resources.

2015-06-29 00:29:49 -03:00

doc

Several performance improvements, mainly in loading and instancing scenes and resources.

2015-06-29 00:29:49 -03:00

docdump

Several performance improvements, mainly in loading and instancing scenes and resources.

2015-06-29 00:29:49 -03:00

editor

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

2015-08-30 02:48:45 -03:00

export/blender25

when copy images enabled, 'images' path prefix was only being written to file if the destination file didn't exist. so it only worked the first time.

2015-07-09 17:34:12 -07:00

freetype

Removed unneeded c files from the freetype build rules, to prevent errors compiling under VC

2014-02-11 11:36:49 +00:00

glwrapper

GODOT IS OPEN SOURCE

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

Godot.app/Contents

GODOT IS OPEN SOURCE

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

html_fs

-fixed export templates not loading/exporting on Windows

2014-02-13 18:03:28 -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

GODOT IS OPEN SOURCE

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

pck

ability to run 2D physics in a thread

2015-05-26 01:06:05 -03:00

script_plugins

Changed *_scene() to *_tree()

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

scripts

renamed scrts to scripts, fixes #1525

2015-04-12 15:40:08 -03:00

memsort.py

GODOT IS OPEN SOURCE

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

SCsub

Fix compile error when tools=no

2015-01-09 11:20:02 +08:00