Jace d2bc91be48 Merge remote-tracking branch 'origin/master' into gui ...

Conflicts:
	include/Core/Engine.h
	include/Core/RenderQueue.h
	include/Core/Renderer.h
	src/game/Core/Renderer.cpp

2015-09-25 02:27:00 +02:00

assets

Merge remote-tracking branch 'origin/master' into gui

2015-09-25 02:27:00 +02:00

cmake

Liquidfun links

2015-09-09 18:04:17 +01:00

deps

Merge remote-tracking branch 'origin/master' into Sound

2015-09-14 14:54:41 +02:00

docs

Initial structure

2015-09-04 10:02:06 +02:00

include

Merge remote-tracking branch 'origin/master' into gui

2015-09-25 02:27:00 +02:00

src

Merge remote-tracking branch 'origin/master' into gui

2015-09-25 02:27:00 +02:00

tools

Updated style guide

2015-09-15 17:11:18 +02:00

.gitignore

Initial structure

2015-09-04 10:02:06 +02:00

CMakeLists.txt

Linking OpenAL.

2015-09-14 14:45:44 +02:00

S

Description

No description provided

346 MiB

Languages

C++ 92.1%

GLSL 5.1%

CMake 1.4%

HLSL 0.9%

C 0.2%

Other 0.3%