[fofix-commits] [stump/fofix] 640840: Merge branch 'master' of git://github.com/stump/fo...

[noreply at github.com]

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

Commit: 640840c55f7c1494c8a7ed53d7a79d7f1b92dc4c
    https://github.com/stump/fofix/commit/640840c55f7c1494c8a7ed53d7a79d7f1b92dc4c
Author: nhydock <n_hydock at comcast.net>
Date:   2010-11-14 (Sun, 14 Nov 2010)

Changed paths:
  M .gitignore
  R data/default.ttf
  A data/fonts/default.ttf
  A data/fonts/international.ttf
  A data/fonts/title.ttf
  R data/international.ttf
  R data/themes/MegaLight GH3/default.ttf
  A data/themes/MegaLight GH3/fonts/default.ttf
  A data/themes/MegaLight GH3/fonts/loading.ttf
  A data/themes/MegaLight GH3/fonts/menu.ttf
  A data/themes/MegaLight GH3/fonts/pause.ttf
  A data/themes/MegaLight GH3/fonts/score.ttf
  R data/themes/MegaLight GH3/loading.ttf
  R data/themes/MegaLight GH3/menu.ttf
  R data/themes/MegaLight GH3/pause.ttf
  R data/themes/MegaLight GH3/score.ttf
  R data/themes/MegaLight V4/default.ttf
  A data/themes/MegaLight V4/fonts/default.ttf
  A data/themes/MegaLight V4/fonts/loading.ttf
  A data/themes/MegaLight V4/fonts/menu.ttf
  A data/themes/MegaLight V4/fonts/pause.ttf
  A data/themes/MegaLight V4/fonts/score.ttf
  R data/themes/MegaLight V4/loading.ttf
  R data/themes/MegaLight V4/menu.ttf
  R data/themes/MegaLight V4/pause.ttf
  R data/themes/MegaLight V4/score.ttf
  R data/themes/MegaLight/default.ttf
  A data/themes/MegaLight/fonts/default.ttf
  A data/themes/MegaLight/fonts/loading.ttf
  A data/themes/MegaLight/fonts/menu.ttf
  A data/themes/MegaLight/fonts/pause.ttf
  A data/themes/MegaLight/fonts/score.ttf
  R data/themes/MegaLight/loading.ttf
  R data/themes/MegaLight/menu.ttf
  R data/themes/MegaLight/pause.ttf
  R data/themes/MegaLight/score.ttf
  R data/title.ttf
  M doc/RunningFromSource.mkd
  M src/Data.py
  M src/GuitarScene.py
  M src/Lobby.py
  M src/MainMenu.py
  M src/Theme.py
  M src/setup.py

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


Commit: 6d38c7a581a61c92725f8d3d6a1a3c993157f6d8
    https://github.com/stump/fofix/commit/6d38c7a581a61c92725f8d3d6a1a3c993157f6d8
Author: nhydock <n_hydock at comcast.net>
Date:   2010-11-14 (Sun, 14 Nov 2010)

Changed paths:
  M src/Guitar.py
  M src/Instrument.py

Log Message:
-----------
Moved self.HCountAni and getRequiredNotesForRender to the instrument.py since they're shared.


Commit: 0d157a5d9e895156f2a3fe5371c4b6f394fae597
    https://github.com/stump/fofix/commit/0d157a5d9e895156f2a3fe5371c4b6f394fae597
Author: nhydock <n_hydock at comcast.net>
Date:   2010-11-15 (Mon, 15 Nov 2010)

Changed paths:
  M data/themes/MegaLight V4/rockmeter.ini
  M src/Rockmeter.py

Log Message:
-----------
Replace effect implemented (but is not working properly)


Commit: 223fc3145f7b78378e4f622d6edc1d9e220d0211
    https://github.com/stump/fofix/commit/223fc3145f7b78378e4f622d6edc1d9e220d0211
Author: nhydock <n_hydock at comcast.net>
Date:   2010-11-15 (Mon, 15 Nov 2010)

Changed paths:
  M data/themes/MegaLight V4/rockmeter.ini
  M src/Rockmeter.py

Log Message:
-----------
Fixed scaling with the replace effect.


Commit: a18a2f366fe252f62eb0af10a9e2778c2c5b945c
    https://github.com/stump/fofix/commit/a18a2f366fe252f62eb0af10a9e2778c2c5b945c
Author: weirdpeople <matthewsitton at gmail.com>
Date:   2010-11-15 (Mon, 15 Nov 2010)

Changed paths:
  M data/themes/MegaLight V4/rockmeter.ini
  M doc/RunningFromSource.mkd
  M src/Guitar.py
  M src/Instrument.py
  M src/Neck.py
  M src/Rockmeter.py
  M src/setup.py

Log Message:
-----------
Merge branch 'master' into origin/master