[fofix-commits] [fofix/fofix] 257b30: Moves all the files into logical packages.

Mon Jan 6 10:43:48 UTC 2014

  Branch: refs/heads/task_rewrite
  Home:   https://github.com/fofix/fofix
  Commit: 257b30eb9ef58faeebd7400b1f8010f539e46f7d
      https://github.com/fofix/fofix/commit/257b30eb9ef58faeebd7400b1f8010f539e46f7d
  Author: Nicholas Hydock <nhydock at gmail.com>
  Date:   2013-12-23 (Mon, 23 Dec 2013)

  Changed paths:
    A __init__.py b/src/lib/__init__.py
    R src/Audio.py
    R src/Camera.py
    R src/Cerealizer.py
    R src/Collada.py
    R src/Config.py
    R src/ConfigDefs.py
    R src/Credits.py
    R src/Data.py
    R src/Debug.py
    R src/Dialogs.py
    R src/Drum.py
    M src/FoFiX.py
    R src/Font.py
    R src/GameEngine.py
    R src/GameResultsScene.py
    R src/Guitar.py
    R src/GuitarScene.py
    R src/Input.py
    R src/Instrument.py
    R src/Language.py
    R src/LinedConfigParser.py
    R src/Lobby.py
    R src/Log.py
    R src/MainMenu.py
    R src/Menu.py
    R src/Mesh.py
    R src/Microphone.py
    R src/MixStream/MixStream.c
    R src/MixStream/MixStream.h
    R src/MixStream/_MixStream.pyx
    R src/MixStream/__init__.py
    R src/MixStream/soundtouch-c.cpp
    R src/MixStream/soundtouch-c.h
    R src/MixStream/vorbis.c
    R src/Mod.py
    R src/Neck.py
    R src/Player.py
    R src/ProGuitar.py
    R src/Resource.py
    R src/Rockmeter.py
    R src/Scene.py
    R src/SceneFactory.py
    R src/Scorekeeper.py
    R src/Settings.py
    R src/Shader.py
    R src/Song.py
    R src/SongChoosingScene.py
    R src/Stage.py
    R src/Svg.py
    R src/Task.py
    R src/Texture.py
    R src/Theme.py
    R src/Unicode.py
    R src/VFS.py
    M src/Version.py
    R src/Video.py
    R src/VideoPlayer/VideoPlayer.c
    R src/VideoPlayer/VideoPlayer.h
    R src/VideoPlayer/_VideoPlayer.pyx
    R src/VideoPlayer/__init__.py
    R src/View.py
    R src/Vocalist.py
    R src/World.py
    A src/audio/Microphone.py
    A src/audio/MixStream/MixStream.c
    A src/audio/MixStream/MixStream.h
    A src/audio/MixStream/_MixStream.c
    A src/audio/MixStream/_MixStream.pyx
    A src/audio/MixStream/__init__.py
    A src/audio/MixStream/soundtouch-c.cpp
    A src/audio/MixStream/soundtouch-c.h
    A src/audio/MixStream/vorbis.c
    A src/audio/__init__.py
    A src/audio/pypitch/AnalyzerInput.cpp
    A src/audio/pypitch/AnalyzerInput.hpp
    A src/audio/pypitch/__init__.py
    A src/audio/pypitch/_pypitch.cpp
    A src/audio/pypitch/_pypitch.pyx
    A src/audio/pypitch/fft.hpp
    A src/audio/pypitch/pitch.cpp
    A src/audio/pypitch/pitch.hpp
    A src/audio/pypitch/util.hpp
    R src/cmgl.pyx
    A src/configuration/Config.py
    A src/configuration/ConfigDefs.py
    A src/configuration/Mod.py
    A src/configuration/Theme.py
    A src/configuration/__init__.py
    A src/core/Audio.py
    A src/core/Data.py
    A src/core/GameEngine.py
    A src/core/Input.py
    A src/core/Language.py
    A src/core/Resource.py
    A src/core/Settings.py
    A src/core/Task.py
    A src/core/Video.py
    A src/core/__init__.py
    A src/game/Player.py
    A src/game/Scorekeeper.py
    A src/game/Song.py
    A src/game/World.py
    A src/game/__init__.py
    R src/gl.pxi
    R src/glwrap.h
    A src/graphics/Camera.py
    A src/graphics/Font.py
    A src/graphics/Image.py
    A src/graphics/Mesh.py
    A src/graphics/Shader.py
    A src/graphics/Texture.py
    A src/graphics/VideoPlayer/VideoPlayer.c
    A src/graphics/VideoPlayer/VideoPlayer.h
    A src/graphics/VideoPlayer/_VideoPlayer.c
    A src/graphics/VideoPlayer/_VideoPlayer.pyx
    A src/graphics/VideoPlayer/__init__.py
    A src/graphics/VideoPlayer/glwrap.h
    A src/graphics/__init__.py
    A src/graphics/cmgl/__init__.py
    A src/graphics/cmgl/cmgl.c
    A src/graphics/cmgl/cmgl.pyx
    A src/graphics/cmgl/gl.pxi
    A src/graphics/cmgl/glwrap.h
    A src/makefile
    R src/pypitch/AnalyzerInput.cpp
    R src/pypitch/AnalyzerInput.hpp
    R src/pypitch/__init__.py
    R src/pypitch/_pypitch.pyx
    R src/pypitch/fft.hpp
    R src/pypitch/pitch.cpp
    R src/pypitch/pitch.hpp
    R src/pypitch/util.hpp
    M src/setup.py
    M src/tests/DialogTest.py
    M src/tests/DrawingTest.py
    M src/tests/GameEngineTest.py
    M src/tests/MenuTest.py
    M src/tests/ResourceTest.py
    M src/tests/SceneTest.py
    M src/tests/SongTest.py
    M src/tests/SvgTest.py
    M src/tests/ViewTest.py
    A src/util/Cerealizer.py
    A src/util/Collada.py
    A src/util/LinedConfigParser.py
    A src/util/Log.py
    A src/util/Unicode.py
    A src/util/VFS.py
    A src/util/__init__.py
    A src/views/Credits.py
    A src/views/Debug.py
    A src/views/Dialogs.py
    A src/views/GameResultsScene/GameResultsScene.py
    A src/views/GameResultsScene/__init__.py
    A src/views/GuitarScene/GuitarScene.py
    A src/views/GuitarScene/Neck.py
    A src/views/GuitarScene/Rockmeter.py
    A src/views/GuitarScene/Stage.py
    A src/views/GuitarScene/__init__.py
    A src/views/GuitarScene/instruments/Drum.py
    A src/views/GuitarScene/instruments/Guitar.py
    A src/views/GuitarScene/instruments/Instrument.py
    A src/views/GuitarScene/instruments/ProGuitar.py
    A src/views/GuitarScene/instruments/Vocalist.py
    A src/views/GuitarScene/instruments/__init__.py
    A src/views/MainMenu/Lobby.py
    A src/views/MainMenu/MainMenu.py
    A src/views/MainMenu/__init__.py
    A src/views/Menu.py
    A src/views/Scene.py
    A src/views/SceneFactory.py
    A src/views/SongChoosingScene/SongChoosingScene.py
    A src/views/SongChoosingScene/__init__.py
    A src/views/View.py
    A src/views/__init__.py

  Log Message:
  -----------
  Moves all the files into logical packages.

