Lynix b16abf0d09 Merge branch 'master' into NDK ...

Conflicts:
	build/scripts/module/renderer.lua
	build/scripts/module/utility.lua
	include/Nazara/Renderer/OpenGL.hpp
	src/Nazara/Core/String.cpp

Former-commit-id: 0a8054be56f01b12c604c88b829cb10b490a9d6f

2015-09-20 23:41:21 +02:00

..

Audio

Make signals arguments clearer

2015-09-14 22:40:38 +02:00

Core

Merge branch 'master' into NDK

2015-09-20 23:41:21 +02:00

Graphics

Ndk: Add support for 2D rendering

2015-09-18 12:34:05 +02:00

Lua

Lua/LuaInstance: Fix warning + optimizations

2015-09-13 00:56:53 +02:00

Math

Merge branch 'master' into NDK

2015-08-21 18:55:58 +02:00

Noise

Separate NAZARA_API into multiple defines (one per module)

2015-06-13 22:31:29 +02:00

Physics

Physics/Geom: Fix NullGeom InertialMatrix

2015-09-19 14:44:41 +02:00

Renderer

Merge branch 'master' into NDK

2015-09-20 23:41:21 +02:00

Utility

Merge branch 'master' into NDK

2015-09-20 23:41:21 +02:00

Audio.hpp

Regenerate global headers

2015-06-24 13:56:18 +02:00

Core.hpp

Merge branch 'master' into NDK

2015-08-21 18:55:58 +02:00

Debug.hpp

Regenerated global headers (and updated copyright year, again)

2015-01-30 22:33:41 +01:00

DebugOff.hpp

Regenerated global headers (and updated copyright year, again)

2015-01-30 22:33:41 +01:00

Graphics.hpp

Regenerate global headers

2015-06-24 13:56:18 +02:00

Lua.hpp

Regenerate global headers

2015-06-24 13:56:18 +02:00

Math.hpp

Regenerate global headers

2015-06-24 13:56:18 +02:00

Noise.hpp

Regenerate global headers

2015-06-24 13:56:18 +02:00

Physics.hpp

Regenerate global headers

2015-06-24 13:56:18 +02:00

Prerequesites.hpp

Merge branch 'master' into NDK

2015-09-20 23:41:21 +02:00

Renderer.hpp

Regenerate global headers

2015-06-24 13:56:18 +02:00

Utility.hpp

Regenerate global headers

2015-06-24 13:56:18 +02:00