Juan Linietsky 2c2894ceb6 Merge branch 'master' of https://github.com/okamstudio/godot ...

Conflicts:
	modules/gdscript/gd_tokenizer.cpp
	scene/resources/shader_graph.h

2015-03-03 14:41:36 -03:00

..

addheader

GODOT IS OPEN SOURCE

2014-02-09 22:10:30 -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

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/okamstudio/godot

2015-03-03 14:41:36 -03:00

export/blender25

merges from okam repo

2015-03-03 14:39:13 -03: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

3D Physics and Other Stuff

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

script_plugins

-moved script to modules

2014-02-24 09:53:33 -03:00

scrits

GODOT IS OPEN SOURCE

2014-02-09 22:10:30 -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