commit
pull from upstream
Fixed merge conflicts
commit
commit
pull
Player shot gets disqualified if they run past the hog-line
Added aiming arc and pointer

Need to come up with a way of adjusting the pointer dependent on rock
direction
pulled from upstream
Fixed a bug where stones could not be fired again if disqualified
Merge pull request #42 from Kierz/master

slowed the player down, adjusted friction and momentum values accordingly
Adding of new team sounds (whoa, hard etc)
Re-doing credits menu and other updates to main scene
Merge branch 'master' of github.com:race122/UOP-Gamejam-2014

Conflicts:
	Assets/Code/Player.cs
	Assets/Scenes/RinkMain.unity
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	ProjectSettings/EditorBuildSettings.asset
Merge pull request #43 from floorman/master

Re-doing credits and other code updates
Commit.
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014

Conflicts:
	Assets/Scenes/RinkMain.unity
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/guidmapper
Added a endOfRound Script and scene

-added a roundCounter in GameManager
-added a EndOfRound scene
-added a accessor method for roundCounter (called getRound()) in
gameManager
-added a EndOfRound Script
-added Application.LoadLevel to EndOfRound function
Adding of new sounds items. Also updates MainMenu and options menu.
commit