No work done to the code aside from changing imports around, so things
are still sloppily done in places.  Hopefully this'll help kickstart
some interest in the project again now that it's easier to find stuff.

  Commit: 4b41287fac1bfbccc0c824a932220b94ebd48b92
      https://github.com/fofix/fofix/commit/4b41287fac1bfbccc0c824a932220b94ebd48b92
  Author: Tom Skinner <akedrou at gmail.com>
  Date:   2013-12-30 (Mon, 30 Dec 2013)

  Changed paths:
    M .gitignore
    R src/audio/MixStream/_MixStream.c
    R src/audio/pypitch/_pypitch.cpp
    R src/graphics/VideoPlayer/_VideoPlayer.c
    R src/graphics/cmgl/cmgl.c

  Log Message:
  -----------
  Update .gitignore to reflect subpackaging

  Commit: 916534baaf6f4046b758fb72b940e2c8469f7c3d
      https://github.com/fofix/fofix/commit/916534baaf6f4046b758fb72b940e2c8469f7c3d
  Author: Matthew <matthewsitton at gmail.com>
  Date:   2014-01-05 (Sun, 05 Jan 2014)

  Changed paths:
    M src/core/Data.py

  Log Message:
  -----------
  Startup crash fix.

  Commit: 747972ac6c26b5da01f928aac63270cbd751fdb8
      https://github.com/fofix/fofix/commit/747972ac6c26b5da01f928aac63270cbd751fdb8
  Author: Matthew <matthewsitton at gmail.com>
  Date:   2014-01-05 (Sun, 05 Jan 2014)

  Changed paths:
    A data/sounds/default.ogg
    M src/core/Data.py

  Log Message:
  -----------
  Add default sound file for those which are not found. Fixes crashes when trying to play sounds not found.

  Commit: cbf6596d26e79ab094694a3d6f902e43a87437e2
      https://github.com/fofix/fofix/commit/cbf6596d26e79ab094694a3d6f902e43a87437e2
  Author: Matthew <matthewsitton at gmail.com>
  Date:   2014-01-05 (Sun, 05 Jan 2014)

  Changed paths:
    M src/core/Data.py

  Log Message:
  -----------
  Remove some completely pointless code.

  Commit: 8d68d2ddbcd9aa6d5d6930bc286340ca6ffc5c11
      https://github.com/fofix/fofix/commit/8d68d2ddbcd9aa6d5d6930bc286340ca6ffc5c11
  Author: Matthew <matthewsitton at gmail.com>
  Date:   2014-01-05 (Sun, 05 Jan 2014)

  Changed paths:
    M src/scripts/ClearCompiledPycs.bat

  Log Message:
  -----------
  update ClearCompiledPycs.bat to deal with the new folder structure properly.

  Commit: 0f02865d28c19428ec0e1b9ec600764ace88a457
      https://github.com/fofix/fofix/commit/0f02865d28c19428ec0e1b9ec600764ace88a457
  Author: Matthew <matthewsitton at gmail.com>
  Date:   2014-01-06 (Mon, 06 Jan 2014)

  Changed paths:
    M src/core/Data.py

  Log Message:
  -----------
  Split up a one liner, and tweak the debug log for it.

  Commit: 2ba06f5d08725742d3258844a5c3ea212e39e8c6
      https://github.com/fofix/fofix/commit/2ba06f5d08725742d3258844a5c3ea212e39e8c6
  Author: Matthew <matthewsitton at gmail.com>
  Date:   2014-01-06 (Mon, 06 Jan 2014)

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

  Log Message:
  -----------
  Fix a crash that occurs using uberlight.

  Commit: 1caa5b5e81e8dc92dc0db48eb0d6814cbb6733d9
      https://github.com/fofix/fofix/commit/1caa5b5e81e8dc92dc0db48eb0d6814cbb6733d9
  Author: Matthew <matthewsitton at gmail.com>
  Date:   2014-01-06 (Mon, 06 Jan 2014)

  Changed paths:
    M .gitignore
    A __init__.py b/src/lib/__init__.py
    A data/sounds/default.ogg
    R src/Audio.py
    R src/Camera.py
    R src/Cerealizer.py
    R src/Collada.py
    R src/Config.py
    R src/ConfigDefs.py
    R src/Credits.py
    R src/Data.py
    R src/Debug.py
    R src/Dialogs.py
    R src/Drum.py
    M src/FoFiX.py
    R src/Font.py
    R src/GameEngine.py
    R src/GameResultsScene.py
    R src/Guitar.py
    R src/GuitarScene.py
    R src/Input.py
    R src/Instrument.py
    R src/Language.py
    R src/LinedConfigParser.py
    R src/Lobby.py
    R src/Log.py
    R src/MainMenu.py
    R src/Menu.py
    R src/Mesh.py
    R src/Microphone.py
    R src/MixStream/MixStream.c
    R src/MixStream/MixStream.h
    R src/MixStream/_MixStream.pyx
    R src/MixStream/__init__.py
    R src/MixStream/soundtouch-c.cpp
    R src/MixStream/soundtouch-c.h
    R src/MixStream/vorbis.c
    R src/Mod.py
    R src/Neck.py
    R src/Player.py
    R src/ProGuitar.py
    R src/Resource.py
    R src/Rockmeter.py
    R src/Scene.py
    R src/SceneFactory.py
    R src/Scorekeeper.py
    R src/Settings.py
    R src/Shader.py
    R src/Song.py
    R src/SongChoosingScene.py
    R src/Stage.py
    R src/Svg.py
    R src/Task.py
    R src/Texture.py
    R src/Theme.py
    R src/Unicode.py
    R src/VFS.py
    M src/Version.py
    R src/Video.py
    R src/VideoPlayer/VideoPlayer.c
    R src/VideoPlayer/VideoPlayer.h
    R src/VideoPlayer/_VideoPlayer.pyx
    R src/VideoPlayer/__init__.py
    R src/View.py
    R src/Vocalist.py
    R src/World.py
    A src/audio/Microphone.py
    A src/audio/MixStream/MixStream.c
    A src/audio/MixStream/MixStream.h
    A src/audio/MixStream/_MixStream.pyx
    A src/audio/MixStream/__init__.py
    A src/audio/MixStream/soundtouch-c.cpp
    A src/audio/MixStream/soundtouch-c.h
    A src/audio/MixStream/vorbis.c
    A src/audio/__init__.py
    A src/audio/pypitch/AnalyzerInput.cpp
    A src/audio/pypitch/AnalyzerInput.hpp
    A src/audio/pypitch/__init__.py
    A src/audio/pypitch/_pypitch.pyx
    A src/audio/pypitch/fft.hpp
    A src/audio/pypitch/pitch.cpp
    A src/audio/pypitch/pitch.hpp
    A src/audio/pypitch/util.hpp
    R src/cmgl.pyx
    A src/configuration/Config.py
    A src/configuration/ConfigDefs.py
    A src/configuration/Mod.py
    A src/configuration/Theme.py
    A src/configuration/__init__.py
    A src/core/Audio.py
    A src/core/Data.py
    A src/core/GameEngine.py
    A src/core/Input.py
    A src/core/Language.py
    A src/core/Resource.py
    A src/core/Settings.py
    A src/core/Task.py
    A src/core/Video.py
    A src/core/__init__.py
    A src/game/Player.py
    A src/game/Scorekeeper.py
    A src/game/Song.py
    A src/game/World.py
    A src/game/__init__.py
    R src/gl.pxi
    R src/glwrap.h
    A src/graphics/Camera.py
    A src/graphics/Font.py
    A src/graphics/Image.py
    A src/graphics/Mesh.py
    A src/graphics/Shader.py
    A src/graphics/Texture.py
    A src/graphics/VideoPlayer/VideoPlayer.c
    A src/graphics/VideoPlayer/VideoPlayer.h
    A src/graphics/VideoPlayer/_VideoPlayer.pyx
    A src/graphics/VideoPlayer/__init__.py
    A src/graphics/VideoPlayer/glwrap.h
    A src/graphics/__init__.py
    A src/graphics/cmgl/__init__.py
    A src/graphics/cmgl/cmgl.pyx
    A src/graphics/cmgl/gl.pxi
    A src/graphics/cmgl/glwrap.h
    A src/makefile
    R src/pypitch/AnalyzerInput.cpp
    R src/pypitch/AnalyzerInput.hpp
    R src/pypitch/__init__.py
    R src/pypitch/_pypitch.pyx
    R src/pypitch/fft.hpp
    R src/pypitch/pitch.cpp
    R src/pypitch/pitch.hpp
    R src/pypitch/util.hpp
    M src/scripts/ClearCompiledPycs.bat
    M src/setup.py
    M src/tests/DialogTest.py
    M src/tests/DrawingTest.py
    M src/tests/GameEngineTest.py
    M src/tests/MenuTest.py
    M src/tests/ResourceTest.py
    M src/tests/SceneTest.py
    M src/tests/SongTest.py
    M src/tests/SvgTest.py
    M src/tests/ViewTest.py
    A src/util/Cerealizer.py
    A src/util/Collada.py
    A src/util/LinedConfigParser.py
    A src/util/Log.py
    A src/util/Unicode.py
    A src/util/VFS.py
    A src/util/__init__.py
    A src/views/Credits.py
    A src/views/Debug.py
    A src/views/Dialogs.py
    A src/views/GameResultsScene/GameResultsScene.py
    A src/views/GameResultsScene/__init__.py
    A src/views/GuitarScene/GuitarScene.py
    A src/views/GuitarScene/Neck.py
    A src/views/GuitarScene/Rockmeter.py
    A src/views/GuitarScene/Stage.py
    A src/views/GuitarScene/__init__.py
    A src/views/GuitarScene/instruments/Drum.py
    A src/views/GuitarScene/instruments/Guitar.py
    A src/views/GuitarScene/instruments/Instrument.py
    A src/views/GuitarScene/instruments/ProGuitar.py
    A src/views/GuitarScene/instruments/Vocalist.py
    A src/views/GuitarScene/instruments/__init__.py
    A src/views/MainMenu/Lobby.py
    A src/views/MainMenu/MainMenu.py
    A src/views/MainMenu/__init__.py
    A src/views/Menu.py
    A src/views/Scene.py
    A src/views/SceneFactory.py
    A src/views/SongChoosingScene/SongChoosingScene.py
    A src/views/SongChoosingScene/__init__.py
    A src/views/View.py
    A src/views/__init__.py

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

  Commit: cbeffa15c856bb1ea8f07e65e86022d0197df736
      https://github.com/fofix/fofix/commit/cbeffa15c856bb1ea8f07e65e86022d0197df736
  Author: Matthew <matthewsitton at gmail.com>
  Date:   2014-01-06 (Mon, 06 Jan 2014)

  Changed paths:
    R src/TaskEngine.py
    M src/core/GameEngine.py
    A src/core/TaskEngine.py

  Log Message:
  -----------
  Fix a few merge issues.

Compare: https://github.com/fofix/fofix/compare/5338673a8d11...cbeffa15c856