game types, deathmatch and melee

2014-01-15 21:41:40 -08:00
parent 845db00032
commit 9583de2ffa
4 changed files with 95 additions and 28 deletions
@@ -187,7 +187,7 @@ func (r *Robot) checkCollisions(g *game, move_vector v.Vector2d) (bool, v.Point2
 			collision, move_collision, translation := v.PolyPolyIntersection(
 				bot_polygon, move_vector, player_rect)
 			if collision || move_collision {
-				return true, r.Position.Add(move_vector).Add(translation.Scale(1.2)), bot
+				return true, r.Position.Add(move_vector).Add(translation.Scale(1.1)), bot
 			}
 		}
 	}