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

Thu Oct 14 13:33:05 UTC 2010

Branch: refs/heads/i18n_unicode
Home:   http://github.com/stump/fofix

Commit: bd78e6d1080adfb15b96c456b8b7b29b5ac139bf
    http://github.com/stump/fofix/commit/bd78e6d1080adfb15b96c456b8b7b29b5ac139bf
Author: nhydock <n_hydock at comcast.net>
Date:   2010-10-09 (Sat, 09 Oct 2010)

Changed paths:
  M .gitignore
  M src/AnimationPlayer.py
  M src/Credits.py
  M src/Debug.py
  M src/Dialogs.py
  M src/GameResultsScene.py
  M src/GuitarScene.py
  M src/Lobby.py
  M src/Menu.py
  M src/Rockmeter.py
  M src/SongChoosingScene.py
  M src/Stage.py
  M src/Theme.py
  M src/View.py

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


Commit: f0548a43d47e0d3ea47308dce5ad6a5ec62ed4cc
    http://github.com/stump/fofix/commit/f0548a43d47e0d3ea47308dce5ad6a5ec62ed4cc
Author: John Stumpo <stump at jstump.com>
Date:   2010-10-09 (Sat, 09 Oct 2010)

Changed paths:
  M .gitignore
  M src/AnimationPlayer.py
  M src/Guitar.py
  M src/Instrument.py
  M src/Menu.py
  M src/SongChoosingScene.py
  M src/Theme.py

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


Commit: 3dbc16fbfe4fe378e7cbe595ff83776b5acd01d1
    http://github.com/stump/fofix/commit/3dbc16fbfe4fe378e7cbe595ff83776b5acd01d1
Author: fuzion <fuzion at nukeit.org>
Date:   2010-10-10 (Sun, 10 Oct 2010)

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

Log Message:
-----------
Fix regression - Re: http://github.com/stump/fofix/commit/01130077fc58a2866e8de93b62dd12cc023f6d6e#comments


Commit: 0a0b6b3fa2150544ba4630437ac815273297756e
    http://github.com/stump/fofix/commit/0a0b6b3fa2150544ba4630437ac815273297756e
Author: fuzion <fuzion at nukeit.org>
Date:   2010-10-10 (Sun, 10 Oct 2010)

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

Log Message:
-----------
Log.debug console spam


Commit: 25a411141413ce84873d37c6cc4c5e36faa2e0b7
    http://github.com/stump/fofix/commit/25a411141413ce84873d37c6cc4c5e36faa2e0b7
Author: fuzion <fuzion at nukeit.org>
Date:   2010-10-10 (Sun, 10 Oct 2010)

Changed paths:
  M src/AnimationPlayer.py
  M src/Font.py
  M src/GameEngine.py
  M src/Neck.py
  M src/Svg.py
  M src/VideoPlayer.py
  M src/Vocalist.py

Log Message:
-----------
import from numpy.core


Commit: a862387c2e503dc33e01c5ae50bbe18a613841d3
    http://github.com/stump/fofix/commit/a862387c2e503dc33e01c5ae50bbe18a613841d3
Author: fuzion <fuzion at nukeit.org>
Date:   2010-10-10 (Sun, 10 Oct 2010)

Changed paths:
  M src/AnimationPlayer.py
  M src/Camera.py
  M src/Credits.py
  M src/Data.py
  M src/Debug.py
  M src/Dialogs.py
  M src/GameResultsScene.py
  M src/Guitar.py
  M src/Instrument.py
  M src/MainMenu.py
  M src/Rockmeter.py
  M src/SongChoosingScene.py
  M src/Svg.py
  M src/View.py

Log Message:
-----------
Import cleanup


Commit: 15e9b01e913ca646c5c3ed0549f47387d65c88bc
    http://github.com/stump/fofix/commit/15e9b01e913ca646c5c3ed0549f47387d65c88bc
Author: fuzion <fuzion at nukeit.org>
Date:   2010-10-10 (Sun, 10 Oct 2010)

Changed paths:
  M src/glwrap.h

Log Message:
-----------
HAVE_HYPOT workaround for cmgl with cython-devel


Commit: 656e190a287ede22280006fd4ed3c45bd589e2df
    http://github.com/stump/fofix/commit/656e190a287ede22280006fd4ed3c45bd589e2df
Author: fuzion <fuzion at nukeit.org>
Date:   2010-10-10 (Sun, 10 Oct 2010)

Changed paths:
  M src/Instrument.py

Log Message:
-----------
Don't try to draw hitlightning if we don't have it.


Commit: cb73028906dd0c731b08db96898761edf8c3eae3
    http://github.com/stump/fofix/commit/cb73028906dd0c731b08db96898761edf8c3eae3
