Erik Persson
|
16f535bfa3
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
Conflicts:
Code/Game/GameLogic/AttatchmentMassDriver.cpp
Code/Game/GameLogic/Game_PlayerData.cpp
Code/Game/GameLogic/Level.cpp
|
2014-01-31 14:16:32 +01:00 |
|
Erik Persson
|
16a342da49
|
GL - adjusting in GL, added forcepushData struct for passing args when shooting. connect changes in network
|
2014-01-31 14:05:52 +01:00 |
Pontus Fransson
|
e718048f7f
|
GL - Lan State
|
2014-01-31 10:49:52 +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 |