Stiffly 1a1b94477e Merge remote-tracking branch 'origin/master' into water ...

Conflicts:
	include/Core/Engine.h
	include/Physics/PhysicsSystem.h
	include/Sound/SoundSystem.h
	src/game/Physics/PhysicsSystem.cpp
	src/game/Sound/SoundSystem.cpp
PS:min teori i förra commiten var sann

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

..

Core

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

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

Game

Merge branch 'LevelSystemAndSuch', and adjusted ball size.

2015-10-06 20:35:44 +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 water

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

Rendering

Base lightrendering started, still some work to be done.

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

Sound

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

2015-10-07 18:34:36 +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