lindaandersson
|
1d147004a2
|
small fixes and explosive crate do 90 dmg
|
2014-02-21 15:54:43 +01:00 |
|
lindaandersson
|
4f838bb39e
|
Merge remote-tracking branch 'origin/GameLogic' into GameClient
|
2014-02-21 15:42:21 +01:00 |
|
lindaandersson
|
22f52150d5
|
Sending dmg, respawn and dead from player to client
|
2014-02-21 15:42:09 +01:00 |
Erik Persson
|
4360519be7
|
Merge remote-tracking branch 'origin/GameClient' into GameLogic
|
2014-02-21 13:00:20 +01:00 |
|
Erik Persson
|
87cf2d8ac5
|
GL - stuff
|
2014-02-21 12:59:04 +01:00 |
|
lindaandersson
|
b0aa6acdd6
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient
|
2014-02-21 12:38:34 +01:00 |
|
lindaandersson
|
38717f011c
|
Render players with run animation
|
2014-02-21 12:38:25 +01:00 |
|
Erik Persson
|
695d6db7a9
|
Merge remote-tracking branch 'origin/GameServer' into GameLogic
|
2014-02-21 11:57:21 +01:00 |
lanariel
|
957d73f0f7
|
Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameClient
|
2014-02-21 11:50:22 +01:00 |
|
lanariel
|
bd0daf363d
|
start with Instanced
|
2014-02-21 11:49:24 +01:00 |
|
lindaandersson
|
7de0a2ba1b
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameClient
|
2014-02-21 11:24:11 +01:00 |
|
lindaandersson
|
56e45f586e
|
Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameClient
|
2014-02-21 11:23:57 +01:00 |
|
lindaandersson
|
c460bae943
|
Updated dmg protocol
|
2014-02-21 11:23:38 +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 |