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

648 Commits

Author SHA1 Message Date
Robin Engman 08bec9470e Merge remote-tracking branch 'origin/GameServer' into Physics 2014-02-26 09:39:39 +01:00
Robin Engman ca693c412f Player air check function 2014-02-26 08:51:18 +01:00
Robin Engman 47e6d93957 Fixed player going bonkers on lower hemisphere 2014-02-25 18:25:51 +01:00
Pontus Fransson 9ccdbd55e2 Not connecting with broadcast anymore. 2014-02-24 16:18:47 +01:00
Pontus Fransson bf07ef5f5f Connecting to the ip and port received in the last broadcast message. 2014-02-23 22:25:41 +01:00
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 0cb7940bae Sending real ip address, port and server name. 2014-02-23 21:15:16 +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 a0bf9e862a Started implementing broadcasting. 2014-02-23 18:38:20 +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
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 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
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
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
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 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
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 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