[fofix-commits] [stump/fofix] 84220d: Merge branch 'master' of github.com:stump/fofix in...

[noreply at github.com]

Branch: refs/heads/master
Home:   https://github.com/stump/fofix

Commit: 84220d6b3710103520f940375d2746c57c96913c
    https://github.com/stump/fofix/commit/84220d6b3710103520f940375d2746c57c96913c
Author: weirdpeople <matthewsitton at gmail.com>
Date:   2010-12-18 (Sat, 18 Dec 2010)

Changed paths:
  M .gitignore
  M README
  M data/themes/MegaLight GH3/menu/maintext.png
  A data/themes/MegaLight GH3/menu/maintext_gh3.png
  M data/themes/MegaLight GH3/rockmeter.ini
  R data/tutorials/bangbang/guitar.ogg
  R data/tutorials/bangbang/label.png
  R data/tutorials/bangbang/notes.mid
  R data/tutorials/bangbang/song.ini
  R data/tutorials/bangbang/song.ogg
  M doc/RunningFromSource.mkd
  M doc/copyright
  R pkg/CleanHashCache.py
  R pkg/Dist-MegaLight-GNULinux.lst
  M pkg/ListToNSIS.py
  M pkg/MakeFoFiXInstaller.py
  R pkg/MakeThemeInstaller.py
  R pkg/Package-GNULinux.pl
  M src/Credits.py
  M src/FoFiX.py
  M src/GameEngine.py
  M src/GuitarScene.py
  M src/Neck.py
  M src/Settings.py
  M src/Song.py
  M src/SongChoosingScene.py
  M src/Stage.py
  M src/Theme.py
  M src/Version.py
  A src/VideoPlayer.h
  R src/VideoPlayer.py
  A src/VideoPlayer.pyx
  A src/VideoPlayerCore.c
  M src/cmgl.pyx
  A src/gl.pxi
  M src/setup.py
  R src/tests/VideoPlayerTest.py
  A win32/makedefs.py
  A win32/makedeps-cross.sh
  A win32/makedist.sh

Log Message:
-----------
Merge branch 'master' of github.com:stump/fofix into wp_branch_3


Commit: 4987699180d8e7e8ec292590573901ff2e3b4b48
    https://github.com/stump/fofix/commit/4987699180d8e7e8ec292590573901ff2e3b4b48
Author: weirdpeople <matthewsitton at gmail.com>
Date:   2010-12-18 (Sat, 18 Dec 2010)

Changed paths:
  M src/GuitarScene.py
  M src/Theme.py

Log Message:
-----------
Implement by theme options for neck animations


Commit: 19b146f033600ccc660ff447525472d340d0a01b
    https://github.com/stump/fofix/commit/19b146f033600ccc660ff447525472d340d0a01b
Author: weirdpeople <matthewsitton at gmail.com>
Date:   2010-12-18 (Sat, 18 Dec 2010)

Changed paths:
  M src/GuitarScene.py
  M src/Theme.py

Log Message:
-----------
fix me just waking up mistakes :P


Commit: 55ec3ec74b1f9a809901f009bbbb3699fe4627a9
    https://github.com/stump/fofix/commit/55ec3ec74b1f9a809901f009bbbb3699fe4627a9
Author: weirdpeople <matthewsitton at gmail.com>
Date:   2010-12-18 (Sat, 18 Dec 2010)

Changed paths:
  M src/GuitarScene.py

Log Message:
-----------
More by theme things, and changed the speed of the guitar hero and rockband type animations


Commit: db7333850372612a47a33d70ae7ac09d4462fc0f
    https://github.com/stump/fofix/commit/db7333850372612a47a33d70ae7ac09d4462fc0f
Author: weirdpeople <matthewsitton at gmail.com>
Date:   2010-12-18 (Sat, 18 Dec 2010)

Changed paths:
  M src/GuitarScene.py

Log Message:
-----------
Fix a spelling mistake