[fofix-commits] [fofix/fofix] 5774c4: fixed drum fret rendering problems

Tue Jan 7 16:42:38 UTC 2014

  Branch: refs/heads/Cleaning
  Home:   https://github.com/fofix/fofix
  Commit: 5774c4546930489048ca849fd581abedd69a7848
      https://github.com/fofix/fofix/commit/5774c4546930489048ca849fd581abedd69a7848
  Author: weirdpeople <matthewsitton at gmail.com>
  Date:   2011-09-26 (Mon, 26 Sep 2011)

  Changed paths:
    M src/Drum.py

  Log Message:
  -----------
  fixed drum fret rendering problems

  Commit: 70563a64c6c5a00d45ea0499ecfad32021957b07
      https://github.com/fofix/fofix/commit/70563a64c6c5a00d45ea0499ecfad32021957b07
  Author: weirdpeople <matthewsitton at gmail.com>
  Date:   2011-09-27 (Tue, 27 Sep 2011)

  Changed paths:
    M src/Instrument.py

  Log Message:
  -----------
  Actually make the flame for the bass drum not render

  Commit: d274799e75bd6e954d7c97ddfe8750611994a0ef
      https://github.com/fofix/fofix/commit/d274799e75bd6e954d7c97ddfe8750611994a0ef
  Author: weirdpeople <matthewsitton at gmail.com>
  Date:   2011-09-29 (Thu, 29 Sep 2011)

  Changed paths:
    A CHANGELOG
    M src/Version.py

  Log Message:
  -----------
  Added changelog and updated the release id

  Commit: 0cb4c4b10b61c0e8c816c9b0dd84d7fc28804f25
      https://github.com/fofix/fofix/commit/0cb4c4b10b61c0e8c816c9b0dd84d7fc28804f25
  Author: weirdpeople <matthewsitton at gmail.com>
  Date:   2011-10-14 (Fri, 14 Oct 2011)

  Changed paths:
    M src/Drum.py
    M src/GuitarScene.py
    M src/Instrument.py

  Log Message:
  -----------
  Make the notes always face the camera, fixes 2d note warping.

  Commit: df462372852c4ddf46b36df8aef6a12c13cc7c90
      https://github.com/fofix/fofix/commit/df462372852c4ddf46b36df8aef6a12c13cc7c90
  Author: weirdpeople <matthewsiton at gmail.com>
  Date:   2011-11-08 (Tue, 08 Nov 2011)

  Changed paths:
    M src/Instrument.py

  Log Message:
  -----------
  do something similar to 3d notes, it really makes 3d notes look tons better.It also fixes complains that people have voiced about them in the past.

  Commit: 8b12b09685bd68624932a339058d77f480f8e7cd
      https://github.com/fofix/fofix/commit/8b12b09685bd68624932a339058d77f480f8e7cd
  Author: nhydock <n_hydock at comcast.net>
  Date:   2011-12-26 (Mon, 26 Dec 2011)

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

  Log Message:
  -----------
  Make 3D billboarding of notes optional

  Commit: 3242f3d52a55a98fbefe0e9e3e82abb469845a35
      https://github.com/fofix/fofix/commit/3242f3d52a55a98fbefe0e9e3e82abb469845a35
  Author: nhydock <n_hydock at comcast.net>
  Date:   2011-12-26 (Mon, 26 Dec 2011)

  Changed paths:
    M data/themes/MegaLight V4/theme.ini

  Log Message:
  -----------
  MLv4 3D notes aren't designed to be billboards

  Commit: d0125a5e496fe28d6f59219e9a24c15d2a7fc7dd
      https://github.com/fofix/fofix/commit/d0125a5e496fe28d6f59219e9a24c15d2a7fc7dd
  Author: weirdpeople <matthewsitton at gmail.com>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M src/FoFiX.py

  Log Message:
  -----------
  Moved --help since we no longer user GStreamer, and moved things arround a little.

  Commit: c9d751b2f2bcdfc56285af2c324153ba97eeec73
      https://github.com/fofix/fofix/commit/c9d751b2f2bcdfc56285af2c324153ba97eeec73
  Author: weirdpeople <matthewsitton at gmail.com>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M src/FoFiX.py

  Log Message:
  -----------
  Removed some code because the config item its looking for is never created in fofix. Also changed the copyright year in the header.

  Commit: a4afbac598b3645806b0559595dc412031b13e57
      https://github.com/fofix/fofix/commit/a4afbac598b3645806b0559595dc412031b13e57
  Author: weirdpeople <matthewsitton at gmail.com>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M src/GuitarScene.py

  Log Message:
  -----------
  Removed useless code in GuitarScene

  Commit: f2356b4450bb60c6a5df983302d11d9ffffb4360
      https://github.com/fofix/fofix/commit/f2356b4450bb60c6a5df983302d11d9ffffb4360
  Author: weirdpeople <matthewsitton at gmail.com>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M src/MainMenu.py

  Log Message:
  -----------
  fixed the double playing of the accept sound sometimes.

  Commit: 2031ba26d053c395f3d4a6af76a8b1068a6e937d
      https://github.com/fofix/fofix/commit/2031ba26d053c395f3d4a6af76a8b1068a6e937d
  Author: weirdpeople <matthewsitton at gmail.com>
  Date:   2012-01-20 (Fri, 20 Jan 2012)

  Changed paths:
    M src/GameEngine.py

  Log Message:
  -----------
  use pygame for fps calculation

  Commit: 947d0b7db07043216d3e63cc049a7a390cb8f251
      https://github.com/fofix/fofix/commit/947d0b7db07043216d3e63cc049a7a390cb8f251
  Author: weirdpeople <matthewsitton at gmail.com>
  Date:   2012-01-25 (Wed, 25 Jan 2012)

  Changed paths:
    M src/SceneFactory.py
    M src/World.py

  Log Message:
  -----------
  Clean up Scene creation, might could be moved to World

  Commit: 68f9ffb0627bf0366702ee2e72bebf2eaa70f422
      https://github.com/fofix/fofix/commit/68f9ffb0627bf0366702ee2e72bebf2eaa70f422
  Author: weirdpeople <matthewsitton at gmail.com>
  Date:   2012-01-27 (Fri, 27 Jan 2012)

  Changed paths:
    M src/SceneFactory.py

  Log Message:
  -----------
  oops broke building.

  Commit: d03886ebec9616dfb69847bb9d6809f21e0320b1
      https://github.com/fofix/fofix/commit/d03886ebec9616dfb69847bb9d6809f21e0320b1
  Author: weirdpeople <matthewsitton at gmail.com>
  Date:   2012-02-04 (Sat, 04 Feb 2012)

  Changed paths:
    M src/Audio.py
    M src/Song.py

  Log Message:
  -----------
  fixed mixer system not initialized error on game exit when playing a song

  Commit: 6b9aa1cad00b3b4b52af2e7aaa4c870c55ddc322
      https://github.com/fofix/fofix/commit/6b9aa1cad00b3b4b52af2e7aaa4c870c55ddc322
  Author: weirdpeople <matthewsitton at gmail.com>
  Date:   2012-03-10 (Sat, 10 Mar 2012)

  Changed paths:
    M src/midi/MidiFileParser.py

  Log Message:
  -----------
  NewCreature's fix for Sysex events crashing the game

  Commit: db10fe5b32ca0c080e0e3339f70128b11b1246a2
      https://github.com/fofix/fofix/commit/db10fe5b32ca0c080e0e3339f70128b11b1246a2
  Author: weirdpeople <matthewsiton at gmail.com>
  Date:   2012-03-11 (Sun, 11 Mar 2012)

  Changed paths:
    M src/Song.py

  Log Message:
  -----------
  Fixed single player vocal crash on loading.

  Commit: 88d26bd60460256b1a3de1a13386c346471a16dd
      https://github.com/fofix/fofix/commit/88d26bd60460256b1a3de1a13386c346471a16dd
  Author: weirdpeople <matthewsiton at gmail.com>
  Date:   2012-03-11 (Sun, 11 Mar 2012)

  Changed paths:
    M src/Song.py

  Log Message:
  -----------
  fix indention

  Commit: 2dd00ada905b1d0363f32485637fe24db58c41ae
      https://github.com/fofix/fofix/commit/2dd00ada905b1d0363f32485637fe24db58c41ae
  Author: weirdpeople <matthewsiton at gmail.com>
  Date:   2012-03-12 (Mon, 12 Mar 2012)

  Changed paths:
    M src/GuitarScene.py

  Log Message:
  -----------
  Fix the only crash left on vocals, they now seem to work as good as they did before i think.

  Commit: b54c4d984d7527cc61f49562c3b61d568dd8bc6b
      https://github.com/fofix/fofix/commit/b54c4d984d7527cc61f49562c3b61d568dd8bc6b
  Author: weirdpeople <matthewsiton at gmail.com>
  Date:   2012-03-13 (Tue, 13 Mar 2012)

  Changed paths:
    M src/Lobby.py

  Log Message:
  -----------
  fix lobby error

  Commit: e827e7b012516a56ae80ab03865d1d84b0a4db02
      https://github.com/fofix/fofix/commit/e827e7b012516a56ae80ab03865d1d84b0a4db02
  Author: weirdpeople <matthewsiton at gmail.com>
  Date:   2012-03-13 (Tue, 13 Mar 2012)

  Changed paths:
    M src/GuitarScene.py
    M src/Neck.py
    M src/Song.py

  Log Message:
  -----------
  fix indention errors

  Commit: 7225c597c4f7065071ac91da22554cda9d67b966
      https://github.com/fofix/fofix/commit/7225c597c4f7065071ac91da22554cda9d67b966
  Author: Nicholas Hydock <nhydock at gmail.com>
  Date:   2012-07-06 (Fri, 06 Jul 2012)

  Changed paths:
    M README

  Log Message:
  -----------
  Update master

  Commit: ba4b2e101ca5e934efad270055557eaa781b80b5
      https://github.com/fofix/fofix/commit/ba4b2e101ca5e934efad270055557eaa781b80b5
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-07-16 (Mon, 16 Jul 2012)

  Changed paths:
    M data/themes/MegaLight V4/CustomRMLayers.py
    M data/themes/MegaLight/CustomTheme.py
    M pkg/ListToNSIS.py
    M pkg/MakeFoFiXInstaller.py
    M src/Audio.py
    M src/Camera.py
    M src/Cerealizer.py
    M src/Collada.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/Language.py
    M src/Lobby.py
    M src/Log.py
    M src/MainMenu.py
    M src/Menu.py
    M src/Mesh.py
    M src/Microphone.py
    M src/Mod.py
    M src/Neck.py
    M src/Player.py
    M src/ProGuitar.py
    M src/Resource.py
    M src/Rockmeter.py
    M src/Scene.py
    M src/SceneFactory.py
    M src/Scorekeeper.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/Task.py
    M src/Texture.py
    M src/Theme.py
    M src/VFS.py
    M src/Version.py
    M src/Video.py
    M src/VideoPlayer.pyx
    M src/View.py
    M src/Vocalist.py
    M src/World.py
    M src/cmgl.pyx
    M src/gl.pxi
    M src/midi/DataTypeConverters.py
    M src/midi/EventDispatcher.py
    M src/midi/MidiFileParser.py
    M src/midi/MidiInFile.py
    M src/midi/MidiInStream.py
    M src/midi/MidiOutFile.py
    M src/midi/MidiOutStream.py
    M src/midi/MidiToText.py
    M src/midi/RawInstreamFile.py
    M src/midi/RawOutstreamFile.py
    M src/midi/constants.py
    M src/pypitch/_pypitch.pyx
    M src/setup.py
    M src/tests/AudioTest.py
    M src/tests/CerealizerTest.py
    M src/tests/DialogTest.py
    M src/tests/DrawingTest.py
    M src/tests/FontTest.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/TestAll.py
    M src/tests/VFSTest.py
    M src/tests/VideoTest.py
    M src/tests/ViewTest.py

  Log Message:
  -----------
  Reindent all Python and Cython source to four-space indents.

