Dander7BD
|
af85a6efdc
|
Compiler fixes in State classes
|
2014-02-12 10:43:06 +01:00 |
|
Dander7BD
|
4d78e30fb8
|
Overhaul of GameState
|
2014-02-12 09:02:44 +01:00 |
|
Dander7BD
|
3be98e6647
|
Merge remote-tracking branch 'origin/GameServer' into Camera
Conflicts:
Code/Game/DanBiasGame/GameClientState/GameClientState.h
Code/Game/DanBiasGame/GameClientState/GameState.cpp
|
2014-02-11 14:56:43 +01:00 |
|
Dander7BD
|
0f3c5af04a
|
pre merge
|
2014-02-11 14:47:57 +01:00 |
|
Dander7BD
|
058eada44c
|
Added missing include lines
|
2014-02-11 14:12:14 +01:00 |
dean11
|
de4ea0a830
|
GameServer - Merged with GameLogic, some stuff is broken
|
2014-02-11 13:03:37 +01:00 |
|
dean11
|
3274727923
|
GameServer - Added more gameplay protocols and structured the old mess
|
2014-02-11 10:21:47 +01:00 |
|
Dennis Andersen
|
310ed3dfc5
|
GameServer - Multiplayer now working properly
|
2014-02-09 16:42:26 +01:00 |
|
Dennis Andersen
|
201a07f0dc
|
GameServer - Merged with GameLogic
|
2014-02-05 15:16:31 +01:00 |
|
Dennis Andersen
|
de8c76f051
|
GameServer - Fixed bugg where threads touched same data, n players should now be able to connect
|
2014-02-04 16:07:10 +01:00 |
lindaandersson
|
5b263caccd
|
GL - merge with GL
|
2014-01-31 16:42:25 +01:00 |
Erik Persson
|
b753387649
|
asd
|
2014-01-31 14:14:20 +01:00 |
|
lindaandersson
|
57c230d458
|
GL - will merge with physics
|
2014-01-31 13:56:22 +01:00 |
|
Dennis Andersen
|
40f0fe61f0
|
GameServer - Fixed Protocols not recieveing properly and fixed the resource loader.
|
2014-01-31 08:41:08 +01:00 |
|
lindaandersson
|
a249e7ede9
|
GL - merge with new serverAPI
|
2014-01-30 10:57:44 +01:00 |
|
Dennis Andersen
|
fa29cd7307
|
GameServer - Merged with GameLogic
|
2014-01-30 00:19:00 +01:00 |
|
lindaandersson
|
16334ea2db
|
GL - collision working, going to merge with physics
|
2014-01-29 13:18:17 +01:00 |
|
Dennis Andersen
|
36f057d2cc
|
Broekn branch not broekn more
|
2014-01-29 10:18:01 +01:00 |
|
Dennis Andersen
|
f7f59e8ac8
|
GameServer - Added more protocols and modified old ones a bit. Also added a new project that starts both server and client
|
2014-01-21 09:52:48 +01:00 |
|
Dennis Andersen
|
6c3c234be1
|
GameLogic - pree-sprint merge
|
2014-01-20 15:47:52 +01:00 |
|
lindaandersson
|
32e64c0dbb
|
GL - moved reciever struct to a separate file
|
2014-01-14 10:25:49 +01:00 |