Commit Graph

11 Commits

Author SHA1 Message Date
Dander7BD 1f90de4cb4 some implemetations 2014-02-24 19:45:13 +01:00
Dennis Andersen 44aab68bfb Input - More support for mouse 2014-02-21 21:04:30 +01:00
Dander7BD 60a5ddc79d Merge remote-tracking branch 'origin/GameClient' into New-inputsystem
Conflicts:
	Code/Game/GameClient/GameClient.vcxproj
	Code/Game/GameClient/GameClientState/GameState.cpp
2014-02-21 12:14:22 +01:00
lindaandersson 0ade5fde25 GameClient UI base. TODO: make it look pretty 2014-02-21 10:49:02 +01:00
Dander7BD ac492b413b implementations 2014-02-21 09:36:43 +01:00
Dander7BD ab70cb53c4 Merge remote-tracking branch 'origin/GameClient' into New-inputsystem
Conflicts:
	Code/Game/GameClient/GameClientState/GameState.cpp
	Code/Game/GameClient/GameClientState/GamingUI.cpp
2014-02-20 17:19:48 +01:00
Dander7BD 61ce9a9a3e New input system integrations 2014-02-20 16:55:34 +01:00
lindaandersson 3bee35785a moved debug buttons to gameState 2014-02-20 16:51:14 +01:00
lindaandersson d83e545e58 Started adding GameUI 2014-02-20 16:35:49 +01:00
Dander7BD cd4e5ae0ec compilation error fixes 2014-02-19 14:00:48 +01:00
Dander7BD 8816efafc8 GameState pre-work for subStates 2014-02-19 13:15:19 +01:00