Pontus Fransson
|
5fe89f1d8f
|
Fixed some crashes and added mutex around broadcast options on network server.
|
2014-02-23 22:07:33 +01:00 |
|
Pontus Fransson
|
be1c3e2af0
|
Sending strings in broadcast message.
|
2014-02-23 20:40:29 +01:00 |
|
Pontus Fransson
|
d64f3d7a20
|
Broadcasting works and I am getting the protocols out to LanMenuState!
|
2014-02-23 20:23:15 +01:00 |
|
Pontus Fransson
|
6eb0a282c2
|
LevelLoader reads lights and cgMesh correctly.
|
2014-02-22 12:58:43 +01:00 |
|
Pontus Fransson
|
5742f45392
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer
|
2014-02-21 11:45:11 +01:00 |
Erik Persson
|
3178f08bf0
|
GL - player can shoot, lookdir is now sent
|
2014-02-21 11:10:47 +01:00 |
|
Pontus Fransson
|
4072e7aca2
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer
|
2014-02-21 11:00:21 +01:00 |
lindaandersson
|
0ade5fde25
|
GameClient UI base. TODO: make it look pretty
|
2014-02-21 10:49:02 +01:00 |
dean11
|
956c1a726c
|
Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameServer
|
2014-02-21 09:44:29 +01:00 |
|
Pontus Fransson
|
c718dc5a2b
|
Started implementing broadcasting
|
2014-02-21 09:34:09 +01:00 |
|
lindaandersson
|
3bee35785a
|
moved debug buttons to gameState
|
2014-02-20 16:51:14 +01:00 |
|
lindaandersson
|
d7a9772889
|
Merge with gameServer
|
2014-02-20 16:38:15 +01:00 |
|
lindaandersson
|
d83e545e58
|
Started adding GameUI
|
2014-02-20 16:35:49 +01:00 |
|
Pontus Fransson
|
f532514131
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer
|
2014-02-20 15:57:36 +01:00 |
|
Pontus Fransson
|
dedd0e87c7
|
Added player disconnect protocol.
|
2014-02-20 15:47:11 +01:00 |
lanariel
|
67d150fce1
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient
|
2014-02-20 15:16:20 +01:00 |
|
lanariel
|
a3c4099111
|
Global Tint
|
2014-02-20 15:15:54 +01:00 |
Robin Engman
|
f8f656d7c9
|
Player now has better movement
Something is "dragging" the player slightly, but will be fixed. Bumps up
and down, tweaking physical properties should fix it.
|
2014-02-20 15:14:02 +01:00 |
|
lindaandersson
|
de70388dfb
|
world matrix for RB on client fix
|
2014-02-20 13:35:51 +01:00 |
|
dean11
|
8f3eb586c6
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer
|
2014-02-20 12:44:24 +01:00 |
|
lanariel
|
ab830f2293
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient
|
2014-02-20 12:08:31 +01:00 |
|
lanariel
|
a965c66e13
|
Seperate Glow and Tint
|
2014-02-20 12:07:53 +01:00 |
|
lindaandersson
|
1079b20e15
|
Updating player pos and RB, moved camera pos for testing
|
2014-02-20 11:59:26 +01:00 |
|
dean11
|
b570ca895e
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer
|
2014-02-20 11:48:09 +01:00 |
|
Pontus Fransson
|
84d2c4eb56
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient
|
2014-02-20 11:47:32 +01:00 |
|
Pontus Fransson
|
bdf8c199a3
|
Removed check to not send rotation since it fucked up the rotation.
|
2014-02-20 11:47:18 +01:00 |
|
lindaandersson
|
bf41bd38d4
|
Updating model worldMatrix
|
2014-02-20 11:34:29 +01:00 |
|
dean11
|
8cf0087a95
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer
|
2014-02-20 11:32:57 +01:00 |
Dander7BD
|
d945eea992
|
Fixed left turn mirroring and filter turn signals
|
2014-02-20 11:17:23 +01:00 |
|
Dander7BD
|
a78a4f70f1
|
Dan doing stuff
|
2014-02-20 11:12:53 +01:00 |
|
Dander7BD
|
263eba782b
|
Found unmarked debug hack
Naughty collegues
|
2014-02-20 10:04:38 +01:00 |
|
lindaandersson
|
d22e736ea3
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient
|
2014-02-20 09:21:47 +01:00 |
|
lindaandersson
|
7b87707714
|
GmaeClient fix RBsphere radius
|
2014-02-20 09:21:38 +01:00 |
|
Dander7BD
|
d80dec600b
|
Memory leak dealt with + removed obsolete debug trap
|
2014-02-20 09:20:41 +01:00 |
|
lanariel
|
20cb3c61c5
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient
Conflicts:
Code/Game/GameClient/GameClientState/GameState.cpp
Code/Game/GameClient/GameClientState/NetLoadState.cpp
|
2014-02-20 09:02:57 +01:00 |
|
lanariel
|
745a3802dc
|
touched up SSAO and fixed wireframe rendering in release
|
2014-02-20 09:00:02 +01:00 |
|
lindaandersson
|
0c0fde51b0
|
GameClient Correct scaling on drawn RB
|
2014-02-20 08:56:36 +01:00 |
|
lindaandersson
|
80b2a9edd7
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient
|
2014-02-20 08:44:03 +01:00 |
|
lindaandersson
|
7414544774
|
GameClient exclude RB rendering from release
|
2014-02-20 08:43:54 +01:00 |
|
Dander7BD
|
3b70e0baec
|
Merge remote-tracking branch 'origin/GameClientGraphics' into GameClient
|
2014-02-19 16:09:07 +01:00 |
|
lanariel
|
4697b85e3b
|
Small fixes
|
2014-02-19 15:57:52 +01:00 |
|
Dander7BD
|
48487e681b
|
Merge remote-tracking branch 'origin/GameLogic' into GameClient
|
2014-02-19 15:53:21 +01:00 |
|
dean11
|
13755c0aeb
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer
|
2014-02-19 15:53:20 +01:00 |
|
dean11
|
d07ee997f5
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer
|
2014-02-19 15:53:09 +01:00 |
|
dean11
|
89b73cdf01
|
GameLogic - fixed wrong pointer cast
|
2014-02-19 15:52:16 +01:00 |
|
Dander7BD
|
908d52020a
|
Some fixes and traps
|
2014-02-19 15:47:55 +01:00 |
|
Pontus Fransson
|
f69f3af23d
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient
|
2014-02-19 15:40:23 +01:00 |
|
Pontus Fransson
|
03efca45b8
|
Fixed ButonEllipse it was not up to date. And only resizing the buttons now.
|
2014-02-19 15:40:09 +01:00 |
|
dean11
|
b81995b84b
|
Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-19 15:32:52 +01:00 |
|
Dander7BD
|
a9f554448c
|
some edits in Camera_FPSV2
|
2014-02-19 15:20:50 +01:00 |