Commit Graph

8 Commits

Author SHA1 Message Date
Dander7BD 322f752deb Merge remote-tracking branch 'origin/GameServer' into Camera
Conflicts:
	Code/Game/DanBiasGame/GameClientState/GameState.cpp
2014-02-11 13:21:44 +01:00
lanariel e0f3031187 Pointlight no pointer Model render pointer 2014-02-10 16:08:03 +01:00
lindaandersson c87bab8808 GL - started using the lvl format. Objects on client have pos, rot and scale (not verified) 2014-02-10 14:00:14 +01:00
lindaandersson f657a58a4f GL - adding a camera on the client 2014-01-23 08:24:35 +01:00
lindaandersson c541d032e7 GL - can move a obj on the client via the server 2014-01-10 10:47:54 +01:00
Linda Andersson ba6f7114b5 GL - added id in object, vector 2013-12-19 11:58:42 +01:00
Linda Andersson dc3221ee11 GL - set pos function for C_models 2013-12-16 11:08:10 +01:00
Linda Andersson fa1473455f GL - added C_obj files, client obj in game state to send input 2013-12-16 09:45:12 +01:00