The tool used for this also removed all trailing whitespace and all
trailing blank lines from said files, and ensured that they have a
newline at the end.

Please try to preserve these properties.

  Commit: c7c24c773cd705fdafd88f6bafe4d92ae74d0b60
      https://github.com/fofix/fofix/commit/c7c24c773cd705fdafd88f6bafe4d92ae74d0b60
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-07-16 (Mon, 16 Jul 2012)

  Changed paths:
    M data/shaders/cd.frag
    M data/shaders/cd.vert
    M data/shaders/lightning.frag
    M data/shaders/lightning.vert
    M data/shaders/metal.frag
    M data/shaders/metal.vert
    M data/shaders/neck.frag
    M data/shaders/neck.vert
    M data/shaders/rockbandtail.frag
    M data/shaders/rockbandtail.vert

  Log Message:
  -----------
  Run indent on the shaders to neaten those up a bit.

  Commit: 4bed2fef67251f5fcf646628926e8585d333568f
      https://github.com/fofix/fofix/commit/4bed2fef67251f5fcf646628926e8585d333568f
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-07-18 (Wed, 18 Jul 2012)

  Changed paths:
    M src/pypitch/_pypitch.pyx
    M src/pypitch/pitch.hpp

  Log Message:
  -----------
  Update pypitch code with Performous changes (only changes in frequency bounds).

Their commit message:
Bigger frequency range because some singers apparently need it
(commit 50cc50af4db27bbbb13a9a52cdf518962379edaa)

  Commit: c37e5d3cbb609ef4babe89fb8f9421e4cb8a1843
      https://github.com/fofix/fofix/commit/c37e5d3cbb609ef4babe89fb8f9421e4cb8a1843
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-07-18 (Wed, 18 Jul 2012)

  Changed paths:
    M src/Debug.py

  Log Message:
  -----------
  Get class names differently (and correctly) in the debug layer.

This works for both old-style and new-style classes in Python 2.5
and higher. It also does not rely on what repr() output looks like
and doesn't have the annoying '> on new-style classes.

  Commit: 3183f711cabad8caca0cb276d03eebbd9290b015
      https://github.com/fofix/fofix/commit/3183f711cabad8caca0cb276d03eebbd9290b015
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-07-18 (Wed, 18 Jul 2012)

  Changed paths:
    M src/VideoPlayerCore.c
    M src/pypitch/fft.hpp
    M src/pypitch/pitch.cpp
    M src/setup.py

  Log Message:
  -----------
  Actually fix the MSVC compiler warnings; don't just hide them.

  Commit: 8e4f4c3e33fa66f13c8afc692b58ff628a025d00
      https://github.com/fofix/fofix/commit/8e4f4c3e33fa66f13c8afc692b58ff628a025d00
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-07-18 (Wed, 18 Jul 2012)

  Changed paths:
    M doc/RunningFromSource.mkd
    M src/Credits.py
    M src/FoFiX.py
    M src/GameEngine.py
    M src/Settings.py

  Log Message:
  -----------
  Tear out Psyco support, as it's obsolete and doesn't work well for us.

  Commit: 7cdf0d74e257550f6fdccc6ca68417420309b9f1
      https://github.com/fofix/fofix/commit/7cdf0d74e257550f6fdccc6ca68417420309b9f1
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-07-18 (Wed, 18 Jul 2012)

  Changed paths:
    M doc/RunningFromSource.mkd
    M src/Input.py

  Log Message:
  -----------
  Replace rtmidi with pygame.midi (introduced in pygame 1.9).

  Commit: c0b56acfa0a6d244972b4f804ef26afe3e95d501
      https://github.com/fofix/fofix/commit/c0b56acfa0a6d244972b4f804ef26afe3e95d501
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-07-18 (Wed, 18 Jul 2012)

  Changed paths:
    A data/themes/MegaLight V4/rockmeter/platinum.png
    R data/themes/MegaLight V4/rockmeter/platinum.png
    R data/themes/MegaLight V4/starperfect.png
    A data/themes/MegaLight V4/starperfect.png
    A src/FoFiX.py
    R src/FoFiX.py
    A src/setup.py
    R src/setup.py

  Log Message:
  -----------
  Fix some improper file permissions.

  Commit: e5083c47d7bb30442b4c79fc7383a4425274e070
      https://github.com/fofix/fofix/commit/e5083c47d7bb30442b4c79fc7383a4425274e070
  Author: Fabien Culpo <fabien.culpo at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M README

  Log Message:
  -----------
  updated README (markdown + running from sources merged)

  Commit: 156d763db3964bf224e4af052cbd4b4315d7b07d
      https://github.com/fofix/fofix/commit/156d763db3964bf224e4af052cbd4b4315d7b07d
  Author: Fabien Culpo <fabien.culpo at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    R README
    A README.md

  Log Message:
  -----------
  Renamed README to README.md

  Commit: ce0111c9d800dd5f38c950e544062a324d76c9c3
      https://github.com/fofix/fofix/commit/ce0111c9d800dd5f38c950e544062a324d76c9c3
  Author: Fabien Culpo <fabien.culpo at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M src/Log.py

  Log Message:
  -----------
  encoding fix in Log.py

  Commit: 01927b921aafd911a21df2c18548f40e984ea8ba
      https://github.com/fofix/fofix/commit/01927b921aafd911a21df2c18548f40e984ea8ba
  Author: Fabien Culpo <fabien.culpo at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M src/Video.py

  Log Message:
  -----------
  bugfix for PIL 1.1.7 stable

  Commit: be051223ba4a79a5326bb62f9a072ed2931a2b29
      https://github.com/fofix/fofix/commit/be051223ba4a79a5326bb62f9a072ed2931a2b29
  Author: Fabien Culpo <fabien.culpo at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    A .gitattributes
    M README.md
    M data/themes/MegaLight V4/setlist/item.dae
    M data/themes/MegaLight V4/setlist/label.dae
    M data/themes/MegaLight V4/setlist/library.dae
    M data/themes/MegaLight V4/setlist/library_label.dae
    M src/Log.py
    M src/Video.py

  Log Message:
  -----------
  line ending normalization (automated by git)

  Commit: ac503f10fc9566b4999e07df65c50609d705d986
      https://github.com/fofix/fofix/commit/ac503f10fc9566b4999e07df65c50609d705d986
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M src/setup.py

  Log Message:
  -----------
  setup.py: Prevent "setup.py install" from doing anything.

  Commit: 78e4ceaa4d592d062e5258bdb6843b0fbc1ce95f
      https://github.com/fofix/fofix/commit/78e4ceaa4d592d062e5258bdb6843b0fbc1ce95f
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M win32/makedeps-cross.sh
    M win32/makedist.sh

  Log Message:
  -----------
  deppack: Move to mingw-w64.

  Commit: c1add013b4be98283ae873ccd559c89dcb1e9ee5
      https://github.com/fofix/fofix/commit/c1add013b4be98283ae873ccd559c89dcb1e9ee5
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M win32/makedist.sh

  Log Message:
  -----------
  deppack: Remove more unnecessary files and symbols in makedist.

  Commit: f8c6d5d35e7c835f4006d53b3be162e7c8aebc5c
      https://github.com/fofix/fofix/commit/f8c6d5d35e7c835f4006d53b3be162e7c8aebc5c
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M win32/makedist.sh

  Log Message:
  -----------
  deppack: Make makedist a little more verbose.

  Commit: e80bb228b83c676194e72265b1a30859aab3958e
      https://github.com/fofix/fofix/commit/e80bb228b83c676194e72265b1a30859aab3958e
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M win32/makedeps-cross.sh
    M win32/makedist.sh

  Log Message:
  -----------
  deppack: Move .def file generation to makedist.

  Commit: 875450cfb81ae816070f3eb5e33eda980c1e80ab
      https://github.com/fofix/fofix/commit/875450cfb81ae816070f3eb5e33eda980c1e80ab
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M win32/makedeps-cross.sh
    M win32/makedist.sh

  Log Message:
  -----------
  deppack: Wrap the compiler to ensure it statically links libgcc and libstdc++.

  Commit: e976525927b2f53b7072a1d89eb33299d39d469c
      https://github.com/fofix/fofix/commit/e976525927b2f53b7072a1d89eb33299d39d469c
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M win32/makedeps-cross.sh

  Log Message:
  -----------
  deppack: Don't build win_iconv.exe.

  Commit: 8f418102c0edebff53379bc4befdeb8c4c629b6d
      https://github.com/fofix/fofix/commit/8f418102c0edebff53379bc4befdeb8c4c629b6d
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M win32/makedeps-cross.sh

  Log Message:
  -----------
  deppack: Update win-iconv to version 0.0.4.

