Merge branch 'darrel' into randall-music

This commit is contained in:
Randall Dolifka 2017-09-07 10:02:05 -05:00
commit 5e22ab82c1
2 changed files with 1044 additions and 14 deletions

File diff suppressed because it is too large Load diff

View file

@ -6,7 +6,7 @@ public class RocketController : MonoBehaviour {
public PlayerController player;
public GameObject explosionPrefab;
private float ROCKET_SPEED = 10.0f;
private float ROCKET_SPEED = 12.0f;
private float ROCKET_LIFETIME = 5.0f;
private void Start()