From 0aae9de92b4d4f59b9fd492ec0f6c3e7e5f8bc82 Mon Sep 17 00:00:00 2001 From: Erik Persson Date: Tue, 21 Jan 2014 16:08:55 +0100 Subject: [PATCH] blah --- Code/Game/GameLogic/Player.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Code/Game/GameLogic/Player.h b/Code/Game/GameLogic/Player.h index 48caa017..ae2a40b4 100644 --- a/Code/Game/GameLogic/Player.h +++ b/Code/Game/GameLogic/Player.h @@ -41,9 +41,14 @@ namespace GameLogic ********************************************************/ void Respawn(Oyster::Math::Float3 spawnPoint); +<<<<<<< HEAD <<<<<<< HEAD void Rotate(float x, float y); ======= +======= + void rotate(float x, float y); + +>>>>>>> blah /******************************************************** * 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