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

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

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

assets

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

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

cmake

Liquidfun links

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

deps

Passthrough shader for DirectX GUI

2015-10-20 13:52:07 +02:00

docs

Initial structure

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

include

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

2015-10-22 14:07:32 +02:00

src

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

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

tools

Moved shaders to separate OpenGL and DirectX folders

2015-10-19 14:08:12 +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

fixup! CMAKE Conditional compilation against DirectX and OpenGL targets

2015-10-20 15:39:12 +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%