Work in Progress for game background

Not there yet
py_enemy_turret 80% done

Turret now places itself correctly, fires (& in the correct direction),
and has two editor enums: 'Where to fire' and 'Where it's wall is'. Once
selected within the editor, everything else is taken care of.

From here on out, all I need to do is attach Travis' two sprites and
have them attach themselves correctly.
Updated Main Menu Screen

Updated the Main Menu Screen with folder "look"
Going to send this to Garrett to update the region/button areas to the
new
sticky notes with text (btw, the text are separate sprites for you to
use/hook onto with your code).
-Travis
.ai files and sprites

Just sprites/ ai files

Garrett, see previous history commit for instructions
-Travis
Merge branch 'ui-assets-branch'

Conflicts:
	gamefiles/Content/__pycache__/py_bouncyBall.cpython-32.pyc
	gamefiles/Content/__pycache__/py_bubbleLogic.cpython-32.pyc
	gamefiles/Content/__pycache__/py_cameraLogic.cpython-32.pyc
	gamefiles/Content/__pycache__/py_character_movement.cpython-32.pyc
	gamefiles/Content/__pycache__/py_clockHunter.cpython-32.pyc
	gamefiles/Content/__pycache__/py_collision_manager.cpython-32.pyc
	gamefiles/Content/__pycache__/py_display_splash.cpython-32.pyc
	gamefiles/Content/__pycache__/py_dropperRegion.cpython-32.pyc
	gamefiles/Content/__pycache__/py_enemy_basic.cpython-32.pyc
	gamefiles/Content/__pycache__/py_enemy_fly.cpython-32.pyc
	gamefiles/Content/__pycache__/py_enemy_turret.cpython-32.pyc
	gamefiles/Content/__pycache__/py_ghosting.cpython-32.pyc
	gamefiles/Content/__pycache__/py_globalVariables.cpython-32.pyc
	gamefiles/Content/__pycache__/py_iceBlock.cpython-32.pyc
	gamefiles/Content/__pycache__/py_iceLogic.cpython-32.pyc
	gamefiles/Content/__pycache__/py_input_manager.cpython-32.pyc
	gamefiles/Content/__pycache__/py_launcher.cpython-32.pyc
	gamefiles/Content/__pycache__/py_level_logic.cpython-32.pyc
	gamefiles/Content/__pycache__/py_mainMenu.cpython-32.pyc
	gamefiles/Content/__pycache__/py_objectSettings.cpython-32.pyc
	gamefiles/Content/__pycache__/py_pickupSettings.cpython-32.pyc
	gamefiles/Content/__pycache__/py_playerController.cpython-32.pyc
	gamefiles/Content/__pycache__/py_projectileLogic.cpython-32.pyc
	gamefiles/Content/__pycache__/py_regionWrapping.cpython-32.pyc
	gamefiles/Content/__pycache__/py_regionWrapping2.cpython-32.pyc
	gamefiles/Content/__pycache__/py_rotation_tracker.cpython-32.pyc
	gamefiles/Content/__pycache__/py_sCargo.cpython-32.pyc
	gamefiles/Content/__pycache__/py_saltDropper.cpython-32.pyc
	gamefiles/Content/__pycache__/py_saltPellet.cpython-32.pyc
	gamefiles/Content/__pycache__/py_shoot.cpython-32.pyc
	gamefiles/Content/__pycache__/py_snail_animations.cpython-32.pyc
	gamefiles/Content/__pycache__/py_spiderController.cpython-32.pyc
	gamefiles/Content/__pycache__/py_splash.cpython-32.pyc
	gamefiles/Content/__pycache__/py_wall_sticky.cpython-32.pyc
interim commit

commited to excellence
Merge

PyChache!!!!!!
Highlights and Tape

Yup
interim commit

again
Merge Main Menu

Merged
New Main Menu Logic

The main menu is now working with the new assets!
Warp effects added

Will playtest to determine if it's good or not.
Updated py_enemy_turret 90% done

Angle and placement re-worked. Need to add death info.
Created 5 Backgrounds

Okay guys, so hear me out on this one…

There are 5 different sciencey backgrounds
(spr_bg_mainbackground_[number]). Some are normal while others are more
crazy/acid-trippy. The normal ones kind of make it difficult to see the
things in the foreground, so believe it or not the trippy ass ones are
really good for contrast's sake.

I can always make more now that i have the illustrator file for it.
-Travis
Merge branch 'sciencey-background-branch'

Conflicts:
	gamefiles/Content/Snail.library
	gamefiles/Content/__pycache__/py_character_movement.cpython-32.pyc
	gamefiles/Content/__pycache__/py_clockHunter.cpython-32.pyc
	gamefiles/Content/__pycache__/py_collision_manager.cpython-32.pyc
	gamefiles/Content/__pycache__/py_globalVariables.cpython-32.pyc
	gamefiles/Content/__pycache__/py_iceBlock.cpython-32.pyc
	gamefiles/Content/__pycache__/py_input_manager.cpython-32.pyc
	gamefiles/Content/__pycache__/py_level_logic.cpython-32.pyc
	gamefiles/Content/__pycache__/py_mainMenu.cpython-32.pyc
	gamefiles/Content/__pycache__/py_pickupSettings.cpython-32.pyc
	gamefiles/Content/__pycache__/py_projectileLogic.cpython-32.pyc
	gamefiles/Content/__pycache__/py_sCargo.cpython-32.pyc
	gamefiles/Content/__pycache__/py_snail_animations.cpython-32.pyc
	gamefiles/Content/lvl_Garrett.Level.data
	gamefiles/Content/lvl_Garrett_TileMap00.bin
Pause Menu!

Its mostly working. I know of the level issues.
Merge branch 'master' of https://github.com/TheDevilsWaffle/Aluminum-Falcon-Overdrive
Created Fire Burp w/ Blowback

Update your snail arch type and get a fire powerup. When shoot is
pressed a fireball breath blast is created which blows the character
backwards from the direction they were facing. Quite fun, really...
-Travis
Merge branch 'fire-powerup-branch'

Conflicts:
	gamefiles/Content/__pycache__/py_globalVariables.cpython-32.pyc
	gamefiles/Content/__pycache__/py_level_logic.cpython-32.pyc
New Credits and Controls for pause screen

These will be used when the game is paused, so that we don't need to
switch levels.