This allows removal of some build hacks.

  Commit: a151560fcc5d5024a23fdcff94e93a1d58cc324e
      https://github.com/fofix/fofix/commit/a151560fcc5d5024a23fdcff94e93a1d58cc324e
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M win32/makedeps-cross.sh

  Log Message:
  -----------
  deppack: Update zlib to version 1.2.7.

  Commit: 2ad0dbfe0a216465dc4ec4d891329e5efdbdd180
      https://github.com/fofix/fofix/commit/2ad0dbfe0a216465dc4ec4d891329e5efdbdd180
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M win32/makedeps-cross.sh

  Log Message:
  -----------
  deppack: Add libffi.

  Commit: 10511e0f95770e43ef6a0c2de33ac6320de27b65
      https://github.com/fofix/fofix/commit/10511e0f95770e43ef6a0c2de33ac6320de27b65
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M win32/makedeps-cross.sh

  Log Message:
  -----------
  deppack: Build and install only glib and gthread, not gmodule, gobject, or gio.

  Commit: edad01df9994557f29a6555369841506cf6345a2
      https://github.com/fofix/fofix/commit/edad01df9994557f29a6555369841506cf6345a2
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M win32/makedeps-cross.sh

  Log Message:
  -----------
  deppack: Ensure proper compression utilities are present in makedeps.

  Commit: edc8b8067b271aed1d7cff474f4a9e3be4d85702
      https://github.com/fofix/fofix/commit/edc8b8067b271aed1d7cff474f4a9e3be4d85702
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M win32/makedeps-cross.sh

  Log Message:
  -----------
  deppack: Update glib to version 2.32.4.

  Commit: 152f2308b6be0afd97d69709167e542c86b27f5c
      https://github.com/fofix/fofix/commit/152f2308b6be0afd97d69709167e542c86b27f5c
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M .gitignore
    M win32/makedeps-cross.sh
    A win32/pkg-config-win32-prefix-escaping.patch

  Log Message:
  -----------
  deppack: Update pkg-config to version 0.27 with a patch.

The patch makes it handle spaces properly when auto-adjusting prefixes.

  Commit: 7a709ca80ebb028c2e0a28906d051b5d43d820e9
      https://github.com/fofix/fofix/commit/7a709ca80ebb028c2e0a28906d051b5d43d820e9
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M win32/makedeps-cross.sh

  Log Message:
  -----------
  deppack: Add some comments about build order of GNU gettext.

  Commit: c2a24343798c1929926f3ceedff34ff843d905a4
      https://github.com/fofix/fofix/commit/c2a24343798c1929926f3ceedff34ff843d905a4
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M win32/makedeps-cross.sh

  Log Message:
  -----------
  deppack: Update libogg to version 1.3.0.

The autoreconf hack is no longer necessary.

  Commit: f0f84d537fa3cbc69697a66ed46051d3b66e2f63
      https://github.com/fofix/fofix/commit/f0f84d537fa3cbc69697a66ed46051d3b66e2f63
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M win32/makedeps-cross.sh

  Log Message:
  -----------
  deppack: Update libvorbis to version 1.3.3.

  Commit: d149033f6e5d7353efd2dd151532de91fea5897a
      https://github.com/fofix/fofix/commit/d149033f6e5d7353efd2dd151532de91fea5897a
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M win32/makedeps-cross.sh

  Log Message:
  -----------
  deppack: Update libtheora to version 1.2.0 alpha 1.

It's so stable and so much nicer that we may as well.

  Commit: b2f630942bbfdccd32f7bff4d947ece8d18ad0da
      https://github.com/fofix/fofix/commit/b2f630942bbfdccd32f7bff4d947ece8d18ad0da
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M win32/makedeps-cross.sh

  Log Message:
  -----------
  deppack: Add libsmf.

  Commit: 2e84449b12048406cb4d1377b3caa130ef32e842
      https://github.com/fofix/fofix/commit/2e84449b12048406cb4d1377b3caa130ef32e842
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M win32/makedeps-cross.sh

  Log Message:
  -----------
  deppack: Add soundtouch.

  Commit: 9cd33f09d755674191bfbe4de5731011f11475a4
      https://github.com/fofix/fofix/commit/9cd33f09d755674191bfbe4de5731011f11475a4
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    A src/soundtouch-c.cpp
    A src/soundtouch-c.h
    M win32/makedeps-cross.sh

  Log Message:
  -----------
  deppack: Add and build a C shim around soundtouch.

  Commit: d4cd3b24f2e4e7978f395509968261788d556992
      https://github.com/fofix/fofix/commit/d4cd3b24f2e4e7978f395509968261788d556992
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M win32/makedeps-cross.sh

  Log Message:
  -----------
  deppack: Add SDL.

  Commit: 8fc81f4ca0458d68eebfda19d2570b815e0b1d67
      https://github.com/fofix/fofix/commit/8fc81f4ca0458d68eebfda19d2570b815e0b1d67
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M win32/makedeps-cross.sh

  Log Message:
  -----------
  deppack: Add SDL_mixer.

  Commit: f0ee8ac35f2d7432d83749b1ce08a78b3ae350ba
      https://github.com/fofix/fofix/commit/f0ee8ac35f2d7432d83749b1ce08a78b3ae350ba
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M win32/makedeps-cross.sh

  Log Message:
  -----------
  deppack: Add portaudio.

  Commit: 033c3ac90c472a2c17c754a9360e6dd4fdcf9969
      https://github.com/fofix/fofix/commit/033c3ac90c472a2c17c754a9360e6dd4fdcf9969
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    A win32/ffmpeg-implib-install.patch
    M win32/makedeps-cross.sh

  Log Message:
  -----------
  deppack: Update ffmpeg to version 0.11.1 with a patch.

The patch makes it gracefully handle not being able to install its (at
the time nonexistent) MSVC implibs.

  Commit: e4d9f3209af1d350237c4baddba3cfbd5e576d8f
      https://github.com/fofix/fofix/commit/e4d9f3209af1d350237c4baddba3cfbd5e576d8f
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M README.md
    M src/Audio.py
    A src/OggStreamer.c
    M src/setup.py

  Log Message:
  -----------
  Replace the Python StreamingOggSound class with the OggStreamer module.

