viktorljung a1e49d75fb Merge branch 'Physics' into bugfix ...

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

2015-10-01 15:15:10 +02:00

assets

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

2015-10-01 14:13:51 +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 branch 'Physics' into bugfix

2015-10-01 15:15:10 +02:00

src

Merge branch 'Physics' into bugfix

2015-10-01 15:15:10 +02:00

tools

Header definitions added to style guide

2015-09-28 17:17:24 +02:00

.gitignore

Added ignore rule for .orig files, since nobody seem to be able to look at what they commit...

2015-09-28 21:56:11 +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%