NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,480 Commits 1 Branch 0 Tags 38 MiB
Commit Graph

667 Commits

Author SHA1 Message Date
Erik Persson 31bf73c2fd GL - weapon energy, force etc inside weapon 2014-02-25 13:56:49 +01:00
Linda Andersson f56323ee01 Merge with affectedByTag. Sending killer ID 2014-02-25 12:12:24 +01:00
Linda Andersson 7460f16512 Added player stats. Added players to level. Respawn logic in level. 2014-02-25 11:46:05 +01:00
Erik Persson 8a359bd1ba GL - only 1 player can manipulate a object at a time 2014-02-25 11:20:46 +01:00
Erik Persson 5ba57c1a72 Merge remote-tracking branch 'origin/GameClient' into GameLogic 2014-02-25 10:44:51 +01:00
Erik Persson bc17a9f09e merge 2014-02-25 10:37:33 +01:00
lanariel 53f0699b61 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-25 09:45:13 +01:00
lanariel f35f96b8f2 Instanced fix, render char, manual instanced flag per model, wireframe fix 2014-02-25 09:45:02 +01:00
Linda Andersson 1b0772a004 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-24 14:59:35 +01:00
lindaandersson 114e14c408 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-24 14:59:09 +01:00
lindaandersson 627063748d Player action protocol added 2014-02-24 14:59:01 +01:00
Linda Andersson 704e562d01 Merge branch 'GameServer' into GameClient 2014-02-24 14:48:36 +01:00
lanariel 37e9d47207 Instanced Rendering 2014-02-24 14:44:36 +01:00
Pontus Fransson 8e9d1a4999 Reworked NetworkClient's thread. 
Cpu usage is decreased and recv/send rate should be increased.
 2014-02-22 22:38:28 +01:00
Pontus Fransson 6eb0a282c2 LevelLoader reads lights and cgMesh correctly. 2014-02-22 12:58:43 +01:00
lindaandersson 7bb67b6a85 sec respawn 2014-02-21 15:56:32 +01:00
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 8e0f6eefda Merge remote-tracking branch 'origin/Physics' into GameLogic 2014-02-21 15:04:48 +01:00
Erik Persson ed3152057c GL - fixing with explosivecrate and massdriver 2014-02-21 15:02:42 +01:00
Robin Engman e133562021 Merge with server 2014-02-21 14:14:30 +01:00
Robin Engman 954dc67f7a Fixed multiple collisions 2014-02-21 14:09:38 +01:00
Pontus Fransson 1c71d7ef80 Don't update/send to inavlidated clients 2014-02-21 13:54:04 +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
Erik Persson a4a531264f GL - second draft damage 2014-02-21 11:56:48 +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
Pontus Fransson 5742f45392 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer 2014-02-21 11:45:11 +01:00
Erik Persson 1776601961 GL - damage first draft 2014-02-21 11:35:38 +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 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
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 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