hurikhan 8a30feebbe Merge remote-tracking branch 'upstream/master' into x11-window-management ...

Conflicts:
	platform/x11/detect.py

2015-01-14 13:31:16 +08:00

..

android

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

2015-01-13 11:23:05 -03:00

bb10

Merge pull request #643 from adolson/custom-export-binary-path-fix

2014-09-17 09:53:43 -03:00

flash

Build System Changes

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

iphone

2D Rewrite Step [1]

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

isim

2D Rewrite Step [1]

2015-01-10 17:35:26 -03: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

Create the test string to detect kb layouts directly from the unicode chars

2015-01-08 10:31:10 -04:30

server

Build System Changes

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

windows

-Initial (untested) implementation of 2D shaders. Probably broken, will be fixed later.

2015-01-11 11:43:31 -03:00

winrt

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

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

x11

Merge remote-tracking branch 'upstream/master' into x11-window-management

2015-01-14 13:31:16 +08:00