Carl Olsson fb2cdfe7ed Merge branch 'master' of https://github.com/not-surt/godot into snapping2 ...

Conflicts:
	tools/editor/plugins/canvas_item_editor_plugin.cpp
	tools/editor/plugins/canvas_item_editor_plugin.h

2015-03-23 08:19:20 +10:00

..

addheader

…

bmfhdr

…

buildstuff

…

collada

merges from okam repo

2015-03-03 14:39:13 -03:00

doc

-Work in progress visual shader editor *DOES NOT WORK YET*

2015-01-03 16:52:37 -03:00

docdump

Fixed documentation typo

2014-11-11 13:57:25 -05:00

editor

Merge branch 'master' of https://github.com/not-surt/godot into snapping2

2015-03-23 08:19:20 +10:00

export/blender25

merges from okam repo

2015-03-03 14:39:13 -03:00

freetype

…

glwrapper

…

Godot.app/Contents

…

html_fs

…

ios_xcode_template

…

osx_template.app/Contents

…

pck

3D Physics and Other Stuff

2014-09-02 23:13:40 -03:00

script_plugins

Changed *_scene() to *_tree()

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

scrits

…

memsort.py

…

SCsub

Fix compile error when tools=no

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