See http://git.jstump.com/gitweb/oggstreamer.git.

  Commit: 67ec35c8f8d570bab06ddac4189277ca5677f8c0
      https://github.com/fofix/fofix/commit/67ec35c8f8d570bab06ddac4189277ca5677f8c0
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M src/setup.py

  Log Message:
  -----------
  setup.py: Blacklist MinGW-specific library references from the dep pack.

  Commit: eeff1c6affeeef5abdb35403f38d98b797ad56fe
      https://github.com/fofix/fofix/commit/eeff1c6affeeef5abdb35403f38d98b797ad56fe
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M src/setup.py

  Log Message:
  -----------
  setup.py: Specify /EHsc for MSVC builds to fix some warnings.

  Commit: ba516212ac22508e3d2c2bcbb924cd6ef208cb0a
      https://github.com/fofix/fofix/commit/ba516212ac22508e3d2c2bcbb924cd6ef208cb0a
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  .gitignore: Ignore .exe.log files.

  Commit: 632591d58bd81fdeb30a132f9fecd3305ba7488b
      https://github.com/fofix/fofix/commit/632591d58bd81fdeb30a132f9fecd3305ba7488b
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M .gitignore
    A win32/README.deppack.stub
    M win32/makedeps-cross.sh
    M win32/makedist.sh

  Log Message:
  -----------
  deppack: Add a README with links to the source code.

  Commit: 562311c5da87c49f831213e8345ee6b9330dab15
      https://github.com/fofix/fofix/commit/562311c5da87c49f831213e8345ee6b9330dab15
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M README.md

  Log Message:
  -----------
  README.md: Update the link for obtaining the dependency pack.

  Commit: 9da7da84e2e261397beb19ee78746df985641ee0
      https://github.com/fofix/fofix/commit/9da7da84e2e261397beb19ee78746df985641ee0
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M .gitignore
    M pkg/setup.iss
    R src/fofix.ico
    M src/setup.py
    A win32/fofix.ico

  Log Message:
  -----------
  Move fofix.ico to win32/ since it's Windows-specific.

  Commit: b6e6ecbe396643344d65b77014dfc09e83005337
      https://github.com/fofix/fofix/commit/b6e6ecbe396643344d65b77014dfc09e83005337
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M src/Drum.py
    M src/Guitar.py
    M src/ProGuitar.py

  Log Message:
  -----------
  Don't wildcard-import from Instrument.

  Commit: daa31a6b038d894d97d533e258fa0f981276c6bf
      https://github.com/fofix/fofix/commit/daa31a6b038d894d97d533e258fa0f981276c6bf
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M src/GameEngine.py
    M src/Input.py

  Log Message:
  -----------
  Remove useless internal config value game/joysticks.

  Commit: 0df36dc9802e6a0472f2d11633ef039703601a22
      https://github.com/fofix/fofix/commit/0df36dc9802e6a0472f2d11633ef039703601a22
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M README.md
    M src/Audio.py

  Log Message:
  -----------
  Audio: Remove the Numeric hack, as it's no longer needed.

  Commit: 42043b3ae8de64f5aa82213adf7e405df5672232
      https://github.com/fofix/fofix/commit/42043b3ae8de64f5aa82213adf7e405df5672232
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
    A src/ConfigDefs.py
    M src/GameEngine.py

  Log Message:
  -----------
  Move most of GameEngine's Config.defines to a separate file.

  Commit: fe76459753589727f66005cc4f4e2cf1bf6969e3
      https://github.com/fofix/fofix/commit/fe76459753589727f66005cc4f4e2cf1bf6969e3
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-09-29 (Sat, 29 Sep 2012)

  Changed paths:
    M src/setup.py

  Log Message:
  -----------
  setup.py: Add "msgfmt" command for building translation files.

  Commit: 7cfa045b76528fd3cc31abfd9950f52f32769337
      https://github.com/fofix/fofix/commit/7cfa045b76528fd3cc31abfd9950f52f32769337
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-09-29 (Sat, 29 Sep 2012)

  Changed paths:
    M .gitignore
    A data/po/french_(Reform_1990).po
    A data/po/hebrew.po
    A data/po/pig_latin.po
    A data/po/polish.po
    A data/po/russian.po
    A data/po/swedish.po
    R data/translations/brazilian_portuguese.mo
    R data/translations/french.mo
    R data/translations/french_(Reform_1990).mo
    R data/translations/german.mo
    R data/translations/hebrew.mo
    R data/translations/italian.mo
    R data/translations/pig_latin.mo
    R data/translations/polish.mo
    R data/translations/russian.mo
    R data/translations/spanish.mo
    R data/translations/swedish.mo

  Log Message:
  -----------
  Remove and ignore .mo files; recreate .po files from those that lacked corresponding .po files.

  Commit: 66eb50a25b85ee516d7eb96408a7ae7ce5425a2c
      https://github.com/fofix/fofix/commit/66eb50a25b85ee516d7eb96408a7ae7ce5425a2c
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-09-29 (Sat, 29 Sep 2012)

  Changed paths:
    M README.md

  Log Message:
  -----------
  README.md: mention building translations

  Commit: 3458ab824bbbe640ce9e97ffde13ba3adfea135d
      https://github.com/fofix/fofix/commit/3458ab824bbbe640ce9e97ffde13ba3adfea135d
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-09-29 (Sat, 29 Sep 2012)

  Changed paths:
    M src/ConfigDefs.py
    M src/Settings.py
    M src/SongChoosingScene.py
    R src/scripts/ClearSongCache.bat

  Log Message:
  -----------
  Remove the new song database code option; always use it.

  Commit: 6784242f0e547e4a69057c9bd43523b705ee0a5e
      https://github.com/fofix/fofix/commit/6784242f0e547e4a69057c9bd43523b705ee0a5e
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-10-15 (Mon, 15 Oct 2012)

  Changed paths:
    M src/setup.py

  Log Message:
  -----------
  setup.py: Don't exclude difflib when building Windows binaries; excluding it breaks newer numpy.

  Commit: abf4fda8f5d5daa49c0e2b8679368364e79ad605
      https://github.com/fofix/fofix/commit/abf4fda8f5d5daa49c0e2b8679368364e79ad605
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-10-15 (Mon, 15 Oct 2012)

  Changed paths:
    M src/Audio.py

  Log Message:
  -----------
  Temporarily disable pitchbend.

  Commit: 058c0cbe4cc7d96666fd39ae26d46ba08ce68078
      https://github.com/fofix/fofix/commit/058c0cbe4cc7d96666fd39ae26d46ba08ce68078
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-25 (Tue, 25 Dec 2012)

  Changed paths:
    M .gitignore
    A src/MixStream.h
    A src/MixStream.pyx
    A src/MixStreamCore.c
    A src/MixStreamVorbis.c
    M src/setup.py

  Log Message:
  -----------
  Preliminary MixStream implementation.

Sample size/signedness and mono/stereo folding is known to work.

  Commit: 9fc5a406a469f33dcabd307811099606c954432e
      https://github.com/fofix/fofix/commit/9fc5a406a469f33dcabd307811099606c954432e
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-25 (Tue, 25 Dec 2012)

  Changed paths:
    M src/MixStream.h
    M src/MixStreamCore.c

  Log Message:
  -----------
  Check mixer parameters just once when a stream is created.

  Commit: bf50820ad1f72ae164491f2b58866e86cb01f5d2
      https://github.com/fofix/fofix/commit/bf50820ad1f72ae164491f2b58866e86cb01f5d2
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-25 (Tue, 25 Dec 2012)

  Changed paths:
    M src/MixStreamCore.c

  Log Message:
  -----------
  Auto-adjust sampling rates in MixStream.

  Commit: 116c67ec9cffe807946a3d6627c9340ed67600ac
      https://github.com/fofix/fofix/commit/116c67ec9cffe807946a3d6627c9340ed67600ac
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-25 (Tue, 25 Dec 2012)

  Changed paths:
    M src/MixStreamCore.c

  Log Message:
  -----------
  MixStream: Add a function to atomically soundtouchify a stream when needed.

  Commit: f4f4b78a21b951328f6ac1d55a01573bf9b3a42a
      https://github.com/fofix/fofix/commit/f4f4b78a21b951328f6ac1d55a01573bf9b3a42a
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-25 (Tue, 25 Dec 2012)

  Changed paths:
    M src/MixStream.h
    M src/MixStream.pyx
    M src/MixStreamCore.c

  Log Message:
  -----------
  MixStream: add pitch bending

  Commit: f18bff8d190fdd04f36236d52d89e3d5e70f6a9c
      https://github.com/fofix/fofix/commit/f18bff8d190fdd04f36236d52d89e3d5e70f6a9c
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-25 (Tue, 25 Dec 2012)

  Changed paths:
    M src/MixStream.h
    M src/MixStream.pyx
    M src/MixStreamCore.c

  Log Message:
  -----------
  MixStream: add speed changing

  Commit: 121b221cde67192f3e1e1fea0aec520848a189fd
      https://github.com/fofix/fofix/commit/121b221cde67192f3e1e1fea0aec520848a189fd
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-25 (Tue, 25 Dec 2012)

  Changed paths:
    M src/MixStreamCore.c

  Log Message:
  -----------
  MixStream: Only call free callback if it is not NULL.

  Commit: bd141723a28d79eddfb6d4509a38b3d2a86ea6b3
      https://github.com/fofix/fofix/commit/bd141723a28d79eddfb6d4509a38b3d2a86ea6b3
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-25 (Tue, 25 Dec 2012)

  Changed paths:
    M src/MixStream.h
    M src/MixStream.pyx
    M src/MixStreamCore.c
    M src/MixStreamVorbis.c

  Log Message:
  -----------
  MixStream: Implement seek and get_length functions.

  Commit: cf160396358a78491865b35154ef5035963f3bc2
      https://github.com/fofix/fofix/commit/cf160396358a78491865b35154ef5035963f3bc2
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-25 (Tue, 25 Dec 2012)

  Changed paths:
    M src/MixStream.h
    M src/MixStream.pyx
    M src/MixStreamCore.c

  Log Message:
  -----------
  MixStream: Implement getting current playback position.

  Commit: 53264caa9600a344626b3cf6cdf8783fb90948e5
      https://github.com/fofix/fofix/commit/53264caa9600a344626b3cf6cdf8783fb90948e5
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-26 (Wed, 26 Dec 2012)

  Changed paths:
    M src/Audio.py
    R src/OggStreamer.c
    M src/setup.py

  Log Message:
  -----------
  Replace OggStreamer with MixStream.

Merry Christmas!

  Commit: 5bf3d72795326a575106bc54852e843298717463
      https://github.com/fofix/fofix/commit/5bf3d72795326a575106bc54852e843298717463
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-26 (Wed, 26 Dec 2012)

  Changed paths:
    M src/Audio.py
    M src/Song.py

  Log Message:
  -----------
  Remove unnecessary engine argument to StreamingSound constructor.

  Commit: 28e3bb43081b477f5f3cb5fa13685d6d210d78be
      https://github.com/fofix/fofix/commit/28e3bb43081b477f5f3cb5fa13685d6d210d78be
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-26 (Wed, 26 Dec 2012)

  Changed paths:
    M src/Audio.py
    M src/Song.py

  Log Message:
  -----------
  StreamingSound: streamIsPlaying -> isPlaying

  Commit: fa7111acd011bedc44bbdb3989271aecacff6382
      https://github.com/fofix/fofix/commit/fa7111acd011bedc44bbdb3989271aecacff6382
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-26 (Wed, 26 Dec 2012)

  Changed paths:
    M src/Song.py

  Log Message:
  -----------
  Use new audio streaming code for song.ogg as well.

I feel horrible about just cargo-culting the references to self.music
into treatment of self.songTrack the ways the others are treated, but
the point of this commit is to stop using Music in Song, not to tackle
any of the other cleanup that's needed.

  Commit: 0d1531f8cc3ad054210e19c9c55be62cdd215b37
      https://github.com/fofix/fofix/commit/0d1531f8cc3ad054210e19c9c55be62cdd215b37
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-26 (Wed, 26 Dec 2012)

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

  Log Message:
  -----------
  Replace old pitchbend client code with the new stuff in MixStream.