Author: fuzion <fuzion at nukeit.org>
Date:   2010-10-10 (Sun, 10 Oct 2010)

Changed paths:
  M src/AnimationPlayer.py
  M src/Audio.py
  M src/Font.py
  M src/GameEngine.py
  M src/Microphone.py
  M src/Neck.py
  M src/Svg.py
  M src/VideoPlayer.py
  M src/Vocalist.py
  M src/setup.py
  M src/tests/DrawingTest.py

Log Message:
-----------
Using 'import numpy as np'.


Commit: 81d3e9cdda918d28387cc145df15cfc076b090ad
    http://github.com/stump/fofix/commit/81d3e9cdda918d28387cc145df15cfc076b090ad
Author: fuzion <fuzion at nukeit.org>
Date:   2010-10-10 (Sun, 10 Oct 2010)

Changed paths:
  R src/AnimationPlayer.py
  R src/tests/AnimationPlayerTest.py

Log Message:
-----------
Remove AnimationPlayer and test.


Commit: c616a136f5052209b1dcc21f61817e7d1dad61a2
    http://github.com/stump/fofix/commit/c616a136f5052209b1dcc21f61817e7d1dad61a2
Author: fuzion <fuzion at nukeit.org>
Date:   2010-10-10 (Sun, 10 Oct 2010)

Changed paths:
  M src/Stage.py

Log Message:
-----------
Fix animated background scale


Commit: 5d347107e67479bf606123ce39c576776b8246ec
    http://github.com/stump/fofix/commit/5d347107e67479bf606123ce39c576776b8246ec
Author: fuzion <fuzion at nukeit.org>
Date:   2010-10-13 (Wed, 13 Oct 2010)

Changed paths:
  M src/Audio.py

Log Message:
-----------
Don't need to import pygame in Audio


Commit: c239dedf3facf95afebf00cb588e46741b95192d
    http://github.com/stump/fofix/commit/c239dedf3facf95afebf00cb588e46741b95192d
Author: fuzion <fuzion at nukeit.org>
Date:   2010-10-13 (Wed, 13 Oct 2010)

Changed paths:
  M src/Dialogs.py
  M src/MainMenu.py

Log Message:
-----------
Remove unused (and broken) ControlActivator


Commit: 985a04f3ca15965fe2315b260f86ed35c0094f64
    http://github.com/stump/fofix/commit/985a04f3ca15965fe2315b260f86ed35c0094f64
Author: fuzion <fuzion at nukeit.org>
Date:   2010-10-14 (Thu, 14 Oct 2010)

Changed paths:
  M src/Audio.py
  M src/Config.py
  M src/Credits.py
  M src/Data.py
  M src/Debug.py
  M src/Dialogs.py
  M src/Drum.py
  M src/GameEngine.py
  M src/GameResultsScene.py
  M src/Guitar.py
  M src/GuitarScene.py
  M src/Input.py
  M src/Instrument.py
  M src/Lobby.py
  M src/MainMenu.py
  M src/Menu.py
  M src/Mesh.py
  M src/Microphone.py
  M src/Neck.py
  M src/Player.py
  M src/Resource.py
  M src/Settings.py
  M src/Shader.py
  M src/Song.py
  M src/View.py
  M src/Vocalist.py

Log Message:
-----------
Cleanup: Remove commented code and misc comments (all by hand).
Converted a few comment blocks to docstrings.
Untouched: Rockmeter, Theme, TODO stuff, Config stuff.


Commit: c5b40766e6afae4e071946418733b8489c3ebabd
    http://github.com/stump/fofix/commit/c5b40766e6afae4e071946418733b8489c3ebabd
Author: fuzion <fuzion at nukeit.org>
Date:   2010-10-14 (Thu, 14 Oct 2010)

Changed paths:
  M src/Dialogs.py
  M src/FoFiX.py
  M src/GameEngine.py
  M src/Input.py
  M src/Player.py
  M src/Settings.py

Log Message:
-----------
Cleanup: Removed a few missing/abandoned Config defines and choices.
Marked FIXME where applicable.


Commit: e3b8a25442fe8ae16ed17aa4e93b060f739a5d96
    http://github.com/stump/fofix/commit/e3b8a25442fe8ae16ed17aa4e93b060f739a5d96
Author: fuzion <fuzion at nukeit.org>
Date:   2010-10-14 (Thu, 14 Oct 2010)

Changed paths:
  M src/Drum.py

Log Message:
-----------
Drum: Fixed a few typos (in dead code?)


Commit: 2c5ae7249120d73020c44062789763337d4ca37d
    http://github.com/stump/fofix/commit/2c5ae7249120d73020c44062789763337d4ca37d
Author: fuzion <fuzion at nukeit.org>
Date:   2010-10-14 (Thu, 14 Oct 2010)

