Commit Graph

7 Commits

Author SHA1 Message Date
Jace 9723d80742 And then Microsoft happened... 2014-05-15 21:50:49 +02:00
Jace 6684aa06b7 Merge branch 'master' into gui
Conflicts:
	src/GUI/Frame.h
	src/InputManager.cpp
2014-05-15 21:16:43 +02:00
Jace d259811795 Xbox360 controller support 2014-05-13 02:24:42 +02:00
Jace ad19848c1b WIP ECS GUI 2014-05-12 22:33:59 +02:00
Jace 9e8c3161e0 WIP Frame 2014-04-29 13:58:37 +02:00
Jace dfd9425473 WIP Frame 2014-04-23 02:19:17 +02:00
Jace 1e2f7fdd5c Skeleton MessageRelay 2014-04-22 19:15:02 +02:00