Good-bye (and *very* good riddance) to the old implementation.

  Commit: de0fd22659f784625c24757bd350afca1a111006
      https://github.com/fofix/fofix/commit/de0fd22659f784625c24757bd350afca1a111006
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-26 (Wed, 26 Dec 2012)

  Changed paths:
    M README.md

  Log Message:
  -----------
  Update README for pitchbend replacement.

  Commit: 21c3f9ccac6ba357d66b415af941984620ea8b62
      https://github.com/fofix/fofix/commit/21c3f9ccac6ba357d66b415af941984620ea8b62
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-26 (Wed, 26 Dec 2012)

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

  Log Message:
  -----------
  Song: remove resetInstrumentPitch(-1) hack

  Commit: d20f3be7a206e727e91710afcc3660208094c490
      https://github.com/fofix/fofix/commit/d20f3be7a206e727e91710afcc3660208094c490
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-26 (Wed, 26 Dec 2012)

  Changed paths:
    M src/Audio.py
    M src/Song.py

  Log Message:
  -----------
  StreamingSound: rename setPitchBend to indicate units

  Commit: 23d7d06c7ea62d168d3cde1c288ea724bafef121
      https://github.com/fofix/fofix/commit/23d7d06c7ea62d168d3cde1c288ea724bafef121
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-26 (Wed, 26 Dec 2012)

  Changed paths:
    M src/Audio.py
    M src/Song.py

  Log Message:
  -----------
  StreamingSound: remove stopPitchBend (set to 0 semitones instead)

  Commit: d1d8b2718b96b0d4d632cadebb656c1644713b49
      https://github.com/fofix/fofix/commit/d1d8b2718b96b0d4d632cadebb656c1644713b49
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-26 (Wed, 26 Dec 2012)

  Changed paths:
    M src/GameEngine.py
    M src/GameResultsScene.py
    M src/GuitarScene.py
    M src/Song.py

  Log Message:
  -----------
  Remove the mixer reinitialization part of song slowdown.

  Commit: 8008829c46ecdcf3cfb1c65380edb9288747e231
      https://github.com/fofix/fofix/commit/8008829c46ecdcf3cfb1c65380edb9288747e231
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-26 (Wed, 26 Dec 2012)

  Changed paths:
    M src/Audio.py
    M src/Song.py

  Log Message:
  -----------
  Remove unnecessary mixer initialization checks.

  Commit: 4615021b10670b0547bd7d54ecafb5369e910104
      https://github.com/fofix/fofix/commit/4615021b10670b0547bd7d54ecafb5369e910104
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-29 (Sat, 29 Dec 2012)

  Changed paths:
    M src/Audio.py
    M src/GuitarScene.py
    M src/Song.py

  Log Message:
  -----------
  Audio: remove pause-position-related hacks from Music

  Commit: dc5b8383e75fc9f3f2378ed961da30f9997e2c0e
      https://github.com/fofix/fofix/commit/dc5b8383e75fc9f3f2378ed961da30f9997e2c0e
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-29 (Sat, 29 Dec 2012)

  Changed paths:
    M src/setup.py

  Log Message:
  -----------
  setup.py: Add support for alternative pkg-config names for libraries.

  Commit: 5838210034a7cde6d5ffe978f1ec6722fed6691f
      https://github.com/fofix/fofix/commit/5838210034a7cde6d5ffe978f1ec6722fed6691f
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-29 (Sat, 29 Dec 2012)

  Changed paths:
    M src/setup.py

  Log Message:
  -----------
  setup.py: Support historic alternate pkg-config names for SoundTouch.

  Commit: 4ffb4db248ab02c8e33c3aa38839d38e3aa383f6
      https://github.com/fofix/fofix/commit/4ffb4db248ab02c8e33c3aa38839d38e3aa383f6
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-29 (Sat, 29 Dec 2012)

  Changed paths:
    M src/setup.py

  Log Message:
  -----------
  setup.py: Don't require the msgfmt program to be present unless necessary.

  Commit: 90ee1a09b68dae51555eb3097ccb99f823fcb829
      https://github.com/fofix/fofix/commit/90ee1a09b68dae51555eb3097ccb99f823fcb829
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-31 (Mon, 31 Dec 2012)

  Changed paths:
    M src/Language.py

  Log Message:
  -----------
  Language: Remove incorrect character encoding conversions and just return Unicode strings.

  Commit: 75b4c65b5ed94705f04468871a27b1b17580ae98
      https://github.com/fofix/fofix/commit/75b4c65b5ed94705f04468871a27b1b17580ae98
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-31 (Mon, 31 Dec 2012)

  Changed paths:
    M data/po/french_(Reform_1990).po

  Log Message:
  -----------
  Add header to French (reform 1990) translation so msgfmt is willing to build it again.

  Commit: df41e4d6431401e9f8002c50ae8e015984023574
      https://github.com/fofix/fofix/commit/df41e4d6431401e9f8002c50ae8e015984023574
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-31 (Mon, 31 Dec 2012)

  Changed paths:
    M src/Config.py

  Log Message:
  -----------
  Config: deduplicate value conversion code

  Commit: 841c9d68f9db01bae9b6fa02fbf6bfd7e2a8efca
      https://github.com/fofix/fofix/commit/841c9d68f9db01bae9b6fa02fbf6bfd7e2a8efca
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-31 (Mon, 31 Dec 2012)

  Changed paths:
    M src/Song.py

  Log Message:
  -----------
  Song: remove unused import

  Commit: 15bf04cacb4ed928428becdbdcf8cd73be80cb7f
      https://github.com/fofix/fofix/commit/15bf04cacb4ed928428becdbdcf8cd73be80cb7f
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-31 (Mon, 31 Dec 2012)

  Changed paths:
    M src/Svg.py

  Log Message:
  -----------
  Svg: change type checks to isinstance calls

This is so that we can accept Unicode strings as filenames.

  Commit: a9d143d0d3ad2457ac2bd075697e8ffb17eb477d
      https://github.com/fofix/fofix/commit/a9d143d0d3ad2457ac2bd075697e8ffb17eb477d
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-31 (Mon, 31 Dec 2012)

  Changed paths:
    M src/Config.py
    A src/Unicode.py

  Log Message:
  -----------
  Config: use Unicode when appropriate

  Commit: 8b62bf25e725f59ba5e871a52aea5512d7a59001
      https://github.com/fofix/fofix/commit/8b62bf25e725f59ba5e871a52aea5512d7a59001
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-31 (Mon, 31 Dec 2012)

  Changed paths:
    M src/Song.py

  Log Message:
  -----------
  Song: remove useless cargo-culted methods on special Info objects

  Commit: a4134e6639cc2b1251a4a7aac570428f5c4f4865
      https://github.com/fofix/fofix/commit/a4134e6639cc2b1251a4a7aac570428f5c4f4865
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-31 (Mon, 31 Dec 2012)

  Changed paths:
    M src/Song.py

  Log Message:
  -----------
  Song: handle Unicode better when setting info properties

  Commit: 016f375c3605c4140ea1aa0530e496341d9b160f
      https://github.com/fofix/fofix/commit/016f375c3605c4140ea1aa0530e496341d9b160f
  Author: John Stumpo <stump at jstump.com>
  Date:   2012-12-31 (Mon, 31 Dec 2012)

  Changed paths:
    M src/Log.py

  Log Message:
  -----------
  Log: convert entry with asUTF8Bytes

  Commit: 12b379e0bd9d98fa563f2e6684f025998bf873a0
      https://github.com/fofix/fofix/commit/12b379e0bd9d98fa563f2e6684f025998bf873a0
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-01-05 (Sat, 05 Jan 2013)

  Changed paths:
    M .gitignore
    R src/messages.pot
    R src/scripts/GetTranslatableText.bat
    M src/scripts/RebuildWin.bat
    M src/setup.py

  Log Message:
  -----------
  setup.py: Add command for extracting translatable strings.

  Commit: 19b2dd5bb8a2240ad76a23a49bebcb4fe29decff
      https://github.com/fofix/fofix/commit/19b2dd5bb8a2240ad76a23a49bebcb4fe29decff
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-01-05 (Sat, 05 Jan 2013)

  Changed paths:
    M src/LinedConfigParser.py

  Log Message:
  -----------
  LinedConfigParser: internally use Unicode and return Unicode strings

  Commit: 822429042743a13e1b5a33bade4406b4dd108609
      https://github.com/fofix/fofix/commit/822429042743a13e1b5a33bade4406b4dd108609
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-01-05 (Sat, 05 Jan 2013)

  Changed paths:
    M src/Dialogs.py

  Log Message:
  -----------
  FileChooser: internally use Unicode and return a Unicode result

  Commit: 32a97362b5711887cbee507063d23e28e6547ea5
      https://github.com/fofix/fofix/commit/32a97362b5711887cbee507063d23e28e6547ea5
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-01-05 (Sat, 05 Jan 2013)

  Changed paths:
    M doc/copyright
    M pkg/MakeFoFiXInstaller.py
    M src/Credits.py
    M src/setup.py

  Log Message:
  -----------
  Copyright year bump. Happy New Year!

  Commit: b72ffb0d6d26e6e082374b5799ad0d33b5755ca3
      https://github.com/fofix/fofix/commit/b72ffb0d6d26e6e082374b5799ad0d33b5755ca3
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-01-05 (Sat, 05 Jan 2013)

  Changed paths:
    M src/Config.py

  Log Message:
  -----------
  MyConfigParser: retrieve and set string values as Unicode

  Commit: 0a96e73fc1fabe8674aded227f3a88d0643c406b
      https://github.com/fofix/fofix/commit/0a96e73fc1fabe8674aded227f3a88d0643c406b
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-01-05 (Sat, 05 Jan 2013)

  Changed paths:
    M src/Config.py
    M src/Log.py
    M src/Song.py
    M src/Unicode.py

  Log Message:
  -----------
  Unicode: asUTF8Bytes -> less silly name "utf8"

  Commit: a6e9f8354118ac4ed79712dbc3cd926b49ef15e3
      https://github.com/fofix/fofix/commit/a6e9f8354118ac4ed79712dbc3cd926b49ef15e3
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-01-05 (Sat, 05 Jan 2013)

  Changed paths:
    M src/Language.py

  Log Message:
  -----------
  Language: return Unicode strings even from dummyTranslator

  Commit: d30a573372caa84510c4af63b4ea4df4085e1c15
      https://github.com/fofix/fofix/commit/d30a573372caa84510c4af63b4ea4df4085e1c15
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-01-05 (Sat, 05 Jan 2013)

  Changed paths:
    M .gitignore
    R src/MixStream.h
    R src/MixStream.pyx
    A src/MixStream/MixStream.c
    A src/MixStream/MixStream.h
    A src/MixStream/_MixStream.pyx
    A src/MixStream/__init__.py
    A src/MixStream/soundtouch-c.cpp
    A src/MixStream/soundtouch-c.h
    A src/MixStream/vorbis.c
    R src/MixStreamCore.c
    R src/MixStreamVorbis.c
    M src/setup.py
    R src/soundtouch-c.cpp
    R src/soundtouch-c.h
    M win32/makedeps-cross.sh

  Log Message:
  -----------
  MixStream: reorganize into a package

  Commit: dad61a0467430e75ff310491458108d001c31ece
      https://github.com/fofix/fofix/commit/dad61a0467430e75ff310491458108d001c31ece
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-01-05 (Sat, 05 Jan 2013)

  Changed paths:
    M .gitignore
    R src/VideoPlayer.h
    R src/VideoPlayer.pyx
    A src/VideoPlayer/VideoPlayer.c
    A src/VideoPlayer/VideoPlayer.h
    A src/VideoPlayer/_VideoPlayer.pyx
    A src/VideoPlayer/__init__.py
    R src/VideoPlayerCore.c
    M src/setup.py

  Log Message:
  -----------
  VideoPlayer: reorganize into a package

  Commit: 4230a2143580d05a370287fb0c7a525b6f90f1bd
      https://github.com/fofix/fofix/commit/4230a2143580d05a370287fb0c7a525b6f90f1bd
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-01-06 (Sun, 06 Jan 2013)

  Changed paths:
    M src/Config.py
    M src/ConfigDefs.py
    M src/Settings.py

  Log Message:
  -----------
  Config: remove log_ini_reads

  Commit: e3a7adc2508ab0181e403cc84a86520be2f4cb33
      https://github.com/fofix/fofix/commit/e3a7adc2508ab0181e403cc84a86520be2f4cb33
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-01-06 (Sun, 06 Jan 2013)

  Changed paths:
    M src/Dialogs.py
    M src/GuitarScene.py
    M src/Instrument.py
    M src/Song.py

  Log Message:
  -----------
  Remove various reads of obsolete config keys.

  Commit: 9957d5948788cc9f6e7a723b57ad31d412731aef
      https://github.com/fofix/fofix/commit/9957d5948788cc9f6e7a723b57ad31d412731aef
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-01-06 (Sun, 06 Jan 2013)

  Changed paths:
    M src/Scorekeeper.py
    M src/Song.py

  Log Message:
  -----------
  Fix some incorrectly-named config gets.

  Commit: a4c01662872c2d14d0cb0a9ddf3b2540806104ef
      https://github.com/fofix/fofix/commit/a4c01662872c2d14d0cb0a9ddf3b2540806104ef
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-01-06 (Sun, 06 Jan 2013)

  Changed paths:
    M src/GameResultsScene.py

  Log Message:
  -----------
  GameResultsScene: don't use old jurgmode/jurgtype config keys

  Commit: ad452cc412c1f9dccf05a189f92b076cd29858b5
      https://github.com/fofix/fofix/commit/ad452cc412c1f9dccf05a189f92b076cd29858b5
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-01-06 (Sun, 06 Jan 2013)

  Changed paths:
    M src/ConfigDefs.py
    M src/Settings.py

  Log Message:
  -----------
  Resurrect some old config definitions that the code still uses.

  Commit: 237ccb45e3eda98b00459110d47a939c7d837f41
      https://github.com/fofix/fofix/commit/237ccb45e3eda98b00459110d47a939c7d837f41
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-01-06 (Sun, 06 Jan 2013)

  Changed paths:
    M src/Config.py
    M src/ConfigDefs.py
    M src/Settings.py
    M src/Theme.py

  Log Message:
  -----------
  Config: treat undefined gets as an error

  Commit: 8a52a9a055abb1f5a3f9339907b1cd44adb2faa2
      https://github.com/fofix/fofix/commit/8a52a9a055abb1f5a3f9339907b1cd44adb2faa2
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-01-06 (Sun, 06 Jan 2013)

  Changed paths:
    M src/Scorekeeper.py

  Log Message:
  -----------
  Scorekeeper: remove obsolete partialStars property

  Commit: ad7828cff735c1b90407e46b1b8f3d0804567335
      https://github.com/fofix/fofix/commit/ad7828cff735c1b90407e46b1b8f3d0804567335
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-01-06 (Sun, 06 Jan 2013)

  Changed paths:
    M src/Dialogs.py
    M src/Drum.py
    M src/GuitarScene.py
    M src/Instrument.py
    M src/Neck.py
    M src/Settings.py

  Log Message:
  -----------
  Clean up some things found by pyflakes.

  Commit: 4c87b0d88f0db4dcb29812010b770478d3d5eaa5
      https://github.com/fofix/fofix/commit/4c87b0d88f0db4dcb29812010b770478d3d5eaa5
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-01-06 (Sun, 06 Jan 2013)

  Changed paths:
    M src/GameEngine.py
    M src/GameResultsScene.py
    M src/GuitarScene.py
    M src/Scene.py
    M src/SongChoosingScene.py

  Log Message:
  -----------
  Remove the multi-scene-loading prevention hacks.

  Commit: 72a79143b6481db6a355b79e360d5634b34c7b3b
      https://github.com/fofix/fofix/commit/72a79143b6481db6a355b79e360d5634b34c7b3b
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-01-06 (Sun, 06 Jan 2013)

  Changed paths:
    M src/MixStream/MixStream.c

  Log Message:
  -----------
  MixStream: Remove stream from channel table when _nextchunk fails.

