NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blah

This commit is contained in:
Erik Persson 2014-01-21 16:08:55 +01:00
parent ebaa668382
commit 0aae9de92b
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Code/Game/GameLogic/Player.h
View File

@ -41,9 +41,14 @@ namespace GameLogic
********************************************************/ ********************************************************/
void Respawn(Oyster::Math::Float3 spawnPoint); void Respawn(Oyster::Math::Float3 spawnPoint);
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
void Rotate(float x, float y); 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 * 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 * Will be called when the physics detect a collision