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

..

android

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

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

bb10

merges from okam repo

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

flash

Build System Changes

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

iphone

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

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

isim

Fix iOS Simulator SDK path for isim platform.

2015-01-22 22:19:45 +01:00

javascript

Build System Changes

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

nacl

2D Rewrite Step [1]

2015-01-10 17:35:26 -03:00

osx

fix for “no viable conversion from 'NSPoint' (aka '_NSPoint') to 'CGPoint'” build error on OS X

2015-02-17 19:19:29 -08:00

server

SCons: colored compilation

2015-01-12 12:54:17 +08:00

windows

Merge pull request #1437 from Hinsbart/fix_win_joy

2015-03-02 01:00:56 -03:00

winrt

support for light and normal mapping in 2D

2015-02-18 19:40:02 -03:00

x11

fixes to mouse warp

2015-02-14 19:22:06 -03:00