Stiffly 0180b29544 Merge remote-tracking branch 'origin/master' into Sound ...

Conflicts:
	src/game/Sound/SoundSystem.cpp

2015-10-16 11:53:38 +02:00

..

Core

Improved config loading to read default options from one file and overrides from another and merge differences properly

2015-10-15 17:55:56 +02:00

Game

Working skeletal animations!!!

2015-10-15 12:48:28 +02:00

Input

Initial structure

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

Physics

Merge branch 'LevelSystemAndSuch'

2015-10-13 17:45:34 +02:00

Rendering

Animation system now listens to pause events

2015-10-15 18:39:47 +02:00

Sound

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

2015-10-16 11:53:38 +02:00

Transform

WIP Level System + Pad

2015-09-10 20:28:48 +02:00

CMakeLists.txt

Working skeletal animations!!!

2015-10-15 12:48:28 +02:00

main.cpp

Working build with CMake 3.3.1

2015-09-04 14:08:07 +02:00

PrecompiledHeader.cpp

Initial structure

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