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
|
5aeac78f60
|
instanced structure in place
|
2014-02-21 12:19:53 +01:00 |
|
lanariel
|
8f0a0464a5
|
Merge branch 'Misc' of https://github.com/dean11/Danbias into GameClient
|
2014-02-21 11:51:00 +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
|
c80b6cba79
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient
|
2014-02-21 11:23:46 +01:00 |
|
lindaandersson
|
c460bae943
|
Updated dmg protocol
|
2014-02-21 11:23:38 +01:00 |
Pontus Fransson
|
a46ba0efb5
|
Added print out for disconnect
|
2014-02-21 11:12:24 +01:00 |
Erik Persson
|
29ad63cc48
|
Merge remote-tracking branch 'origin/Physics' into GameLogic
|
2014-02-21 11:11:28 +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 |
|
Pontus Fransson
|
54adb19eb8
|
Unnecessary get client
|
2014-02-21 10:54:30 +01:00 |
|
Pontus Fransson
|
f8b8439874
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient
|
2014-02-21 10:49:46 +01:00 |
|
lindaandersson
|
0ade5fde25
|
GameClient UI base. TODO: make it look pretty
|
2014-02-21 10:49:02 +01:00 |
|
Pontus Fransson
|
93eb598012
|
Fixed dynamic objects not being updated on startup.
|
2014-02-21 10:48:09 +01:00 |
Robin Engman
|
e73c988b81
|
Added ability to get previous velocity for rigid bodies
|
2014-02-21 09:54:32 +01:00 |
|
Erik Persson
|
623359dd66
|
Merge remote-tracking branch 'origin/GameClient' into GameLogic
|
2014-02-21 09:48:54 +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 |
|
dean11
|
3bdb65f92a
|
Misc - Added methods for extracting resource reference count and resource size
|
2014-02-20 17:10:37 +01:00 |
|
dean11
|
9758456f92
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer
|
2014-02-20 16:54:47 +01:00 |
|
dean11
|
a1411bd9da
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer
|
2014-02-20 16:54:36 +01:00 |
|
dean11
|
7d887d81b0
|
GameServer - Modified one row
|
2014-02-20 16:54:24 +01:00 |
|
dean11
|
f84c996a52
|
GameLogic - Added disconnect messages and reuse of players
|
2014-02-20 16:52:36 +01:00 |
|
lindaandersson
|
3bee35785a
|
moved debug buttons to gameState
|
2014-02-20 16:51:14 +01:00 |
|
lindaandersson
|
f03da77a55
|
Merge remote-tracking branch 'origin/Physics' into GameClientGraphics
|
2014-02-20 16:38:41 +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
|
708526a54b
|
Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameServer
|
2014-02-20 16:24:44 +01:00 |
|
dean11
|
8583e40d2f
|
Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-20 16:12:33 +01:00 |
|
Erik Persson
|
41cd83500c
|
GL - deleteing cones in attatchmentMassdriver
|
2014-02-20 16:02:53 +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 |
|
Robin Engman
|
e3141cd1f9
|
Added move to limbo for custom bodies
NO idea if this works
|
2014-02-20 15:45:07 +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
|
6414fc1a4f
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient
|
2014-02-20 12:45:25 +01:00 |
|
dean11
|
ef35172bb9
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameClient
|
2014-02-20 12:45:13 +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
|
50fc2fcc29
|
Merge remote-tracking branch 'origin/GameLogic' into GameClient
|
2014-02-20 11:59:44 +01:00 |
|
lindaandersson
|
1079b20e15
|
Updating player pos and RB, moved camera pos for testing
|
2014-02-20 11:59:26 +01:00 |
|
dean11
|
7ee63f887e
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer
|
2014-02-20 11:58:08 +01:00 |
|
dean11
|
4150ba0fc3
|
GameLogic - Added default scael 1:1
|
2014-02-20 11:57:26 +01:00 |