Juan Linietsky 082e3fbb29 Merge branch 'master' of https://github.com/okamstudio/godot ...

Conflicts:
	main/main.cpp

2015-11-24 10:52:41 -03:00

..

android

tegra 3 fix

2015-11-21 23:21:36 +01:00

bb10

Merge pull request #2707 from akien-mga/master

2015-11-18 19:43:28 -03:00

flash

Cosmetic fixes to SCons buildsystem

2015-11-01 20:53:26 +01:00

haiku

Moved deleting sample player in OS finalize methods to before deleting audio server to prevent crash when exiting.

2015-11-02 16:36:41 +00:00

iphone

Use macros to determine which iOS SDK we have in order to be backwards compatible with older SDKs when fixing template compilation issues.

2015-11-16 12:35:54 +11:00

isim

Fix iOS Simulator SDK path for isim platform.

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

javascript

Add support for Opus audio format

2015-10-02 14:25:38 -03:00

nacl

Add icon to exe file in windows export

2015-11-09 02:23:58 +03:30

osx

Added specific get_locale to OSX platform

2015-10-16 19:42:26 +02:00

server

Moved deleting sample player in OS finalize methods to before deleting audio server to prevent crash when exiting.

2015-11-02 16:36:41 +00:00

windows

-work in progress resourceparser and .tscn parser. Still non-functional

2015-11-24 10:42:05 -03:00

winrt

Added missing \n in script error output.

2015-11-19 15:35:18 +01:00

x11

compile fixes

2015-11-19 20:24:43 -03:00