merging various commits and stashes

2013-05-01 21:30:02 +10:00
parent fe04561b26
commit 80004ca8d4
7 changed files with 66 additions and 3 deletions
@@ -28,6 +28,7 @@ Player:


 PlayerManager:
+	NewPlayer(index, avatar, x, y)
 	Update(delta) //all player objects
 	Synchronize(dataArray) //possible

@@ -48,3 +49,6 @@ Receive:
 		player update:
 			PlayerManager.Update(message)
 end
+
+-------------------------
+