This fixes a crash that sometimes happened in GameResultsScene when
the same SDL_mixer channel got reused for a sound.

  Commit: dd99e02897c8ca46e3fdc2438544faa62bd126d1
      https://github.com/fofix/fofix/commit/dd99e02897c8ca46e3fdc2438544faa62bd126d1
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-01-06 (Sun, 06 Jan 2013)

  Changed paths:
    M src/Log.py

  Log Message:
  -----------
  Log: don't use Resource.

This prevents individual import of Resource from dying of circular import-related issues.

  Commit: f22b5d883eb00b2d79fcb877b22488752b510e25
      https://github.com/fofix/fofix/commit/f22b5d883eb00b2d79fcb877b22488752b510e25
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-01-06 (Sun, 06 Jan 2013)

  Changed paths:
    M src/Credits.py
    M src/Dialogs.py
    M src/GameEngine.py
    M src/GameResultsScene.py
    M src/Menu.py
    M src/Theme.py

  Log Message:
  -----------
  Move Dialogs.fadeScreen to GameEngine.

This fixes the remaining circular import issues for importing
modules individually. A copy-pasted version of fadeScreen was also
removed from Theme.

  Commit: c815c5282f32a06b564ae56aa746aa44c797aa5b
      https://github.com/fofix/fofix/commit/c815c5282f32a06b564ae56aa746aa44c797aa5b
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-01-09 (Wed, 09 Jan 2013)

  Changed paths:
    M src/Theme.py

  Log Message:
  -----------
  Theme: dialog and scene are not instance vars

  Commit: bfafd3ebbb1e1d736b4c922d0f59a117359d4eba
      https://github.com/fofix/fofix/commit/bfafd3ebbb1e1d736b4c922d0f59a117359d4eba
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-01-09 (Wed, 09 Jan 2013)

  Changed paths:
    M src/MixStream/MixStream.c

  Log Message:
  -----------
  MixStream: properly clamp samples that clip

  Commit: 01b200cc4ea0c41e5ec3a3db17e20ccdf13ea426
      https://github.com/fofix/fofix/commit/01b200cc4ea0c41e5ec3a3db17e20ccdf13ea426
  Author: Nicholas Hydock <nhydock at gmail.com>
  Date:   2013-01-16 (Wed, 16 Jan 2013)

  Changed paths:
    M src/GameEngine.py
    M src/Svg.py
    M src/constants.py

  Log Message:
  -----------
  Clean up drawImage a bit by merging its features into ImgDrawing methods and move drawImage into a static ImgDrawing method

  Commit: 4ff2bd2f08c3ec8a2de70599dfa2a1d3bc9806db
      https://github.com/fofix/fofix/commit/4ff2bd2f08c3ec8a2de70599dfa2a1d3bc9806db
  Author: Nicholas Hydock <nhydock at gmail.com>
  Date:   2013-01-16 (Wed, 16 Jan 2013)

  Changed paths:
    M src/Theme.py

  Log Message:
  -----------
  Make a global method for parsing of a String's value is equivalent to True

  Commit: c2ea4dddc8cacd9f452a44a4da619d7bf79fd3a8
      https://github.com/fofix/fofix/commit/c2ea4dddc8cacd9f452a44a4da619d7bf79fd3a8
  Author: Nicholas Hydock <nhydock at gmail.com>
  Date:   2013-01-16 (Wed, 16 Jan 2013)

  Changed paths:
    M src/Shader.py

  Log Message:
  -----------
  Fix some bug with shader loading from Themes and Config if the key isn't defined

  Commit: da143a30837cdc5e9317d44dc5242ab1e3a33b78
      https://github.com/fofix/fofix/commit/da143a30837cdc5e9317d44dc5242ab1e3a33b78
  Author: Nicholas Hydock <nhydock at gmail.com>
  Date:   2013-01-18 (Fri, 18 Jan 2013)

  Changed paths:
    M src/Dialogs.py
    M src/GameEngine.py
    M src/Svg.py

  Log Message:
  -----------
  Fix a few things that broke along the way when a song doesn't have a loading background.