Changed paths:
  M src/GameEngine.py

Log Message:
-----------
GameEngine: Fix variable typo (in dead code?)


Commit: 51ad10cf57bec19e757956143f0d69c350af288b
    http://github.com/stump/fofix/commit/51ad10cf57bec19e757956143f0d69c350af288b
Author: fuzion <fuzion at nukeit.org>
Date:   2010-10-14 (Thu, 14 Oct 2010)

Changed paths:
  M src/Config.py
  M src/Credits.py
  M src/Data.py
  M src/Dialogs.py
  M src/Drum.py
  M src/FoFiX.py
  M src/Font.py
  M src/Guitar.py
  M src/GuitarScene.py
  M src/Neck.py
  M src/Stage.py
  M src/Theme.py
  M src/View.py

Log Message:
-----------
Cleanup: Spelling


Commit: 0445ce7b3122992bf76a1ecef563b69e27e318ac
    http://github.com/stump/fofix/commit/0445ce7b3122992bf76a1ecef563b69e27e318ac
Author: fuzion <fuzion at nukeit.org>
Date:   2010-10-14 (Thu, 14 Oct 2010)

Changed paths:
  M src/GameResultsScene.py

Log Message:
-----------
GameResultsScene(Scene) self.partLoad called before defined


Commit: 12c41c1dd8eaa4b2c02f95f78b1681a114892092
    http://github.com/stump/fofix/commit/12c41c1dd8eaa4b2c02f95f78b1681a114892092
Author: fuzion <fuzion at nukeit.org>
Date:   2010-10-14 (Thu, 14 Oct 2010)

Changed paths:
  M src/Guitar.py

Log Message:
-----------
Guitar(Instrument) tailOnly typo


Commit: 74de33dab63509e17986aaabb036e974fff17ed2
    http://github.com/stump/fofix/commit/74de33dab63509e17986aaabb036e974fff17ed2
Author: fuzion <fuzion at nukeit.org>
Date:   2010-10-14 (Thu, 14 Oct 2010)

Changed paths:
  M src/GuitarScene.py

Log Message:
-----------
GuitarScene(Scene) Couple of typos and BRE fix


Commit: 67355da71b8bd4945778046b83e09d981b07daf3
    http://github.com/stump/fofix/commit/67355da71b8bd4945778046b83e09d981b07daf3
Author: fuzion <fuzion at nukeit.org>
Date:   2010-10-14 (Thu, 14 Oct 2010)

Changed paths:
  M src/Theme.py

Log Message:
-----------
rgbToColor typo (dead code?)


Commit: 9b1e3d0a3fc9101f3604db794aaf87e2abda186b
    http://github.com/stump/fofix/commit/9b1e3d0a3fc9101f3604db794aaf87e2abda186b
Author: fuzion <fuzion at nukeit.org>
Date:   2010-10-14 (Thu, 14 Oct 2010)

Changed paths:
  M src/GuitarScene.py
  M src/Input.py
  M src/MainMenu.py
  M src/Menu.py
  M src/Player.py
  M src/Settings.py
  M src/SongChoosingScene.py

Log Message:
-----------
Add some FIXME tags.


Commit: 6db08c38969c63716405302f5f18fe59b6fa4273
    http://github.com/stump/fofix/commit/6db08c38969c63716405302f5f18fe59b6fa4273
Author: fuzion <fuzion at nukeit.org>
Date:   2010-10-14 (Thu, 14 Oct 2010)

Changed paths:
  R src/AnimationPlayer.py
  M src/Audio.py
  M src/Camera.py
  M src/Config.py
  M src/Credits.py
  M src/Data.py
  M src/Debug.py
  M src/Dialogs.py
  M src/Drum.py
  M src/FoFiX.py
  M src/Font.py
  M src/GameEngine.py
  M src/GameResultsScene.py
  M src/Guitar.py
  M src/GuitarScene.py
  M src/Input.py
  M src/Instrument.py
  M src/Lobby.py
  M src/MainMenu.py
  M src/Menu.py
  M src/Mesh.py
  M src/Microphone.py
  M src/Neck.py
  M src/Player.py
  M src/Resource.py
  M src/Rockmeter.py
  M src/Settings.py
  M src/Shader.py
  M src/Song.py
  M src/SongChoosingScene.py
  M src/Stage.py
  M src/Svg.py
  M src/Theme.py
  M src/VideoPlayer.py
  M src/View.py
  M src/Vocalist.py
  M src/cmgl.pyx
  M src/glwrap.h
  M src/setup.py
  R src/tests/AnimationPlayerTest.py
  M src/tests/DrawingTest.py

Log Message:
-----------
Merge branch 'master' into i18n_unicode