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

660 Commits

Author SHA1 Message Date
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
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
dean11 b570ca895e Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-20 11:48:09 +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
dean11 8cf0087a95 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-20 11:32:57 +01:00
dean11 e954180e22 Merge branch 'Input' of https://github.com/dean11/Danbias into GameServer 2014-02-20 11:32:40 +01:00
Dander7BD d945eea992 Fixed left turn mirroring and filter turn signals 2014-02-20 11:17:23 +01:00
Dander7BD a78a4f70f1 Dan doing stuff 2014-02-20 11:12:53 +01:00
lindaandersson a2bba95003 GameClient sending rotation to server 2014-02-20 11:12:08 +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
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
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 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
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
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
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
Pontus Fransson 717e95bdfe Network - Added reconnect with the last address you connected on. 2014-02-19 14:49:20 +01:00
Dander7BD 8917caf08a removed debug comment 2014-02-19 14:20:46 +01:00
Dander7BD f04a928d6e Merge remote-tracking branch 'origin/Physics' into GameClient 2014-02-19 14:01:46 +01:00
Dander7BD cd4e5ae0ec compilation error fixes 2014-02-19 14:00:48 +01:00
Robin Engman 3520062577 Implemented TurnLeft function 2014-02-19 13:59:59 +01:00
lindaandersson d972bd7685 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-19 13:57:09 +01:00
lindaandersson b25a08ff90 Fix in lvl loader - can now load shere RB 2014-02-19 13:57:00 +01:00
Robin Engman 0a9b522e15 Merge remote-tracking branch 'origin/GameLogic' into Physics 2014-02-19 13:50:33 +01:00
dean11 f0c581ca04 GameLogic - Added functions for relative rotation 2014-02-19 13:47:49 +01:00
Dander7BD e585589d6e Merge remote-tracking branch 'origin/GameServer' into GameClient 2014-02-19 13:44:55 +01:00
lanariel 273995e204 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClientGraphics 2014-02-19 13:43:03 +01:00
Dander7BD 7ece3b62a0 Changed Player_Look protocol to Player_LeftTurn 2014-02-19 13:42:57 +01:00
lindaandersson b3f8754f47 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-19 13:41:12 +01:00
lindaandersson 3fe0221342 GameClient - fixed render RB 2014-02-19 13:41:05 +01:00
lanariel 90072484b8 Merge branch 'GameClientGraphics' of https://github.com/dean11/Danbias into GameClientGraphics 2014-02-19 13:39:20 +01:00
lanariel 5cc858ba1b Normal normals 2014-02-19 13:38:36 +01:00
Dander7BD 220cf30abb Merge remote-tracking branch 'origin/GameServer' into GameClient 2014-02-19 13:15:56 +01:00
Dander7BD 0f1d07cee0 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-19 13:15:29 +01:00
Dander7BD 8816efafc8 GameState pre-work for subStates 2014-02-19 13:15:19 +01:00
lindaandersson d6d45392d3 Merge remote-tracking branch 'origin/GameServer' into GameClient 2014-02-19 13:13:05 +01:00
dean11 8a3cd796ca GameServer - Pontus found idiot bug that dennis made 2014-02-19 12:46:05 +01:00
lindaandersson 14deeeebca Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-19 12:09:50 +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
Pontus Fransson f1cd73425c Removed old LevelLoader, it's now in a seperate project. 2014-02-19 11:38:36 +01:00
lindaandersson ad37095a80 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-19 11:31:14 +01:00
lindaandersson 77ad199cf6 GameClient - merged with all new things 2014-02-19 11:31:05 +01:00
Pontus Fransson 6c19c12682 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 
Conflicts:
	Code/Game/GameLogic/LevelLoader/LevelLoader.cpp
	Code/Game/GameLogic/LevelLoader/LevelLoader.h
	Code/Game/GameLogic/LevelLoader/LevelParser.cpp
	Code/Game/GameLogic/LevelLoader/LevelParser.h
	Code/Game/GameLogic/LevelLoader/Loader.cpp
	Code/Game/GameLogic/LevelLoader/Loader.h
	Code/Game/GameLogic/LevelLoader/ObjectDefines.h
	Code/Game/GameLogic/LevelLoader/ParseFunctions.cpp
 2014-02-19 11:25:33 +01:00
Pontus Fransson 58117ad425 asd 2014-02-19 11:22:14 +01:00
lindaandersson ed355d58b6 Merge remote-tracking branch 'origin/GameServer' into GameClient 2014-02-19 11:19:48 +01:00
lindaandersson 3bc916cfb2 GameClient - merge 2014-02-19 11:10:28 +01:00
dean11 65163447bb GameServer - Merged with Physics 2014-02-19 11:09:37 +01:00
dean11 0a664bd0dd GameServer - Added dynamic player alias and model names 2014-02-19 11:02:44 +01:00
Pontus Fransson 7f8c10292e Moved LevelLoader to a seperate lib project. 2014-02-19 11:00:16 +01:00
lindaandersson 6ef0a7caa6 Added lights to client 2014-02-19 10:59:23 +01:00
Dander7BD ed6825a408 Merge remote-tracking branch 'origin/Physics' into GameClient 2014-02-19 10:57:18 +01:00
Robin Engman fa95e6b821 Linda fixing some lvl loading stuff 2014-02-19 10:55:59 +01:00
dean11 aa19904fa0 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer 2014-02-19 10:48:04 +01:00
dean11 61350572c7 GameLogic - Merge with origin gamelogic 2014-02-19 10:47:14 +01:00
dean11 0e23bcfc82 GameLogic - Modified some names and cleand up some junk 2014-02-19 10:36:45 +01:00
Erik Persson c2ef8350cf GL - players created with unique ids 2014-02-19 10:15:52 +01:00
dean11 efe29b7a18 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-19 09:43:08 +01:00