Dander7BD
|
5ff8661843
|
Bugs and Compilation errors dealt with
|
2014-02-12 14:33:56 +01:00 |
|
Dander7BD
|
60d1fdba97
|
Merge remote-tracking branch 'origin/GameLogic' into Camera-test-merge
Conflicts:
Code/Game/DanBiasGame/DanBiasGame.vcxproj
Code/Game/DanBiasGame/DanBiasGame_Impl.cpp
Code/Game/DanBiasGame/GameClientState/C_Object.h
Code/Game/DanBiasGame/GameClientState/GameClientState.h
Code/Game/DanBiasGame/GameClientState/GameState.cpp
Code/Game/DanBiasGame/GameClientState/GameState.h
Code/Game/DanBiasGame/GameClientState/LobbyState.h
Code/Game/DanBiasGame/GameClientState/LoginState.h
Code/Game/DanBiasGame/GameClientState/MainState.cpp
Code/Game/GameProtocols/ObjectProtocols.h
Code/Game/GameServer/Implementation/GameSession_General.cpp
|
2014-02-12 13:23:50 +01:00 |
|
Dander7BD
|
6bf7bc898e
|
some more of those overhauls
|
2014-02-12 09:49:08 +01:00 |
lindaandersson
|
5ebac80ec1
|
GL - animated character and some textrendering
|
2014-02-11 15:00:52 +01:00 |
Erik Persson
|
b753387649
|
asd
|
2014-01-31 14:14:20 +01:00 |
Pontus Fransson
|
3c1eed0f3f
|
GL - Added LanMenuState
|
2014-01-30 23:23:37 +01:00 |