From 954de26b437d881e022b21590b84f731485aaf38 Mon Sep 17 00:00:00 2001 From: Erik Persson Date: Tue, 21 Jan 2014 16:11:02 +0100 Subject: [PATCH] GL - mergeproblems --- Code/Game/GameLogic/Player.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Code/Game/GameLogic/Player.h b/Code/Game/GameLogic/Player.h index ae2a40b4..14359554 100644 --- a/Code/Game/GameLogic/Player.h +++ b/Code/Game/GameLogic/Player.h @@ -41,14 +41,9 @@ namespace GameLogic ********************************************************/ void Respawn(Oyster::Math::Float3 spawnPoint); -<<<<<<< HEAD -<<<<<<< HEAD - void Rotate(float x, float y); -======= -======= - void rotate(float x, float y); ->>>>>>> blah + void Rotate(float x, float y); + /******************************************************** * Collision function for player, this is to be sent to physics through the subscribe function with the rigidbody * Will be called when the physics detect a collision @@ -57,7 +52,6 @@ namespace GameLogic ********************************************************/ static Oyster::Physics::ICustomBody::SubscriptMessage PlayerCollision(const Oyster::Physics::ICustomBody *rigidBodyPlayer, const Oyster::Physics::ICustomBody *obj); ->>>>>>> Major updates to Collision handling with the class CollitionManager. changes started on the massdriver bool IsWalking(); bool IsJumping();