creating stein branch
Merge branch 'master' into SteinBranch
Merge branch 'master' into SteinBranch
Merge branch 'master' into SteinBranch
Added pause menu and working on Main Menu.
Project opens to Main Menu. Button is there, but clicking in the wrong
place starts the game right now
Buttons work well going between states
Changed the hard-coded state changes for the buttons to calling getID
from the Enums
Can go from main menu to select weapons menu and back again. Implemented
the Button class to make things simpler and consistent. When in play,
can press p to pause the game and a pause Menu will show with the option
of going to the main menu or returning to the game. It seems to return
back to the previous state, but "bullets" that have not "finished
exploding" do not continue on their route. Not sure if this is fix-able
or just avoid pausing when someone is firing. Will probably change the
buttons, but for now they'll work. Need to add a title to the main page
comments
Trying to commit button
changed some Ids
Added Button class
abstracted some things to tank for shot updating. Tanks should not take
care of all shot updates.
comments
Merge branch 'master' of https://github.com/Zylox/GroupBeta.git

Conflicts:
	TinyTank/src/com/tiny/tank/Main_Gameplay.java
	TinyTank/src/com/tiny/tank/Select_Weapons_Menu.java
Added previous game state and leave methods
Fixed state transitions. DONT USE CONSTANTS GUYS
Merge branch 'master' of https://github.com/Zylox/GroupBeta.git
changed movement limit