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 py_enemy_turret 90% done

Angle and placement re-worked. Need to add death info.
HUD work.

Pause Menu is fully functional. A few art changes and it will be done.
The Current HUD is just a test, the final version will be coming later
this week.
Merge branch 'minor-touchups-branch'

Conflicts:
	gamefiles/Content/__pycache__/py_bouncyBall.cpython-32.pyc
	gamefiles/Content/__pycache__/py_bubbleLogic.cpython-32.pyc
	gamefiles/Content/__pycache__/py_collision_manager.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_level_logic.cpython-32.pyc
	gamefiles/Content/__pycache__/py_objectSettings.cpython-32.pyc
	gamefiles/Content/__pycache__/py_saltDropper.cpython-32.pyc
	gamefiles/Content/py_level_logic.py
Committed to committing

Booyah
Merge branch 'master' of https://github.com/TheDevilsWaffle/Aluminum-Falcon-Overdrive
Merge branch 'minor-touchups-branch'

Conflicts:
	gamefiles/Content/__pycache__/py_bubbleLogic.cpython-32.pyc
	gamefiles/Content/__pycache__/py_collision_manager.cpython-32.pyc
	gamefiles/Content/__pycache__/py_globalVariables.cpython-32.pyc
	gamefiles/Content/__pycache__/py_level_logic.cpython-32.pyc
Merge branch 'minor-touchups-branch'

Conflicts:
	artfiles/sprites/powerups/Thumbs.db
	gamefiles/Content/__pycache__/py_level_logic.cpython-32.pyc
	gamefiles/Content/lvl_HUD_Pause.Level.data
Made Turret an Archtype
committing... nothing?
Level Adjustments

All G# levels have been adjusted to fit the HUD
Merge branch 'master' of https://github.com/TheDevilsWaffle/Aluminum-Falcon-Overdrive
Updating Turret
Manually updated Turret Code
Merge branch 'minor-touchups-branch'

Conflicts:
	gamefiles/Content/__pycache__/py_level_logic.cpython-32.pyc
Merge branch 'master' of https://github.com/TheDevilsWaffle/Aluminum-Falcon-Overdrive
Test - Turret Update
Merge branch 'Levels-Code-Chris'

Conflicts:
	gamefiles/Content/__pycache__/py_bubbleLogic.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_globalVariables.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_shoot.cpython-32.pyc
	gamefiles/Content/lvl_Garrett_TileMap00.bin
Pause Menu work

Its broken, and that is awesome!
merge

merge