Dander7BD
|
e37dd606ba
|
Merge remote-tracking branch 'origin/GameServer' into GameClient
Conflicts:
Code/Game/GameClient/GameClientState/NetLoadState.cpp
|
2014-02-18 15:11:03 +01:00 |
|
Dander7BD
|
996f660990
|
Fixes and bugtraps
|
2014-02-18 15:09:01 +01:00 |
|
Dander7BD
|
3218e7b847
|
Connect to Dennis
|
2014-02-18 15:08:47 +01:00 |
dean11
|
e00ddb30c9
|
Fixed server-client communication
|
2014-02-18 13:12:08 +01:00 |
|
dean11
|
a79bcbe8d3
|
GameServer - Merged with GameClient
|
2014-02-18 13:11:45 +01:00 |
|
Dander7BD
|
b78625c230
|
Merge remote-tracking branch 'origin/GameServer' into GameClient
Conflicts:
Code/Game/GameClient/GameClientState/NetLoadState.cpp
|
2014-02-18 13:10:17 +01:00 |
|
Dander7BD
|
500ac117a7
|
removed debug lines
|
2014-02-18 12:59:51 +01:00 |
|
Dander7BD
|
2e75d168a1
|
New Cameras
V2 is quaternion based
|
2014-02-18 12:04:22 +01:00 |
lanariel
|
0a70839211
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient
|
2014-02-18 12:02:58 +01:00 |
|
lanariel
|
f9f4d55123
|
Graphics fix
|
2014-02-18 12:02:48 +01:00 |
|
dean11
|
cec2740896
|
GameServer - Fixed minor miss with inheritance
|
2014-02-18 11:56:36 +01:00 |
|
dean11
|
222c203b69
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer
|
2014-02-18 11:44:23 +01:00 |
|
dean11
|
484b055338
|
GL - Call by reference instead
|
2014-02-18 11:44:02 +01:00 |
|
dean11
|
562f444193
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer
|
2014-02-18 11:34:46 +01:00 |
|
dean11
|
f6f183d6e7
|
GameServer - Added inititiate protocols
|
2014-02-18 11:34:24 +01:00 |
Erik Persson
|
06ddb86b17
|
GL - GetAllDynamicObjects , dennis order
|
2014-02-18 11:33:36 +01:00 |
|
Dander7BD
|
0bd5d68da4
|
Removed some debug lines
|
2014-02-18 11:12:47 +01:00 |
|
Dander7BD
|
b2e98f1207
|
Debug hack + actual fixings
|
2014-02-18 10:32:09 +01:00 |
|
lanariel
|
55e3aaaabc
|
Fixed proper start and some more option modifications
|
2014-02-18 10:19:59 +01:00 |
|
lanariel
|
0f492e7bc6
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient
|
2014-02-18 09:33:44 +01:00 |
|
lanariel
|
197067687e
|
Added Gui Transparancy,
Get Options provides Resolution.xy
|
2014-02-18 09:32:10 +01:00 |
|
Dennis Andersen
|
5b4758d2ae
|
Broekn
|
2014-02-18 08:55:38 +01:00 |
|
Dander7BD
|
6f368b4565
|
compilation error dealt with
|
2014-02-18 08:53:52 +01:00 |
|
Dander7BD
|
a2317b2e30
|
Merge remote-tracking branch 'origin/GameServer' into GameClient
|
2014-02-17 16:18:52 +01:00 |
|
Dander7BD
|
112f45463a
|
Oops .. Forgot to save this one for the previous commit
|
2014-02-17 16:18:21 +01:00 |
|
dean11
|
830b448690
|
Temp
|
2014-02-17 16:17:07 +01:00 |
|
Dander7BD
|
12623d1b16
|
Bunch of implementations
|
2014-02-17 16:16:39 +01:00 |
|
dean11
|
a0c9677123
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient
|
2014-02-17 15:12:29 +01:00 |
|
dean11
|
2bc7c9f65f
|
GameServer - added more features to object protocols
|
2014-02-17 15:11:12 +01:00 |
|
Dander7BD
|
b93e20e942
|
Bunch of implementations
|
2014-02-17 14:33:23 +01:00 |
|
lanariel
|
52301021f6
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient
|
2014-02-17 13:06:54 +01:00 |
|
lanariel
|
51a8569585
|
Color is now Float4 with RGBA
|
2014-02-17 13:05:35 +01:00 |
|
Dander7BD
|
013546f076
|
minor edit
|
2014-02-17 12:02:18 +01:00 |
|
Dander7BD
|
29f66d2874
|
Fixed build errors in GameClient
|
2014-02-17 11:50:51 +01:00 |
|
Dander7BD
|
aa2518a4f6
|
Patch
|
2014-02-17 11:27:43 +01:00 |
|
dean11
|
7395a0a495
|
Major cleanup
|
2014-02-17 10:38:11 +01:00 |
|
dean11
|
fb48b0b34c
|
Merge branch 'Camera' of https://github.com/dean11/Danbias into GameServer
|
2014-02-17 09:11:08 +01:00 |
|
Dander7BD
|
509fdb5572
|
Merge remote-tracking branch 'origin/GameLogic' into Camera-merge-buffer
Conflicts:
Code/Game/DanBiasGame/GameClientState/GameState.cpp
|
2014-02-17 09:07:27 +01:00 |
|
dean11
|
d96825816d
|
Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameServer
|
2014-02-17 09:01:41 +01:00 |
|
dean11
|
bb8d3549dc
|
Cleanup
|
2014-02-17 09:01:01 +01:00 |
|
Dennis Andersen
|
5119af8127
|
Gameserver - Added more features to standalone srver
|
2014-02-17 08:53:15 +01:00 |
Robin Engman
|
a90f33d20e
|
Jumpy jump
|
2014-02-17 06:44:29 +01:00 |
|
Dennis Andersen
|
85ebe3a7ca
|
GameServer - Merged with Input, Added some athur info in headers
|
2014-02-16 01:38:03 +01:00 |
|
Dennis Andersen
|
97f9bfcb96
|
GameServer - merged with Camera
|
2014-02-16 01:28:34 +01:00 |
|
Dennis Andersen
|
9d0148c5c2
|
GameServer - Merged with Standalone Server and modified some stuff, still compile errors, will try to merge with other
|
2014-02-16 01:12:27 +01:00 |
|
Dennis Andersen
|
21c640c6e1
|
GameServer - Merged with Standalone Server and modified some stuff, still compile errors, will try to merge with other
|
2014-02-16 01:12:03 +01:00 |
|
Dennis Andersen
|
deb173bc46
|
GameServer - Merged with gamephysics
|
2014-02-15 22:49:13 +01:00 |
|
Dennis Andersen
|
b834f1fb9b
|
GameServer - Merged with GameServer
|
2014-02-15 22:33:40 +01:00 |
|
Dennis Andersen
|
359c208f57
|
GameServer - Some minor changes
|
2014-02-15 09:29:54 +01:00 |
|
Dander7BD
|
2dde8547b7
|
Server poking
|
2014-02-14 17:12:38 +01:00 |