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 |
Dennis Andersen
|
450f4249f3
|
Documentation - Updated uml diagrams
|
2014-02-10 22:25:31 +01:00 |
lindaandersson
|
49d29d87a5
|
GL - merge with bullet physics and updated server
|
2014-02-10 14:41:43 +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 |
|
Dennis Andersen
|
14bf3ede86
|
Merged with GameLogic and fixed merging errors, some minor justifications may be needed later on due to merging errors..
|
2014-02-09 18:58:14 +01:00 |
|
lindaandersson
|
91db71fe0e
|
GL - 20 boxes and a house
|
2014-02-05 15:54:48 +01:00 |
|
lindaandersson
|
426444ca34
|
GL - added more boxes and weaponfunctionality
|
2014-02-05 11:46:04 +01:00 |
|
lindaandersson
|
e327f64702
|
GL - can play with two characters
|
2014-01-31 16:33:16 +01:00 |
|
lindaandersson
|
57c230d458
|
GL - will merge with physics
|
2014-01-31 13:56:22 +01:00 |
|
lindaandersson
|
0aa39275e3
|
GL - only client with server update server. Update recieverfunction
|
2014-01-30 15:20:35 +01:00 |
|
lindaandersson
|
1ccf98e3eb
|
GL - added loginstate
|
2014-01-30 11:58:44 +01:00 |