Dander7BD
|
fe6742f9e2
|
Tweaks and a new state: NetLoadState
|
2014-02-14 14:31:01 +01:00 |
|
Dander7BD
|
e6c5f1f6e5
|
Merge errors dealt with
|
2014-02-14 12:09:59 +01:00 |
|
Dander7BD
|
36c6689c7a
|
bug fixes
|
2014-02-14 11:37:20 +01:00 |
|
Dander7BD
|
2bfcda3b50
|
MousePos available in all relevant states
|
2014-02-14 11:32:16 +01:00 |
|
Dander7BD
|
6f9483041b
|
Temporary mouse pos add + other stuff
|
2014-02-14 11:26:50 +01:00 |
|
Dander7BD
|
b9895f8c7f
|
All states fix
All new compilation errors dealt with
|
2014-02-14 09:54:05 +01:00 |
|
Dander7BD
|
49fc55be60
|
Textfield and Bunch of fixes
|
2014-02-14 09:40:53 +01:00 |
|
Dander7BD
|
d60fd65805
|
Overhaul LanMenuState
|
2014-02-13 10:14:44 +01:00 |
|
Dander7BD
|
63bc360645
|
stuff
|
2014-02-12 16:31:15 +01:00 |
|
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
|
af85a6efdc
|
Compiler fixes in State classes
|
2014-02-12 10:43:06 +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 |
|
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 |
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 |