From ef71b365ab10abe6260a6197a1ce93add3839de3 Mon Sep 17 00:00:00 2001
From: Erik Persson <erikpersson583@gmail.com>
Date: Mon, 3 Feb 2014 10:42:40 +0100
Subject: [PATCH] asd

---
 Code/Game/GameLogic/AttatchmentMassDriver.cpp | 3 +++
 Code/Game/GameLogic/GameLogic.vcxproj.user    | 2 +-
 Code/Game/GameLogic/Game_PlayerData.cpp       | 6 ++++++
 Code/Game/GameLogic/Level.cpp                 | 7 +++++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Code/Game/GameLogic/AttatchmentMassDriver.cpp b/Code/Game/GameLogic/AttatchmentMassDriver.cpp
index a63b6e1d..bca972fd 100644
--- a/Code/Game/GameLogic/AttatchmentMassDriver.cpp
+++ b/Code/Game/GameLogic/AttatchmentMassDriver.cpp
@@ -46,7 +46,10 @@ void AttatchmentMassDriver::UseAttatchment(const GameLogic::WEAPON_FIRE &usage,
 ********************************************************/
 void AttatchmentMassDriver::ForcePush(const GameLogic::WEAPON_FIRE &usage, float dt)
 {
+<<<<<<< HEAD
 
+=======
+>>>>>>> GL - mergeissues
 	Oyster::Math::Float4 pushForce = Oyster::Math::Float4(this->owner->GetLookDir()) * (500 * dt);
 	Oyster::Math::Float4x4 aim = Oyster::Math3D::ViewMatrix_LookAtDirection(owner->GetLookDir(), owner->GetRigidBody()->GetGravityNormal(), owner->GetPosition());
 
diff --git a/Code/Game/GameLogic/GameLogic.vcxproj.user b/Code/Game/GameLogic/GameLogic.vcxproj.user
index 2e28d6f7..4b847ee6 100644
--- a/Code/Game/GameLogic/GameLogic.vcxproj.user
+++ b/Code/Game/GameLogic/GameLogic.vcxproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ShowAllFiles>true</ShowAllFiles>
+    <ShowAllFiles>false</ShowAllFiles>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
diff --git a/Code/Game/GameLogic/Game_PlayerData.cpp b/Code/Game/GameLogic/Game_PlayerData.cpp
index e19af2f3..1626f5b3 100644
--- a/Code/Game/GameLogic/Game_PlayerData.cpp
+++ b/Code/Game/GameLogic/Game_PlayerData.cpp
@@ -9,8 +9,14 @@ Game::PlayerData::PlayerData()
 	Oyster::Physics::API::SimpleBodyDescription sbDesc;
 	sbDesc.centerPosition = Oyster::Math::Float3(0,308,0);
 	sbDesc.size = Oyster::Math::Float3(4,7,4);
+<<<<<<< HEAD
 	sbDesc.mass = 70;
 	sbDesc.restitutionCoeff = 0.5;
+=======
+
+	sbDesc.mass = 90;
+
+>>>>>>> GL - mergeissues
 	//create rigid body
 	Oyster::Physics::ICustomBody *rigidBody = Oyster::Physics::API::Instance().CreateRigidBody(sbDesc).Release();
 	
diff --git a/Code/Game/GameLogic/Level.cpp b/Code/Game/GameLogic/Level.cpp
index 50737eb9..0a1a37e6 100644
--- a/Code/Game/GameLogic/Level.cpp
+++ b/Code/Game/GameLogic/Level.cpp
@@ -43,8 +43,15 @@ void Level::InitiateLevel(float radius)
 	API::SimpleBodyDescription sbDesc_TestBox;
 	sbDesc_TestBox.centerPosition = Oyster::Math::Float4(10,320,0,0);
 	sbDesc_TestBox.ignoreGravity = false;
+<<<<<<< HEAD
 	sbDesc_TestBox.mass = 50;
 	sbDesc_TestBox.size = Oyster::Math::Float4(4,4,4,0);
+=======
+
+	sbDesc_TestBox.mass = 10;
+	sbDesc_TestBox.size = Oyster::Math::Float4(4,4,4,0);
+
+>>>>>>> GL - mergeissues
 	
 	ICustomBody* rigidBody_TestBox = API::Instance().CreateRigidBody(sbDesc_TestBox).Release();
 	rigidBody_TestBox->SetSubscription(Level::PhysicsOnMoveLevel);