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

53 Commits

Author SHA1 Message Date
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
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
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 cd4e5ae0ec compilation error fixes 2014-02-19 14:00:48 +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
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 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
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
lindaandersson 3bc916cfb2 GameClient - merge 2014-02-19 11:10:28 +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
Pontus Fransson 6e80c1c603 LevelLoader - Added an if check to se if it found the map file. 2014-02-19 09:39:19 +01:00
Dander7BD 00fe2e6aa7 Camera swap 
Trying the quaternion based one instead
 2014-02-18 17:42:00 +01:00
Dander7BD a85b803e5c GameClientState Patch 
virtual void DataRecieved(
::Oyster::Network::NetEvent<::Oyster::Network::NetworkClient*,
::Oyster::Network::NetworkClient::ClientEventArgs> e );

changed to

virtual const NetEvent & DataRecieved( const NetEvent &message );

/******************************************************************
* @param message of the event
* @return message or GameClientState::event_processed.
******************************************************************/
 2014-02-18 17:28:24 +01:00
Dander7BD a6f740e1f8 bunch of stuff 2014-02-18 16:44:38 +01:00
lindaandersson 611e75b505 Toggle wireframe with "T" 2014-02-18 15:54:09 +01:00
Dander7BD 996f660990 Fixes and bugtraps 2014-02-18 15:09:01 +01:00
Dander7BD 3218e7b847 Connect to Dennis 2014-02-18 15:08:47 +01:00
lindaandersson e8b0e75ed7 Render rigid body from lvl format 2014-02-18 15:07:40 +01:00
lanariel 0971bc407e Small fix 2014-02-18 14:23:38 +01:00
lindaandersson c583543d36 Merge commit '0a70839211c9b1d87f2313817cb5a1000fe34ef0' into GameClient 2014-02-18 13:32:32 +01:00
lindaandersson bfa748047f GL - added RigidBody data on client for debuging output 2014-02-18 13:31:36 +01:00
Dander7BD b78625c230 Merge remote-tracking branch 'origin/GameServer' into GameClient 
Conflicts:
	Code/Game/GameClient/GameClientState/NetLoadState.cpp
 2014-02-18 13:10:17 +01:00
Dander7BD 500ac117a7 removed debug lines 2014-02-18 12:59:51 +01:00
Dander7BD 2e75d168a1 New Cameras 
V2 is quaternion based
 2014-02-18 12:04:22 +01:00
lanariel 0a70839211 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-18 12:02:58 +01:00
lanariel f9f4d55123 Graphics fix 2014-02-18 12:02:48 +01:00
Dander7BD 0bd5d68da4 Removed some debug lines 2014-02-18 11:12:47 +01:00
Dander7BD b2e98f1207 Debug hack + actual fixings 2014-02-18 10:32:09 +01:00
lanariel 0f492e7bc6 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-18 09:33:44 +01:00
lanariel 197067687e Added Gui Transparancy, 
Get Options provides Resolution.xy
 2014-02-18 09:32:10 +01:00
Dennis Andersen 5b4758d2ae Broekn 2014-02-18 08:55:38 +01:00
Dander7BD 6f368b4565 compilation error dealt with 2014-02-18 08:53:52 +01:00
Dander7BD 112f45463a Oops .. Forgot to save this one for the previous commit 2014-02-17 16:18:21 +01:00
Dander7BD 12623d1b16 Bunch of implementations 2014-02-17 16:16:39 +01:00
Dander7BD b93e20e942 Bunch of implementations 2014-02-17 14:33:23 +01:00
lanariel 52301021f6 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-17 13:06:54 +01:00
lanariel 51a8569585 Color is now Float4 with RGBA 2014-02-17 13:05:35 +01:00
Dander7BD 013546f076 minor edit 2014-02-17 12:02:18 +01:00