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

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

2015-10-05 17:02:42 +02:00

..

Core

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

2015-10-05 17:02:42 +02:00

Game

Improved FPS counter with averaging

2015-10-02 19:01:08 +02:00

GUI

Buttons are now not clickable when they're hidden

2015-10-05 14:27:27 +02:00

Input

Initial structure

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

Physics

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

2015-10-05 17:02:42 +02:00

Rendering

Base lightrendering started, still some work to be done.

2015-09-10 22:13:37 +02:00

Sound

Fixed type error in sound loading

2015-10-01 12:51:29 +02:00

Transform

WIP Level System + Pad

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

PrecompiledHeader.h

Initial structure

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