Juan Linietsky 0a717ffee2 Merge branch 'master' of https://github.com/okamstudio/godot ...

Conflicts:
	modules/multiscript/register_types.cpp
	platform/android/java/src/com/android/godot/GodotLib.java

2014-03-13 23:14:35 -03:00

..

android

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

2014-03-13 23:14:35 -03:00

bb10

GODOT IS OPEN SOURCE

2014-02-09 22:10:30 -03:00

flash

-run script in editor

2014-02-20 23:01:44 -03:00

iphone

-fix bug in cache for atlas import/export

2014-03-13 22:57:24 -03:00

isim

-fix bug in cache for atlas import/export

2014-03-13 22:57:24 -03:00

javascript

-improved physics ccd

2014-02-19 11:57:14 -03:00

nacl

GODOT IS OPEN SOURCE

2014-02-09 22:10:30 -03:00

osx

OSX current_videomode size is now initialized with correct resolution based on backing store. Fixes issue where content does not correctly fit in window on retina displays.

2014-02-18 22:48:38 -05:00

server

Stop tracking platform/server/logo.h for it will be autogenerated

2014-02-19 23:51:08 +08:00

windows

Merge pull request #187 from marynate/PR-fix-windows-utf8

2014-03-12 08:47:10 -07:00

x11

fixie

2014-02-26 14:25:42 -03:00