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

..

2d

-added hints to sprite v/hframes, fixes truncation problem

2015-08-29 13:02:56 -03:00

3d

-added hints to sprite v/hframes, fixes truncation problem

2015-08-29 13:02:56 -03:00

animation

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

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

audio

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

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

gui

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

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

io

**WARNING BEFORE PULLING**

2015-08-23 20:15:56 -03:00

main

live debug fixes

2015-08-02 20:28:10 -03:00

resources

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

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

register_scene_types.cpp

Added new NinePatch control (could be done before with Panel and Stylebox but this is easier)

2015-08-24 09:39:16 -03:00

register_scene_types.h

Updated copyright year in all headers

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

scene_string_names.cpp

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

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

scene_string_names.h

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

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

SCsub

Build System Changes

2014-10-07 01:31:49 -03:00