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

1532 Commits

Author SHA1 Message Date
lindaandersson ddbc800dbb Merge branches 'GameClient' and 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-20 11:12:16 +01:00
lindaandersson a2bba95003 GameClient sending rotation to server 2014-02-20 11:12:08 +01:00
Pontus Fransson a4de2ddbe2 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-20 11:01:38 +01:00
Pontus Fransson d1fb6a7718 Added udp connection if we want to implement broadcast. 2014-02-20 11:01:25 +01:00
lindaandersson e6cd1f1e5f GameClient now objects say to client that they have moved! 2014-02-20 10:33:27 +01:00
lindaandersson 9082666eba Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-20 10:13:08 +01:00
lindaandersson dd397ec752 GameClient set onMoveFunc for all objects 2014-02-20 10:13:01 +01:00
Dander7BD 263eba782b Found unmarked debug hack 
Naughty collegues
 2014-02-20 10:04:38 +01:00
dean11 641442854e GameServer - Added debug traps 2014-02-20 09:23:33 +01:00
lanariel d537bd6791 Last release gfx fix 2014-02-20 09:23:09 +01:00
dean11 208885d4eb Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-20 09:22:03 +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
dean11 d93d900d40 GameServer - Misc 2014-02-20 09:14:42 +01:00
Pontus Fransson 0a4d1f76b5 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-20 09:07:44 +01:00
Pontus Fransson 3527d3acb0 Network - Fixed memory leak in NetworkServer. 2014-02-20 09:07:02 +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
dean11 9e26095dd0 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-20 08:57:06 +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
dean11 d6dfd7a115 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-20 08:40:36 +01:00
Dennis Andersen f872cfffd1 Added debug project to game server and some other stuff 2014-02-20 08:33:07 +01:00
Dennis Andersen 7ab3223280 Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameServer 2014-02-19 22:44:46 +01:00
Dennis Andersen 4ac5cdd147 GameServer - Painly merge with GameLogic 2014-02-19 22:44:31 +01:00
Dennis Andersen b5639bec90 GameServer - Some white spaces etc.. 2014-02-19 22:07:53 +01:00
dean11 b656ce448d GameServer - Debuging GameLogic 2014-02-19 16:22:14 +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
lindaandersson 0876e5797a Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-19 15:54:01 +01:00
lindaandersson a2979a2bf5 GameClient - modified player Data and out commented physics 2014-02-19 15:53:28 +01:00
Dander7BD 48487e681b Merge remote-tracking branch 'origin/GameLogic' into GameClient 2014-02-19 15:53:21 +01:00
dean11 13755c0aeb Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer 2014-02-19 15:53:20 +01:00
dean11 d07ee997f5 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-19 15:53:09 +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 c2226fa9d1 Clamp fixed 
WTF!? I'm 100% positive that I already did this fix. WTF!?
 2014-02-19 15:47:55 +01:00
Pontus Fransson f69f3af23d Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-19 15:40:23 +01:00
Pontus Fransson 03efca45b8 Fixed ButonEllipse it was not up to date. And only resizing the buttons now. 2014-02-19 15:40:09 +01:00
dean11 b81995b84b Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameLogic 2014-02-19 15:32:52 +01:00
dean11 b5d7109e13 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameLogic 2014-02-19 15:28:32 +01:00
dean11 89857c03e6 Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameLogic 2014-02-19 15:25:10 +01:00
Dander7BD a9f554448c some edits in Camera_FPSV2 2014-02-19 15:20:50 +01:00
Dander7BD 4104ae8df7 Camera_FPSV2 fix + Added bug trap 
Camera_FPSV2::SetRotation

Though it caught no bugs
 2014-02-19 15:00:40 +01:00
dean11 6409b051b4 GameServer - Added more feature to standalone server 2014-02-19 14:53:59 +01:00
Pontus Fransson da94d7d827 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-19 14:52:24 +01:00
Dander7BD 706395680f Added bunch of Quaternion functions 
Needed one of them to create  a bug trap
 2014-02-19 14:51:37 +01:00
Pontus Fransson 717e95bdfe Network - Added reconnect with the last address you connected on. 2014-02-19 14:49:20 +01:00