Merge branch 'master' of https://github.com/adangert/JoustMania

README.md

@@ -125,7 +125,8 @@ Custom Music
 * JoustMania comes with a couple of pre-installed default songs.
 * Play your own music, by copying it into the respective folders: /audio/(Joust, Zombie, Commander)/music/
 * Supports Mp3, Wav, Ogg, flac and others [Here](http://www.ffmpeg.org/general.html#File-Formats), 
-* All music and audio can be disabled by changing `audio = False` in joustconfig.ini, this will also disable tempo sensitivity changes for each game mode
+* All music and audio can be disabled by changing `play_audio = False` in joustsettings.yaml, this will also disable tempo sensitivity changes for each game mode
+* two different menu voices can be selected, either aaron or ivy, you can change this via the menu_voice setting in joustsettings.yaml
 
 
 # Game Rules and Variants 

piparty.py

@@ -16,7 +16,6 @@
 import controller_process
 import update
 
-
 TEAM_NUM = len(colors.team_color_list)
 #TEAM_COLORS = colors.generate_colors(TEAM_NUM)
 
@@ -247,12 +246,14 @@ def __init__(self):
         self.command_from_web = ''
         self.initialize_settings()
         self.update_settings_file()
-        
+
         #check for update
         if platform == "linux" or platform == "linux2":
             self.big_update = update.check_for_update(self.ns.settings['menu_voice'])
-        self.git_hash = update.run_command("git rev-parse HEAD")[:7]
-
+            self.git_hash = update.run_command("git rev-parse HEAD")[:7]
+        else:
+            self.git_hash = "0000000"
+
 
         #defined outside of ns.settings as it's a purely dev option
         self.experimental = False
@@ -492,7 +493,7 @@ def check_change_mode(self):
                     change_mode = True
                     change_forward = True
                 move_opt[Opts.selection.value] = Selections.nothing.value
-                
+
             if move_opt[Opts.selection.value] == Selections.change_mode_backward.value:
                 #change the game mode if allowed
                 if self.ns.settings['move_can_be_admin']:
@@ -750,7 +751,8 @@ def update_settings_file(self):
         #option to make file editable by non-root
         #let's leave it as root only, people shouldn't
         #mess with the config file for now
-        os.system('chmod 666 %s' % common.SETTINGSFILE)
+        if platform == "linux" or platform == "linux2":
+            os.system('chmod 666 %s' % common.SETTINGSFILE)
 
     def update_setting(self,key,val):
         temp_settings = self.ns.settings