viktorljung 8ca01ae9c7 Merge remote-tracking branch 'origin/master' into Physics ...

Conflicts:
	include/Core/Engine.h
	src/game/Game/PadSystem.cpp
	src/game/Physics/PhysicsSystem.cpp

2015-09-17 17:11:37 +02:00

assets

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

2015-09-17 17:11:37 +02:00

cmake

Liquidfun links

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

deps

Liquidfun links

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

docs

Initial structure

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

include

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

2015-09-17 17:11:37 +02:00

src

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

2015-09-17 17:11:37 +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

Semi-working Linux build

2015-09-08 21:47:10 +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%