Merge branch 'master' into i18n_unicode

.gitignore

@@ -14,14 +14,20 @@ src/*.idb
 src/build
 src/pypitch/_pypitch.cpp
 src/cmgl.c
+src/VideoPlayer.c
 gstreamer/*
 data/library.zip
-data/users/players/FoFiX-players.cache
-data/users/players/*.png
+data/users/players/*
+!data/users/players/default.png
+!data/users/players/default.ini
+data/users/controllers/*
+!data/users/controllers/default[dgm].ini
 data/songs/
 data/themes/*
 !data/themes/MegaLight
 !data/themes/MegaLight GH3
 !data/themes/MegaLight V4
 !data/themes/Uberlight
-!data/users/players/default.png
+win32/*
+!win32/*.sh
+!win32/*.py

README

@@ -1,4 +1,11 @@
-For GNU/Linux instructions, please see our wiki page at:
-http://code.google.com/p/fofix/wiki/RunningUnderGNULinux
+This is Frets on Fire X, a highly customizable rhythm game supporting
+many modes of guitar, bass, drum, and vocal gameplay for up to four
+players. It is the continuation of a long succession of modifications
+to the original Frets on Fire by Unreal Voodoo.
 
-Also see documentation in the doc/ folder.
+Website: http://code.google.com/p/fofix/
+Repository (GitHub): http://github.com/stump/fofix
+  $ git clone git://github.com/stump/fofix.git
+
+For instructions on running from source, see RunningFromSource.mkd in
+the doc/ directory.

data/themes/MegaLight GH3/rockmeter.ini

@@ -1,103 +1,134 @@
+[layer0:Image]
+texture = rock_low.png
+xpos = .86
+ypos = .2
+xscale = .5
+yscale = .5
+;condition = rock < rockMax/3.0
+
 [layer1:Image]
-texture = dotbase.png
-xpos = .0425
-ypos = .12
+texture = rock_hi.png
+xpos = .86
+ypos = .2
 xscale = .5
-yscale = -.5
+yscale = .5
+;condition = rock > rockMax/3.0*2
 
 [layer2:Image]
-texture = dots.png
-
-[layer2:fx0]
-type = streak
-xpos = .0425
-ypos = .12
+texture = rock_med.png
+xpos = .86
+ypos = .2
 xscale = .5
-yscale = -.5
-angle = 0
-multdiv = True
+yscale = .5
+;condition = rock > rockMax/3.0
 
 [layer3:Image]
-texture = mult.png
-
-[layer3:fx0]
-type = mult
-xpos = 0.134
-ypos = 0.19
-xscale = .5
-yscale = -.5
+texture = rock_arr.png
+xpos = .86
+ypos = .136
+xscale = 0.5
+yscale = 0.5
+;angle = -(.460 / 2) * math.pi + .460 * math.pi * 0.5
 
 [layer4:Image]
-texture = rockmeter.png
-xpos = .134
+texture = rock_top.png
+xpos = .86
 ypos = .22
 xscale = .5
-yscale = -.5
+yscale = .5
 
 [layer5:Image]
 texture = splight.png
-issplights = True
-xstatic = 0.772, 0.795, 0.822
-ystatic = 0.284, 0.312, 0.329
-xstart = 0.841680344, 0.841680344, 0.851971546
-xend = 0.867126494, 0.902359625, 0.943112688
-ystart = 0.202291056, 0.205626286, 0.20994647
-yend = 0.34490625, 0.333114583, 0.302322917
-;angle = 0.87, 0.58, 0.37, 0.00, -0.34, -0.70
-scale = 23.0000, 32.0000
-
-[layer6:Image]
-texture = rock_med.png
-
-[layer6:fx0]
-type = rock
-texture = rock_low.png;rock_med.png;rock_hi.png
-xpos = .86
-ypos = .2
+xpos = 0.86
+ypos = 0.35
 xscale = .5
-yscale = -.5
-
-[layer7:Image]
-texture = rock_arr.png
+yscale = .5
 
-[layer7:fx0]
-type = rock
-xpos = .86
-ypos = .136
+[layer6:Image]
+texture = dotbase.png
+xpos = .0425
+ypos = .12
 xscale = .5
-yscale = -.5
-angle = -(.460 / 2) * math.pi + .460 * math.pi * self.arrowRotation
+yscale = .5
 
 [layer8:Image]
 texture = counter.png
 xpos = .15
 ypos = .1125
 xscale = .5
-yscale = -.5
+yscale = .5
 
 [layer9:Text]
 text = streak%10
 font = streakFont
-xpos = 0.193-wid/2
-ypos = 0.667-hgt/2
-color = #000000
+xpos = 0.193
+ypos = 0.667
 
 [layer10:Text]
 text = (streak%100-streak%10)/10
 font = streakFont
-xpos = .161-wid/2
-ypos =  0.667-hgt/2
+xpos = .161
+ypos =  0.667
 
 [layer11:Text]
 text = (streak%1000-streak%100)/100
 font = streakFont
-xpos = .132-wid/2
-ypos =  0.667-hgt/2
+xpos = 0.132
+ypos =  0.667
 
 [layer12:Text]
 text = score
 font = scoreFont
-xpos = 0.19-wid
+xpos = 0.19
 ypos =  0.518
 
+[layer13:Image]
+condition = not player.isBassGuitar and player.starPowerActive and streak >= streakMax
+texture = mult.png
+xpos = 0.134
+ypos = 0.19
+xscale = .5
+yscale = .5
+rect = (0.0, 1.0, float(multiplier-1)*0.125, float(multiplier)*0.125)
+
+[layer14:Image]
+condition = not player.isBassGuitar and player.starPowerActive and not streak >= streakMax
+texture = mult.png
+xpos = 0.134
+ypos = 0.19
+xscale = .5
+yscale = .5
+rect = (0.0, 1.0, float(multiplier-1)*0.125, float(multiplier)*0.125)
+
+[layer15:Image]
+condition = not player.isBassGuitar and not player.starPowerActive and streak >= streakMax
+texture = mult.png
+xpos = 0.134
+ypos = 0.19
+xscale = .5
+yscale = .5
+rect = (0.0, 1.0, float(multiplier-1)*0.125 + 1.000, float(multiplier)*0.125 + 1.000)
+
+[layer16:Image]
+condition = not player.isBassGuitar and not player.starPowerActive and not streak >= streakMax
+texture = mult.png
+xpos = 0.134
+ypos = 0.19
+xscale = .5
+yscale = .5
+rect = (0.0, 1.0, float(multiplier-1)*0.125, float(multiplier)*0.125)
 
+[layer14:Image]
+texture = rockmeter.png
+xpos = .134
+ypos = .22
+xscale = .5
+yscale = .5
+
+[layer15:Image]
+texture = dots.png
+xpos = .0425
+ypos = .12
+xscale = .5
+yscale = .5
+rect = ((multiplier-1)*.25, multiplier*.25, float(streak-1)*.1, float(streak)*.1)

data/themes/MegaLight V4/rockmeter.ini

@@ -48,19 +48,12 @@ xpos = 620
 ypos = .75
 rect = (1.0 - (streak%10/10.0), 1, .2 + .2*(streak/10), .4 + .2*(streak/10))
 alignment = right
-condition = streak <= streakMax
+condition = streak > 0
 inPixels = xpos
 
-[layer7:Image]
-texture = dots.png
-xscale = .15
-yscale = .15
-xpos = 620
-ypos = .75
+[layer6:fx0:Replace]
 rect = (0, 1, .8, 1)
-alignment = right
 condition = streak >= streakMax
-inPixels = xpos
 
 [layer9:Image]
 texture = bars.png