Commit Graph

132 Commits

Author SHA1 Message Date
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
Dander7BD 29f66d2874 Fixed build errors in GameClient 2014-02-17 11:50:51 +01:00
Dander7BD aa2518a4f6 Patch 2014-02-17 11:27:43 +01:00
dean11 7395a0a495 Major cleanup 2014-02-17 10:38:11 +01:00