Linda Andersson
|
934bc80b62
|
InGame keys: Go to mainMenu with M. Exit client with ESC. Fix drop in drop out correctly.
|
2014-02-26 11:53:33 +01:00 |
Pontus Fransson
|
dbbc7a9769
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-26 10:24:42 +01:00 |
|
Pontus Fransson
|
925f05b3b0
|
Health pickups is now working!
|
2014-02-26 10:23:38 +01:00 |
|
Linda Andersson
|
13d6a062fc
|
Added collision and weapon events and send them to client
|
2014-02-26 10:05:07 +01:00 |
|
Linda Andersson
|
638f2f6241
|
Addded objectDelete protocol. Enable/ disable will be used for visibility on client
|
2014-02-25 16:26:37 +01:00 |
|
Linda Andersson
|
f2bb50804c
|
Play action animation
|
2014-02-25 16:08:45 +01:00 |
|
Linda Andersson
|
f56323ee01
|
Merge with affectedByTag. Sending killer ID
|
2014-02-25 12:12:24 +01:00 |
lanariel
|
f35f96b8f2
|
Instanced fix, render char, manual instanced flag per model, wireframe fix
|
2014-02-25 09:45:02 +01:00 |
|
lindaandersson
|
1d147004a2
|
small fixes and explosive crate do 90 dmg
|
2014-02-21 15:54:43 +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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
Dander7BD
|
d945eea992
|
Fixed left turn mirroring and filter turn signals
|
2014-02-20 11:17:23 +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
|
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
|
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 |
|
Dander7BD
|
8917caf08a
|
removed debug comment
|
2014-02-19 14:20:46 +01:00 |
|
Dander7BD
|
cd4e5ae0ec
|
compilation error fixes
|
2014-02-19 14:00:48 +01:00 |
|
lindaandersson
|
3fe0221342
|
GameClient - fixed render RB
|
2014-02-19 13:41:05 +01:00 |
|
lindaandersson
|
932ef429c2
|
GameClient - removed hardcoding for lvl, use 2ofAll map for correct world. Init player gets wrong scale and isMyPlayer. Need to verify camera on client
|
2014-02-19 12:09:42 +01:00 |
|
lindaandersson
|
77ad199cf6
|
GameClient - merged with all new things
|
2014-02-19 11:31:05 +01:00 |
|
lindaandersson
|
3bc916cfb2
|
GameClient - merge
|
2014-02-19 11:10:28 +01:00 |
|
lindaandersson
|
6ef0a7caa6
|
Added lights to client
|
2014-02-19 10:59:23 +01:00 |