Fixed this by making drawImage return True when the image is drawn and False when you don't give it a proper image instance

  Commit: 1c64b1cd6203a097791c23ad8422c163e0de1b68
      https://github.com/fofix/fofix/commit/1c64b1cd6203a097791c23ad8422c163e0de1b68
  Author: Tom Skinner <akedrou at gmail.com>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

  Changed paths:
    M src/Dialogs.py
    M src/GameEngine.py
    M src/MainMenu.py
    M src/Menu.py
    M src/SongChoosingScene.py
    M src/Svg.py
    M src/Vocalist.py
    M src/constants.py

  Log Message:
  -----------
  Svg: Properly explain stretched param in ImgDrawing.setScale
  - Also changed the input slightly to make better sense.
  - Added a few constants, but didn't import them into scenes.

  Commit: 6a5077448a351fd591c9ccab99c53372a9fe31aa
      https://github.com/fofix/fofix/commit/6a5077448a351fd591c9ccab99c53372a9fe31aa
  Author: Tom Skinner <akedrou at gmail.com>
  Date:   2013-02-21 (Thu, 21 Feb 2013)

  Changed paths:
    M src/Shader.py

  Log Message:
  -----------
  Shader: Remove old/unused method; removed call to Theme.isTrue.

  Commit: ed52a89678e58219ccff3c6ef470af17fcfc8edb
      https://github.com/fofix/fofix/commit/ed52a89678e58219ccff3c6ef470af17fcfc8edb
  Author: Tom Skinner <akedrou at gmail.com>
  Date:   2013-02-21 (Thu, 21 Feb 2013)

  Changed paths:
    M src/Dialogs.py
    M src/GameEngine.py
    M src/MainMenu.py
    M src/Menu.py
    M src/SongChoosingScene.py
    M src/Svg.py
    M src/Vocalist.py
    M src/constants.py

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

  Commit: 53371d58c7d13194ad4909b478618d3b9db07e49
      https://github.com/fofix/fofix/commit/53371d58c7d13194ad4909b478618d3b9db07e49
  Author: Nicholas Hydock <nhydock at gmail.com>
  Date:   2013-02-22 (Fri, 22 Feb 2013)

  Changed paths:
    M src/Shader.py
    M src/Theme.py
    M src/constants.py

  Log Message:
  -----------
  move isTrue checking into constants
Last thing we need is for a boolean check like this to start floating around everywhere without being cleanly contained in a proper location

  Commit: 8c3f731a88b0e5141af3f8460279f1738c472fe6
      https://github.com/fofix/fofix/commit/8c3f731a88b0e5141af3f8460279f1738c472fe6
  Author: Nicholas Hydock <nhydock at gmail.com>
  Date:   2013-02-22 (Fri, 22 Feb 2013)

  Changed paths:
    M src/Credits.py
    M src/Dialogs.py
    M src/GameEngine.py
    M src/GameResultsScene.py
    M src/GuitarScene.py
    M src/Input.py
    M src/Lobby.py
    M src/MainMenu.py
    M src/Menu.py
    M src/SongChoosingScene.py
    M src/Stage.py
    M src/Svg.py
    M src/Theme.py
    M src/Video.py
    M src/Vocalist.py

  Log Message:
  -----------
  Use constants since they've been defined

  Commit: e2c699f936d896d52839be48623d1cde97de1143
      https://github.com/fofix/fofix/commit/e2c699f936d896d52839be48623d1cde97de1143
  Author: Tom Skinner <akedrou at gmail.com>
  Date:   2013-02-22 (Fri, 22 Feb 2013)

  Changed paths:
    M src/Video.py

  Log Message:
  -----------
  Video: fix pygame.FULLSCREEN

  Commit: 062e2fe98ecf2a532be0cf62438145bbe0729fd8
      https://github.com/fofix/fofix/commit/062e2fe98ecf2a532be0cf62438145bbe0729fd8
  Author: weirdpeople <matthewsitton at gmail.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

  Changed paths:
    M README.md

  Log Message:
  -----------
  Updated the download for MSVC 2008 express, and instructions as the previous location has since removed the 2008 version from the page.

  Commit: 512606f433760d370d10a08d96483aeafa834c1a
      https://github.com/fofix/fofix/commit/512606f433760d370d10a08d96483aeafa834c1a
  Author: weirdpeople <matthewsitton at gmail.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

  Changed paths:
    M README.md

  Log Message:
  -----------
  Link to the correct download rather than an upgrade

  Commit: 60451277dde3e36fe37c53b53fcaee8ee58c4cdd
      https://github.com/fofix/fofix/commit/60451277dde3e36fe37c53b53fcaee8ee58c4cdd
  Author: weirdpeople <matthewsitton at gmail.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

  Changed paths:
    M src/Instrument.py

  Log Message:
  -----------
  Remove useless note sort.

  Commit: 88a0ca362c5b6533a620b3035e1e838573320a4c
      https://github.com/fofix/fofix/commit/88a0ca362c5b6533a620b3035e1e838573320a4c
  Author: weirdpeople <matthewsitton at gmail.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

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

  Log Message:
  -----------
  remove the for compatibility self.guitars from GuitarScene.

  Commit: a36113452708b4cd0f2cacedd59ab7261410f635
      https://github.com/fofix/fofix/commit/a36113452708b4cd0f2cacedd59ab7261410f635
  Author: weirdpeople <matthewsitton at gmail.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

  Changed paths:
    M src/GuitarScene.py

  Log Message:
  -----------
  There is no need to set the camera values twice in a row.

  Commit: 8f09697bf6eff1c67a437e894a285ecbac8b4c47
      https://github.com/fofix/fofix/commit/8f09697bf6eff1c67a437e894a285ecbac8b4c47
  Author: weirdpeople <matthewsitton at gmail.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

  Changed paths:
    M src/GuitarScene.py

  Log Message:
  -----------
  We don't need to convert all of these values into strings in order to see if there are any missing -_-

  Commit: dca71ef2c8077c0aa05083bf132a6e337ae4a392
      https://github.com/fofix/fofix/commit/dca71ef2c8077c0aa05083bf132a6e337ae4a392
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

  Changed paths:
    M win32/makedeps-cross.sh

  Log Message:
  -----------
  deppack: Tell the compiler not to make overly optimistic assumptions about stack alignment.

This prevents crashes when the built libraries use SSE instructions in certain ways.

  Commit: 357e5fc403d183c304092c07c32826e913388999
      https://github.com/fofix/fofix/commit/357e5fc403d183c304092c07c32826e913388999
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

  Changed paths:
    M win32/ffmpeg-implib-install.patch
    M win32/makedeps-cross.sh
    R win32/pkg-config-win32-prefix-escaping.patch

  Log Message:
  -----------
  deppack: Update to newest upstream versions of dependency libraries.

The patch to pkg-config is dropped because it has been applied upstream.

The patch to ffmpeg is modified to ignore installation errors on another file.

  Commit: 096d0f25c1461c4916c3a74594598ff0657f8f0b
      https://github.com/fofix/fofix/commit/096d0f25c1461c4916c3a74594598ff0657f8f0b
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

  Changed paths:
    M win32/makedeps-cross.sh

  Log Message:
  -----------
  deppack: Add libpng.

  Commit: 5cb6130ab4402b218c3b11e713412e8620bbe510
      https://github.com/fofix/fofix/commit/5cb6130ab4402b218c3b11e713412e8620bbe510
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

  Changed paths:
    M win32/makedeps-cross.sh

  Log Message:
  -----------
  deppack: Add libjpeg.

  Commit: a9455af02843ce264e5b941f082831a227204edd
      https://github.com/fofix/fofix/commit/a9455af02843ce264e5b941f082831a227204edd
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

  Changed paths:
    A win32/flac-mingw-dll.patch
    M win32/makedeps-cross.sh

  Log Message:
  -----------
  deppack: Add FLAC.

The patch is from upstream git and needed for modern MinGW toolchains.

  Commit: d6801248a8b142225e6d5440f30f6e6eb7fc155f
      https://github.com/fofix/fofix/commit/d6801248a8b142225e6d5440f30f6e6eb7fc155f
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

  Changed paths:
    M win32/makedeps-cross.sh

  Log Message:
  -----------
  deppack: Add freetype.

  Commit: 0b27d7d4e1807afbad038e9d8928333b77ddcae6
      https://github.com/fofix/fofix/commit/0b27d7d4e1807afbad038e9d8928333b77ddcae6
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

  Changed paths:
    M win32/makedeps-cross.sh

  Log Message:
  -----------
  deppack: Add SDL_ttf.

  Commit: 142fd5bd67a988907a169ff72801b8d38ecfdb36
      https://github.com/fofix/fofix/commit/142fd5bd67a988907a169ff72801b8d38ecfdb36
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

  Changed paths:
    M win32/makedeps-cross.sh

  Log Message:
  -----------
  deppack: Add SDL_image.

  Commit: 01fd5a54ab0adaead5619d4a1eac9bf8520e481c
      https://github.com/fofix/fofix/commit/01fd5a54ab0adaead5619d4a1eac9bf8520e481c
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

  Changed paths:
    M win32/makedeps-cross.sh

  Log Message:
  -----------
  deppack: Add PortMidi.

  Commit: c53decc01b0b4570396788a3b82158349466a069
      https://github.com/fofix/fofix/commit/c53decc01b0b4570396788a3b82158349466a069
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-03-04 (Mon, 04 Mar 2013)

  Changed paths:
    M README.md

  Log Message:
  -----------
  README: Add a link to IRC.

  Commit: b3873add44e807be06b69179f68c1d993b39e6b5
      https://github.com/fofix/fofix/commit/b3873add44e807be06b69179f68c1d993b39e6b5
  Author: John Stumpo <stump at jstump.com>
  Date:   2013-03-04 (Mon, 04 Mar 2013)

  Changed paths:
    M README.md

  Log Message:
  -----------
  README: Update link to the dependency pack.

  Commit: 97b43b2d5f422ed32c2c37a0e35de1db457e48f8
      https://github.com/fofix/fofix/commit/97b43b2d5f422ed32c2c37a0e35de1db457e48f8
  Author: weirdpeople <matthewsitton at gmail.com>
  Date:   2013-03-24 (Sun, 24 Mar 2013)

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

  Log Message:
  -----------
  Rewrite how the task management system stores the tasks, now in TaskEngine.py.

  Commit: 6946addcb1be6db9aa50a28f2dbb0e6a0eecc8eb
      https://github.com/fofix/fofix/commit/6946addcb1be6db9aa50a28f2dbb0e6a0eecc8eb
  Author: weirdpeople <matthewsitton at gmail.com>
  Date:   2013-03-24 (Sun, 24 Mar 2013)

  Changed paths:
    M src/TaskEngine.py

  Log Message:
  -----------
  Implement a fixed time interval between calls to synced tasks. It is currently set at 25ms which is 40 times per second.

  Commit: 033d453c624c66904464c8c96f4eadb1b268e47f
      https://github.com/fofix/fofix/commit/033d453c624c66904464c8c96f4eadb1b268e47f
  Author: weirdpeople <matthewsitton at gmail.com>
  Date:   2013-03-24 (Sun, 24 Mar 2013)

  Changed paths:
    M src/TaskEngine.py

  Log Message:
  -----------
  Fix the wrong tick size going into the tasks.

  Commit: 1b8c9fc6ba6ac7c5679672aac6469815700861ac
      https://github.com/fofix/fofix/commit/1b8c9fc6ba6ac7c5679672aac6469815700861ac
  Author: weirdpeople <matthewsitton at gmail.com>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

  Changed paths:
    M src/GameEngine.py
    M src/TaskEngine.py

  Log Message:
  -----------
  Remove some unneeded code.

  Commit: 889b8404024785d4cb09123a9f8c93982d8989b6
      https://github.com/fofix/fofix/commit/889b8404024785d4cb09123a9f8c93982d8989b6
  Author: weirdpeople <matthewsitton at gmail.com>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

  Changed paths:
    M src/TaskEngine.py

  Log Message:
  -----------
  Change timestep to 20ms, which is 50hz

  Commit: 383019cd69cd53f8a3d9d187e6d8f0e662982257
      https://github.com/fofix/fofix/commit/383019cd69cd53f8a3d9d187e6d8f0e662982257
  Author: weirdpeople <matthewsitton at gmail.com>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

  Changed paths:
    M src/TaskEngine.py

  Log Message:
  -----------
  Removed extra whitespace.

  Commit: 5338673a8d111dfbfee7953a46e6b59e53803296
      https://github.com/fofix/fofix/commit/5338673a8d111dfbfee7953a46e6b59e53803296
  Author: weirdpeople <matthewsitton at gmail.com>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

  Changed paths:
    M src/TaskEngine.py

  Log Message:
  -----------
  Moved self.deltaTime to to top of the file as a constant.

  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: 05e1a94a4ba397231270b2d6cc01ddb0fabaf783
      https://github.com/fofix/fofix/commit/05e1a94a4ba397231270b2d6cc01ddb0fabaf783
  Author: Matthew <matthewsitton at gmail.com>
  Date:   2014-01-07 (Tue, 07 Jan 2014)

  Changed paths:
    A CHANGELOG
    M data/themes/MegaLight V4/theme.ini
    M src/Audio.py
    M src/Drum.py
    M src/FoFiX.py
    M src/GameEngine.py
    M src/GuitarScene.py
    M src/Instrument.py
    M src/Lobby.py
    M src/MainMenu.py
    M src/Neck.py
    M src/SceneFactory.py
    M src/Song.py
    M src/Theme.py
    M src/Version.py
    M src/World.py
    M src/midi/MidiFileParser.py

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

