added main menu to README and game

README.md

@@ -10,7 +10,7 @@ Follow the youtube video to see how I fared on ``spaceShooter``
 
 ## Screenshots
 
-| ![Screen 1](http://i.imgur.com/I5mTBFB.png) | ![Screen 2](http://i.imgur.com/4OgIByR.png) |
+| ![Screen 1](http://i.imgur.com/3MzfmbT.jpg) | ![Screen 2](http://i.imgur.com/4OgIByR.png) |
 |---------------------------------------------|---------------------------------------------|
 | ![Screen 3](http://i.imgur.com/PFQJjE8.png) | ![Screen 4](http://i.imgur.com/lV4aIur.png) |
 
@@ -127,7 +127,7 @@ Enjoy the game!
 
 ## Contributers:
 
-- [@bardlean86](https://github.com/bardlean86/) for adding the third missile powerup.
+- [@bardlean86](https://github.com/bardlean86/) for adding the third missile powerup and the main menu
 
 ## To-do:
 

spaceShooter.py

@@ -1,26 +1,20 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # @Author: tasdik
+# @Contributers : Branden (Github: @bardlean86)
 # @Date:   2016-01-17
-# @Email:  [email protected]  Github username: @prodicus
-<<<<<<< HEAD
+# @Email:  [email protected]  Github: @prodicus
 # @Last Modified by:   tasdik
-=======
 # @Last Modified by:   Branden
->>>>>>> d75cb94d7f11ed687b0c3d57d1f3d3502937ff86
-# @Last Modified time: 2016-01-20
+# @Last Modified time: 2016-01-21
 # MIT License. You can find a copy of the License @ http://prodicus.mit-license.org
 
 ## Game music Attribution
-<<<<<<< HEAD
 ##Frozen Jam by tgfcoder <https://twitter.com/tgfcoder> licensed under CC-BY-3 <http://creativecommons.org/licenses/by/3.0/>
-from __future__ import division
-=======
-##Frozen Jam by tgfcoder <https://twitter.com/tgfcoder> licensed under CC-BY-3 <http://creativecommons.org/licenses/by/3.0/>'
-##
-## Additional assets by: Branden M. Ardelean
 
->>>>>>> d75cb94d7f11ed687b0c3d57d1f3d3502937ff86
+## Additional assets by: Branden M. Ardelean (Github: @bardlean86)
+
+from __future__ import division
 import pygame
 import random
 from os import path
@@ -419,7 +413,7 @@ def update(self):
     expl_sounds.append(pygame.mixer.Sound(path.join(sound_folder, sound)))
 ## main background music
 #pygame.mixer.music.load(path.join(sound_folder, 'tgfcoder-FrozenJam-SeamlessLoop.ogg'))
-pygame.mixer.music.set_volume(0.5)
+pygame.mixer.music.set_volume(0.2)      ## simmered the sound down a little
 
 player_die_sound = pygame.mixer.Sound(path.join(sound_folder, 'rumble1.ogg'))
 ###################################################
@@ -462,7 +456,7 @@ def update(self):
         pygame.mixer.music.stop()
         #Play the gameplay music
         pygame.mixer.music.load(path.join(sound_folder, 'tgfcoder-FrozenJam-SeamlessLoop.ogg'))
-        pygame.mixer.music.play()
+        pygame.mixer.music.play(-1)     ## makes the gameplay sound in an endless loop
 
         menu_display = False
 
@@ -537,6 +531,8 @@ def update(self):
     ## if player died and the explosion has finished, end game
     if player.lives == 0 and not death_explosion.alive():
         running = False
+        # menu_display = True
+        # pygame.display.update()
 
     #3 Draw/render
     screen.fill(BLACK)