viktorljung 87fd73f249 Merge remote-tracking branch 'origin/master' into Physics ...

Conflicts:
	src/game/Game/BallSystem.cpp
	src/game/Game/LevelSystem.cpp
	src/game/Physics/PhysicsSystem.cpp

2015-10-08 17:28:28 +02:00

assets

Lifebuoy working

2015-10-08 17:22:19 +02:00

cmake

Liquidfun links

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

deps

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

2015-10-07 18:34:36 +02:00

docs

Initial structure

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

include

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

2015-10-08 17:28:28 +02:00

src

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

2015-10-08 17:28:28 +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

Visual Studio build now outputs all binaries to the same folder regardless of build configuration

2015-10-07 15:48:52 +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%