Conflicts:
	src/GuitarScene.py

  Commit: 9a9b1a68d49533d85cb679b142abcb9ad7650b5a
      https://github.com/fofix/fofix/commit/9a9b1a68d49533d85cb679b142abcb9ad7650b5a
  Author: Matthew <matthewsitton at gmail.com>
  Date:   2014-01-07 (Tue, 07 Jan 2014)

  Changed paths:
    M README
    M data/shaders/cd.frag
    M data/shaders/cd.vert
    M data/shaders/lightning.frag
    M data/shaders/lightning.vert
    M data/shaders/metal.frag
    M data/shaders/metal.vert
    M data/shaders/neck.frag
    M data/shaders/neck.vert
    M data/shaders/rockbandtail.frag
    M data/shaders/rockbandtail.vert
    M data/themes/MegaLight V4/CustomRMLayers.py
    M data/themes/MegaLight/CustomTheme.py
    M pkg/ListToNSIS.py
    M pkg/MakeFoFiXInstaller.py
    M src/Audio.py
    M src/Camera.py
    M src/Cerealizer.py
    M src/Collada.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/Language.py
    M src/Lobby.py
    M src/Log.py
    M src/MainMenu.py
    M src/Menu.py
    M src/Mesh.py
    M src/Microphone.py
    M src/Mod.py
    M src/Neck.py
    M src/Player.py
    M src/ProGuitar.py
    M src/Resource.py
    M src/Rockmeter.py
    M src/Scene.py
    M src/SceneFactory.py
    M src/Scorekeeper.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/Task.py
    M src/Texture.py
    M src/Theme.py
    M src/VFS.py
    M src/Version.py
    M src/Video.py
    M src/VideoPlayer.pyx
    M src/VideoPlayerCore.c
    M src/View.py
    M src/Vocalist.py
    M src/World.py
    M src/cmgl.pyx
    M src/gl.pxi
    M src/midi/DataTypeConverters.py
    M src/midi/EventDispatcher.py
    M src/midi/MidiFileParser.py
    M src/midi/MidiInFile.py
    M src/midi/MidiInStream.py
    M src/midi/MidiOutFile.py
    M src/midi/MidiOutStream.py
    M src/midi/MidiToText.py
    M src/midi/RawInstreamFile.py
    M src/midi/RawOutstreamFile.py
    M src/midi/constants.py
    M src/pypitch/_pypitch.pyx
    M src/pypitch/fft.hpp
    M src/pypitch/pitch.cpp
    M src/pypitch/pitch.hpp
    M src/setup.py
    M src/tests/AudioTest.py
    M src/tests/CerealizerTest.py
    M src/tests/DialogTest.py
    M src/tests/DrawingTest.py
    M src/tests/FontTest.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/TestAll.py
    M src/tests/VFSTest.py
    M src/tests/VideoTest.py
    M src/tests/ViewTest.py

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

Conflicts:
	src/Drum.py
	src/Guitar.py
	src/GuitarScene.py
	src/Instrument.py

  Commit: 3e801928f0dec094208b83b3eba27c556bc1b0e2
      https://github.com/fofix/fofix/commit/3e801928f0dec094208b83b3eba27c556bc1b0e2
  Author: Matthew <matthewsitton at gmail.com>
  Date:   2014-01-07 (Tue, 07 Jan 2014)

  Changed paths:
    A .gitattributes
    M .gitignore
    R README
    A README.md
    A data/po/french_(Reform_1990).po
    A data/po/hebrew.po
    A data/po/pig_latin.po
    A data/po/polish.po
    A data/po/russian.po
    A data/po/swedish.po
    R data/themes/MegaLight V4/rockmeter/platinum.png
    A data/themes/MegaLight V4/rockmeter/platinum.png
    M data/themes/MegaLight V4/setlist/item.dae
    M data/themes/MegaLight V4/setlist/label.dae
    M data/themes/MegaLight V4/setlist/library.dae
    M data/themes/MegaLight V4/setlist/library_label.dae
    R data/themes/MegaLight V4/starperfect.png
    A data/themes/MegaLight V4/starperfect.png
    R data/translations/brazilian_portuguese.mo
    R data/translations/french.mo
    R data/translations/french_(Reform_1990).mo
    R data/translations/german.mo
    R data/translations/hebrew.mo
    R data/translations/italian.mo
    R data/translations/pig_latin.mo
    R data/translations/polish.mo
    R data/translations/russian.mo
    R data/translations/spanish.mo
    R data/translations/swedish.mo
    M doc/RunningFromSource.mkd
    M doc/copyright
    M pkg/MakeFoFiXInstaller.py
    M pkg/setup.iss
    M src/Audio.py
    M src/Config.py
    A src/ConfigDefs.py
    M src/Credits.py
    M src/Dialogs.py
    M src/Drum.py
    M src/FoFiX.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/Language.py
    M src/LinedConfigParser.py
    M src/Lobby.py
    M src/Log.py
    M src/MainMenu.py
    M src/Menu.py
    A src/MixStream/MixStream.c
    A src/MixStream/MixStream.h
    A src/MixStream/_MixStream.pyx
    A src/MixStream/__init__.py
    A src/MixStream/soundtouch-c.cpp
    A src/MixStream/soundtouch-c.h
    A src/MixStream/vorbis.c
    M src/Neck.py
    M src/ProGuitar.py
    M src/Scene.py
    M src/Scorekeeper.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
    A src/TaskEngine.py
    M src/Theme.py
    A src/Unicode.py
    M src/Video.py
    R src/VideoPlayer.h
    R src/VideoPlayer.pyx
    A src/VideoPlayer/VideoPlayer.c
    A src/VideoPlayer/VideoPlayer.h
    A src/VideoPlayer/_VideoPlayer.pyx
    A src/VideoPlayer/__init__.py
    R src/VideoPlayerCore.c
    M src/Vocalist.py
    M src/constants.py
    R src/fofix.ico
    R src/messages.pot
    R src/scripts/ClearSongCache.bat
    R src/scripts/GetTranslatableText.bat
    M src/scripts/RebuildWin.bat
    M src/setup.py
    A win32/README.deppack.stub
    A win32/ffmpeg-implib-install.patch
    A win32/flac-mingw-dll.patch
    A win32/fofix.ico
    M win32/makedeps-cross.sh
    M win32/makedist.sh

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

  Commit: 2e15d16d147281fde151bef16f729ba03a7e618c
      https://github.com/fofix/fofix/commit/2e15d16d147281fde151bef16f729ba03a7e618c
  Author: Matthew <matthewsitton at gmail.com>
  Date:   2014-01-07 (Tue, 07 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' into Cleaning

  Commit: 48a0fdc3447bd94f27f3a4bfd1f173940e5ae742
      https://github.com/fofix/fofix/commit/48a0fdc3447bd94f27f3a4bfd1f173940e5ae742
  Author: Matthew <matthewsitton at gmail.com>
  Date:   2014-01-07 (Tue, 07 Jan 2014)

  Changed paths:
    M src/views/GuitarScene/GuitarScene.py
    M src/views/GuitarScene/instruments/Guitar.py

  Log Message:
  -----------
  Fix some merge errors.

Compare: https://github.com/fofix/fofix/compare/2b4a31e4d305...48a0fdc3447b