[fofix-commits] [fofix/fofix] b0e0e7: Move wiki files into the doc folder, and move some...

GitHub noreply at github.com
Thu Jun 26 23:48:07 UTC 2014 

  Branch: refs/heads/crude-rmscu-update
  Home:   https://github.com/fofix/fofix
  Commit: b0e0e7de3df69f0a3584483dcb7b513585805ce9
      https://github.com/fofix/fofix/commit/b0e0e7de3df69f0a3584483dcb7b513585805ce9
  Author: Matthew Sitton <matthewsitton at gmail.com>
  Date:   2014-06-26 (Thu, 26 Jun 2014)

  Changed paths:
    R doc/FOF Help.chm
    R doc/Features-Manual.txt
    R doc/Notices.txt
    R doc/hitwindows.htm
    A doc/old/FOF Help.chm
    A doc/old/Features-Manual.txt
    A doc/old/Notices.txt
    A doc/old/hitwindows.htm
    A doc/wiki/BasicInstructions.wiki
    A doc/wiki/CareerTitlesIniInstructions.wiki
    A doc/wiki/CommandLines.wiki
    A doc/wiki/DevelopmentNotes.wiki
    A doc/wiki/Donations.wiki
    A doc/wiki/FAQ.wiki
    A doc/wiki/FeatureFreeze.wiki
    A doc/wiki/FoFixUsableAudioFiles.wiki
    A doc/wiki/GameControllers.wiki
    A doc/wiki/GameOptions.wiki
    A doc/wiki/HowSongsAreHandled.wiki
    A doc/wiki/KnownIssues.wiki
    A doc/wiki/MakingShaders.wiki
    A doc/wiki/MembersHowToCommit.wiki
    A doc/wiki/MidiSectionsMappedOut.wiki
    A doc/wiki/OldNews.wiki
    A doc/wiki/ProjectStatistics.wiki
    A doc/wiki/ReportingBugs.wiki
    A doc/wiki/RequiredSourceModules.wiki
    A doc/wiki/Roadmap.wiki
    A doc/wiki/RunningUnderGNULinux.wiki
    A doc/wiki/RunningUnderPython26.wiki
    A doc/wiki/Shaders.wiki
    A doc/wiki/SongFrettersTips.wiki
    A doc/wiki/SongINIInstructions.wiki
    A doc/wiki/TableOfContents.wiki
    A doc/wiki/ThemeFileSettings.wiki
    A doc/wiki/ThemeUsableImages.wiki
    A doc/wiki/Translating.wiki
    R wiki/BasicInstructions.wiki
    R wiki/CareerTitlesIniInstructions.wiki
    R wiki/CommandLines.wiki
    R wiki/DevelopmentNotes.wiki
    R wiki/Donations.wiki
    R wiki/FAQ.wiki
    R wiki/FeatureFreeze.wiki
    R wiki/FoFixUsableAudioFiles.wiki
    R wiki/GameControllers.wiki
    R wiki/GameOptions.wiki
    R wiki/HowSongsAreHandled.wiki
    R wiki/KnownIssues.wiki
    R wiki/MakingShaders.wiki
    R wiki/MembersHowToCommit.wiki
    R wiki/MidiSectionsMappedOut.wiki
    R wiki/OldNews.wiki
    R wiki/ProjectStatistics.wiki
    R wiki/ReportingBugs.wiki
    R wiki/RequiredSourceModules.wiki
    R wiki/Roadmap.wiki
    R wiki/RunningUnderGNULinux.wiki
    R wiki/RunningUnderPython26.wiki
    R wiki/Shaders.wiki
    R wiki/SongFrettersTips.wiki
    R wiki/SongINIInstructions.wiki
    R wiki/TableOfContents.wiki
    R wiki/ThemeFileSettings.wiki
    R wiki/ThemeUsableImages.wiki
    R wiki/Translating.wiki

  Log Message:
  -----------
  Move wiki files into the doc folder, and move some older pre-fofix docs to a new folder.


  Commit: 8c97527e7ce67bb0772e30299f19be45fc4d91a3
      https://github.com/fofix/fofix/commit/8c97527e7ce67bb0772e30299f19be45fc4d91a3
  Author: Matthew Sitton <matthewsitton at gmail.com>
  Date:   2014-06-26 (Thu, 26 Jun 2014)

  Changed paths:
    M .gitignore
    A FoFiX.py
    A epydoc.cfg
    A fofix/__init__.py
    A fofix/core/Audio.py
    A fofix/core/Camera.py
    A fofix/core/Cerealizer.py
    A fofix/core/Collada.py
    A fofix/core/Config.py
    A fofix/core/ConfigDefs.py
    A fofix/core/Data.py
    A fofix/core/Font.py
    A fofix/core/GameEngine.py
    A fofix/core/Image.py
    A fofix/core/Input.py
    A fofix/core/Language.py
    A fofix/core/LinedConfigParser.py
    A fofix/core/Log.py
    A fofix/core/Mesh.py
    A fofix/core/Microphone.py
    A fofix/core/MixStream/MixStream.c
    A fofix/core/MixStream/MixStream.h
    A fofix/core/MixStream/_MixStream.c
    A fofix/core/MixStream/_MixStream.pyx
    A fofix/core/MixStream/__init__.py
    A fofix/core/MixStream/soundtouch-c.cpp
    A fofix/core/MixStream/soundtouch-c.h
    A fofix/core/MixStream/vorbis.c
    A fofix/core/Mod.py
    A fofix/core/Player.py
    A fofix/core/Resource.py
    A fofix/core/Scene.py
    A fofix/core/SceneFactory.py
    A fofix/core/Settings.py
    A fofix/core/Shader.py
    A fofix/core/Task.py
    A fofix/core/Texture.py
    A fofix/core/Theme.py
    A fofix/core/Unicode.py
    A fofix/core/VFS.py
    A fofix/core/Version.py
    A fofix/core/Video.py
    A fofix/core/VideoPlayer/VideoPlayer.c
    A fofix/core/VideoPlayer/VideoPlayer.h
    A fofix/core/VideoPlayer/_VideoPlayer.c
    A fofix/core/VideoPlayer/_VideoPlayer.pyx
    A fofix/core/VideoPlayer/__init__.py
    A fofix/core/VideoPlayer/glwrap.h
    A fofix/core/View.py
    A fofix/core/__init__.py
    A fofix/core/cmgl/__init__.py
    A fofix/core/cmgl/cmgl.c
    A fofix/core/cmgl/cmgl.pyx
    A fofix/core/cmgl/gl.pxi
    A fofix/core/cmgl/glwrap.h
    A fofix/core/constants.py
    A fofix/core/midi/DataTypeConverters.py
    A fofix/core/midi/EventDispatcher.py
    A fofix/core/midi/MidiFileParser.py
    A fofix/core/midi/MidiInFile.py
    A fofix/core/midi/MidiInStream.py
    A fofix/core/midi/MidiOutFile.py
    A fofix/core/midi/MidiOutStream.py
    A fofix/core/midi/MidiToText.py
    A fofix/core/midi/RawInstreamFile.py
    A fofix/core/midi/RawOutstreamFile.py
    A fofix/core/midi/__init__.py
    A fofix/core/midi/changes.txt
    A fofix/core/midi/constants.py
    A fofix/core/midi/readme.txt
    A fofix/core/midi/version.txt
    A fofix/core/pypitch/AnalyzerInput.cpp
    A fofix/core/pypitch/AnalyzerInput.hpp
    A fofix/core/pypitch/__init__.py
    A fofix/core/pypitch/_pypitch.cpp
    A fofix/core/pypitch/_pypitch.pyx
    A fofix/core/pypitch/fft.hpp
    A fofix/core/pypitch/pitch.cpp
    A fofix/core/pypitch/pitch.hpp
    A fofix/core/pypitch/util.hpp
    A fofix/core/timer.py
    A fofix/game/Credits.py
    A fofix/game/Debug.py
    A fofix/game/Dialogs.py
    A fofix/game/GameResultsScene.py
    A fofix/game/Lobby.py
    A fofix/game/MainMenu.py
    A fofix/game/Menu.py
    A fofix/game/Scorekeeper.py
    A fofix/game/Song.py
    A fofix/game/SongChoosingScene.py
    A fofix/game/World.py
    A fofix/game/__init__.py
    A fofix/game/guitarscene/GuitarScene.py
    A fofix/game/guitarscene/Neck.py
    A fofix/game/guitarscene/Rockmeter.py
    A fofix/game/guitarscene/Stage.py
    A fofix/game/guitarscene/__init__.py
    A fofix/game/guitarscene/instruments/Drum.py
    A fofix/game/guitarscene/instruments/Guitar.py
    A fofix/game/guitarscene/instruments/Instrument.py
    A fofix/game/guitarscene/instruments/ProGuitar.py
    A fofix/game/guitarscene/instruments/Vocalist.py
    A fofix/game/guitarscene/instruments/__init__.py
    A fofix/lib/__init__.py
    A fofix/tests/AudioTest.py
    A fofix/tests/CerealizerTest.py
    A fofix/tests/DialogTest.py
    A fofix/tests/DrawingTest.py
    A fofix/tests/FontTest.py
    A fofix/tests/GameEngineTest.py
    A fofix/tests/MenuTest.py
    A fofix/tests/ResourceTest.py
    A fofix/tests/SceneTest.py
    A fofix/tests/SongTest.py
    A fofix/tests/SvgTest.py
    A fofix/tests/TestAll.py
    A fofix/tests/VFSTest.py
    A fofix/tests/VideoTest.py
    A fofix/tests/ViewTest.py
    A makefile
    A scripts/ClearCompiledPycs.bat
    A scripts/RebuildWin.bat
    A scripts/RunFofFromSources.bat
    A scripts/TraceFoF.bat
    A scripts/cmdFromHere.bat
    A setup.py
    R src/FoFiX.py
    R src/Version.py
    R src/audio/Microphone.py
    R src/audio/MixStream/MixStream.c
    R src/audio/MixStream/MixStream.h
    R src/audio/MixStream/_MixStream.pyx
    R src/audio/MixStream/__init__.py
    R src/audio/MixStream/soundtouch-c.cpp
    R src/audio/MixStream/soundtouch-c.h
    R src/audio/MixStream/vorbis.c
    R src/audio/__init__.py
    R src/audio/pypitch/AnalyzerInput.cpp
    R src/audio/pypitch/AnalyzerInput.hpp
    R src/audio/pypitch/__init__.py
    R src/audio/pypitch/_pypitch.pyx
    R src/audio/pypitch/fft.hpp
    R src/audio/pypitch/pitch.cpp
    R src/audio/pypitch/pitch.hpp
    R src/audio/pypitch/util.hpp
    R src/configuration/Config.py
    R src/configuration/ConfigDefs.py
    R src/configuration/Mod.py
    R src/configuration/Theme.py
    R src/configuration/__init__.py
    R src/constants.py
    R src/core/Audio.py
    R src/core/Data.py
    R src/core/GameEngine.py
    R src/core/Input.py
    R src/core/Language.py
    R src/core/Resource.py
    R src/core/Settings.py
    R src/core/Task.py
    R src/core/Video.py
    R src/core/__init__.py
    R src/epydoc.cfg
    R src/game/Player.py
    R src/game/Scorekeeper.py
    R src/game/Song.py
    R src/game/World.py
    R src/game/__init__.py
    R src/graphics/Camera.py
    R src/graphics/Font.py
    R src/graphics/Image.py
    R src/graphics/Mesh.py
    R src/graphics/Shader.py
    R src/graphics/Texture.py
    R src/graphics/VideoPlayer/VideoPlayer.c
    R src/graphics/VideoPlayer/VideoPlayer.h
    R src/graphics/VideoPlayer/_VideoPlayer.pyx
    R src/graphics/VideoPlayer/__init__.py
    R src/graphics/VideoPlayer/glwrap.h
    R src/graphics/__init__.py
    R src/graphics/cmgl/__init__.py
    R src/graphics/cmgl/cmgl.pyx
    R src/graphics/cmgl/gl.pxi
    R src/graphics/cmgl/glwrap.h
    R src/lib/__init__.py
    R src/makefile
    R src/midi/DataTypeConverters.py
    R src/midi/EventDispatcher.py
    R src/midi/MidiFileParser.py
    R src/midi/MidiInFile.py
    R src/midi/MidiInStream.py
    R src/midi/MidiOutFile.py
    R src/midi/MidiOutStream.py
    R src/midi/MidiToText.py
    R src/midi/RawInstreamFile.py
    R src/midi/RawOutstreamFile.py
    R src/midi/__init__.py
    R src/midi/changes.txt
    R src/midi/constants.py
    R src/midi/readme.txt
    R src/midi/version.txt
    R src/scripts/ClearCompiledPycs.bat
    R src/scripts/RebuildWin.bat
    R src/scripts/RunFofFromSources.bat
    R src/scripts/TraceFoF.bat
    R src/scripts/cmdFromHere.bat
    R src/setup.py
    R src/tests/AudioTest.py
    R src/tests/CerealizerTest.py
    R src/tests/DialogTest.py
    R src/tests/DrawingTest.py
    R src/tests/FontTest.py
    R src/tests/GameEngineTest.py
    R src/tests/MenuTest.py
    R src/tests/ResourceTest.py
    R src/tests/SceneTest.py
    R src/tests/SongTest.py
    R src/tests/SvgTest.py
    R src/tests/TestAll.py
    R src/tests/VFSTest.py
    R src/tests/VideoTest.py
    R src/tests/ViewTest.py
    R src/tutorial.pot
    R src/util/Cerealizer.py
    R src/util/Collada.py
    R src/util/LinedConfigParser.py
    R src/util/Log.py
    R src/util/Unicode.py
    R src/util/VFS.py
    R src/util/__init__.py
    R src/util/timer.py
    R src/views/Credits.py
    R src/views/Debug.py
    R src/views/Dialogs.py
    R src/views/GameResultsScene/GameResultsScene.py
    R src/views/GameResultsScene/__init__.py
    R src/views/GuitarScene/GuitarScene.py
    R src/views/GuitarScene/Neck.py
    R src/views/GuitarScene/Rockmeter.py
    R src/views/GuitarScene/Stage.py
    R src/views/GuitarScene/__init__.py
    R src/views/GuitarScene/instruments/Drum.py
    R src/views/GuitarScene/instruments/Guitar.py
    R src/views/GuitarScene/instruments/Instrument.py
    R src/views/GuitarScene/instruments/ProGuitar.py
    R src/views/GuitarScene/instruments/Vocalist.py
    R src/views/GuitarScene/instruments/__init__.py
    R src/views/MainMenu/Lobby.py
    R src/views/MainMenu/MainMenu.py
    R src/views/MainMenu/__init__.py
    R src/views/Menu.py
    R src/views/Scene.py
    R src/views/SceneFactory.py
    R src/views/SongChoosingScene/SongChoosingScene.py
    R src/views/SongChoosingScene/__init__.py
    R src/views/View.py
    R src/views/__init__.py

  Log Message:
  -----------
  Arrange the source into a single package.


  Commit: 5b664b61b89ea6018e61c2515268b99fb25df880
      https://github.com/fofix/fofix/commit/5b664b61b89ea6018e61c2515268b99fb25df880
  Author: John Stumpo <stump at stump.io>
  Date:   2014-06-26 (Thu, 26 Jun 2014)

  Changed paths:
    M .gitignore
    R fofix/core/MixStream/_MixStream.c
    R fofix/core/VideoPlayer/_VideoPlayer.c
    R fofix/core/cmgl/cmgl.c
    R fofix/core/pypitch/_pypitch.cpp

  Log Message:
  -----------
  Update .gitignore for the new layout and remove Cython-generated files.


  Commit: 12f9e726599fa58ca31ffca63a90e1e4e512a7cc
      https://github.com/fofix/fofix/commit/12f9e726599fa58ca31ffca63a90e1e4e512a7cc
  Author: John Stumpo <stump at stump.io>
  Date:   2014-06-26 (Thu, 26 Jun 2014)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  setup.py: Update soundtouch-c.cpp location for the new layout.


  Commit: 24250fb626efb51c2295cd094f05c4a03629659c
      https://github.com/fofix/fofix/commit/24250fb626efb51c2295cd094f05c4a03629659c
  Author: Matthew Sitton <matthewsitton at gmail.com>
  Date:   2014-06-26 (Thu, 26 Jun 2014)

  Changed paths:
    A fofix/tests/__init__.py

  Log Message:
  -----------
  Add __init__.py for tests


  Commit: 37b6c0669b614a65791b8f65dcc406ae3a06a2c4
      https://github.com/fofix/fofix/commit/37b6c0669b614a65791b8f65dcc406ae3a06a2c4
  Author: mdsitton <matthewsitton at gmail.com>
  Date:   2014-06-26 (Thu, 26 Jun 2014)

  Changed paths:
    M .gitignore
    A FoFiX.py
    R doc/FOF Help.chm
    R doc/Features-Manual.txt
    R doc/Notices.txt
    R doc/hitwindows.htm
    A doc/old/FOF Help.chm
    A doc/old/Features-Manual.txt
    A doc/old/Notices.txt
    A doc/old/hitwindows.htm
    A doc/wiki/BasicInstructions.wiki
    A doc/wiki/CareerTitlesIniInstructions.wiki
    A doc/wiki/CommandLines.wiki
    A doc/wiki/DevelopmentNotes.wiki
    A doc/wiki/Donations.wiki
    A doc/wiki/FAQ.wiki
    A doc/wiki/FeatureFreeze.wiki
    A doc/wiki/FoFixUsableAudioFiles.wiki
    A doc/wiki/GameControllers.wiki
    A doc/wiki/GameOptions.wiki
    A doc/wiki/HowSongsAreHandled.wiki
    A doc/wiki/KnownIssues.wiki
    A doc/wiki/MakingShaders.wiki
    A doc/wiki/MembersHowToCommit.wiki
    A doc/wiki/MidiSectionsMappedOut.wiki
    A doc/wiki/OldNews.wiki
    A doc/wiki/ProjectStatistics.wiki
    A doc/wiki/ReportingBugs.wiki
    A doc/wiki/RequiredSourceModules.wiki
    A doc/wiki/Roadmap.wiki
    A doc/wiki/RunningUnderGNULinux.wiki
    A doc/wiki/RunningUnderPython26.wiki
    A doc/wiki/Shaders.wiki
    A doc/wiki/SongFrettersTips.wiki
    A doc/wiki/SongINIInstructions.wiki
    A doc/wiki/TableOfContents.wiki
    A doc/wiki/ThemeFileSettings.wiki
    A doc/wiki/ThemeUsableImages.wiki
    A doc/wiki/Translating.wiki
    A epydoc.cfg
    A fofix/__init__.py
    A fofix/core/Audio.py
    A fofix/core/Camera.py
    A fofix/core/Cerealizer.py
    A fofix/core/Collada.py
    A fofix/core/Config.py
    A fofix/core/ConfigDefs.py
    A fofix/core/Data.py
    A fofix/core/Font.py
    A fofix/core/GameEngine.py
    A fofix/core/Image.py
    A fofix/core/Input.py
    A fofix/core/Language.py
    A fofix/core/LinedConfigParser.py
    A fofix/core/Log.py
    A fofix/core/Mesh.py
    A fofix/core/Microphone.py
    A fofix/core/MixStream/MixStream.c
    A fofix/core/MixStream/MixStream.h
    A fofix/core/MixStream/_MixStream.pyx
    A fofix/core/MixStream/__init__.py
    A fofix/core/MixStream/soundtouch-c.cpp
    A fofix/core/MixStream/soundtouch-c.h
    A fofix/core/MixStream/vorbis.c
    A fofix/core/Mod.py
    A fofix/core/Player.py
    A fofix/core/Resource.py
    A fofix/core/Scene.py
    A fofix/core/SceneFactory.py
    A fofix/core/Settings.py
    A fofix/core/Shader.py
    A fofix/core/Task.py
    A fofix/core/Texture.py
    A fofix/core/Theme.py
    A fofix/core/Unicode.py
    A fofix/core/VFS.py
    A fofix/core/Version.py
    A fofix/core/Video.py
    A fofix/core/VideoPlayer/VideoPlayer.c
    A fofix/core/VideoPlayer/VideoPlayer.h
    A fofix/core/VideoPlayer/_VideoPlayer.pyx
    A fofix/core/VideoPlayer/__init__.py
    A fofix/core/VideoPlayer/glwrap.h
    A fofix/core/View.py
    A fofix/core/__init__.py
    A fofix/core/cmgl/__init__.py
    A fofix/core/cmgl/cmgl.pyx
    A fofix/core/cmgl/gl.pxi
    A fofix/core/cmgl/glwrap.h
    A fofix/core/constants.py
    A fofix/core/midi/DataTypeConverters.py
    A fofix/core/midi/EventDispatcher.py
    A fofix/core/midi/MidiFileParser.py
    A fofix/core/midi/MidiInFile.py
    A fofix/core/midi/MidiInStream.py
    A fofix/core/midi/MidiOutFile.py
    A fofix/core/midi/MidiOutStream.py
    A fofix/core/midi/MidiToText.py
    A fofix/core/midi/RawInstreamFile.py
    A fofix/core/midi/RawOutstreamFile.py
    A fofix/core/midi/__init__.py
    A fofix/core/midi/changes.txt
    A fofix/core/midi/constants.py
    A fofix/core/midi/readme.txt
    A fofix/core/midi/version.txt
    A fofix/core/pypitch/AnalyzerInput.cpp
    A fofix/core/pypitch/AnalyzerInput.hpp
    A fofix/core/pypitch/__init__.py
    A fofix/core/pypitch/_pypitch.pyx
    A fofix/core/pypitch/fft.hpp
    A fofix/core/pypitch/pitch.cpp
    A fofix/core/pypitch/pitch.hpp
    A fofix/core/pypitch/util.hpp
    A fofix/core/timer.py
    A fofix/game/Credits.py
    A fofix/game/Debug.py
    A fofix/game/Dialogs.py
    A fofix/game/GameResultsScene.py
    A fofix/game/Lobby.py
    A fofix/game/MainMenu.py
    A fofix/game/Menu.py
    A fofix/game/Scorekeeper.py
    A fofix/game/Song.py
    A fofix/game/SongChoosingScene.py
    A fofix/game/World.py
    A fofix/game/__init__.py
    A fofix/game/guitarscene/GuitarScene.py
    A fofix/game/guitarscene/Neck.py
    A fofix/game/guitarscene/Rockmeter.py
    A fofix/game/guitarscene/Stage.py
    A fofix/game/guitarscene/__init__.py
    A fofix/game/guitarscene/instruments/Drum.py
    A fofix/game/guitarscene/instruments/Guitar.py
    A fofix/game/guitarscene/instruments/Instrument.py
    A fofix/game/guitarscene/instruments/ProGuitar.py
    A fofix/game/guitarscene/instruments/Vocalist.py
    A fofix/game/guitarscene/instruments/__init__.py
    A fofix/lib/__init__.py
    A fofix/tests/AudioTest.py
    A fofix/tests/CerealizerTest.py
    A fofix/tests/DialogTest.py
    A fofix/tests/DrawingTest.py
    A fofix/tests/FontTest.py
    A fofix/tests/GameEngineTest.py
    A fofix/tests/MenuTest.py
    A fofix/tests/ResourceTest.py
    A fofix/tests/SceneTest.py
    A fofix/tests/SongTest.py
    A fofix/tests/SvgTest.py
    A fofix/tests/TestAll.py
    A fofix/tests/VFSTest.py
    A fofix/tests/VideoTest.py
    A fofix/tests/ViewTest.py
    A fofix/tests/__init__.py
    A makefile
    A scripts/ClearCompiledPycs.bat
    A scripts/RebuildWin.bat
    A scripts/RunFofFromSources.bat
    A scripts/TraceFoF.bat
    A scripts/cmdFromHere.bat
    A setup.py
    R src/FoFiX.py
    R src/Version.py
    R src/audio/Microphone.py
    R src/audio/MixStream/MixStream.c
    R src/audio/MixStream/MixStream.h
    R src/audio/MixStream/_MixStream.pyx
    R src/audio/MixStream/__init__.py
    R src/audio/MixStream/soundtouch-c.cpp
    R src/audio/MixStream/soundtouch-c.h
    R src/audio/MixStream/vorbis.c
    R src/audio/__init__.py
    R src/audio/pypitch/AnalyzerInput.cpp
    R src/audio/pypitch/AnalyzerInput.hpp
    R src/audio/pypitch/__init__.py
    R src/audio/pypitch/_pypitch.pyx
    R src/audio/pypitch/fft.hpp
    R src/audio/pypitch/pitch.cpp
    R src/audio/pypitch/pitch.hpp
    R src/audio/pypitch/util.hpp
    R src/configuration/Config.py
    R src/configuration/ConfigDefs.py
    R src/configuration/Mod.py
    R src/configuration/Theme.py
    R src/configuration/__init__.py
    R src/constants.py
    R src/core/Audio.py
    R src/core/Data.py
    R src/core/GameEngine.py
    R src/core/Input.py
    R src/core/Language.py
    R src/core/Resource.py
    R src/core/Settings.py
    R src/core/Task.py
    R src/core/Video.py
    R src/core/__init__.py
    R src/epydoc.cfg
    R src/game/Player.py
    R src/game/Scorekeeper.py
    R src/game/Song.py
    R src/game/World.py
    R src/game/__init__.py
    R src/graphics/Camera.py
    R src/graphics/Font.py
    R src/graphics/Image.py
    R src/graphics/Mesh.py
    R src/graphics/Shader.py
    R src/graphics/Texture.py
    R src/graphics/VideoPlayer/VideoPlayer.c
    R src/graphics/VideoPlayer/VideoPlayer.h
    R src/graphics/VideoPlayer/_VideoPlayer.pyx
    R src/graphics/VideoPlayer/__init__.py
    R src/graphics/VideoPlayer/glwrap.h
    R src/graphics/__init__.py
    R src/graphics/cmgl/__init__.py
    R src/graphics/cmgl/cmgl.pyx
    R src/graphics/cmgl/gl.pxi
    R src/graphics/cmgl/glwrap.h
    R src/lib/__init__.py
    R src/makefile
    R src/midi/DataTypeConverters.py
    R src/midi/EventDispatcher.py
    R src/midi/MidiFileParser.py
    R src/midi/MidiInFile.py
    R src/midi/MidiInStream.py
    R src/midi/MidiOutFile.py
    R src/midi/MidiOutStream.py
    R src/midi/MidiToText.py
    R src/midi/RawInstreamFile.py
    R src/midi/RawOutstreamFile.py
    R src/midi/__init__.py
    R src/midi/changes.txt
    R src/midi/constants.py
    R src/midi/readme.txt
    R src/midi/version.txt
    R src/scripts/ClearCompiledPycs.bat
    R src/scripts/RebuildWin.bat
    R src/scripts/RunFofFromSources.bat
    R src/scripts/TraceFoF.bat
    R src/scripts/cmdFromHere.bat
    R src/setup.py
    R src/tests/AudioTest.py
    R src/tests/CerealizerTest.py
    R src/tests/DialogTest.py
    R src/tests/DrawingTest.py
    R src/tests/FontTest.py
    R src/tests/GameEngineTest.py
    R src/tests/MenuTest.py
    R src/tests/ResourceTest.py
    R src/tests/SceneTest.py
    R src/tests/SongTest.py
    R src/tests/SvgTest.py
    R src/tests/TestAll.py
    R src/tests/VFSTest.py
    R src/tests/VideoTest.py
    R src/tests/ViewTest.py
    R src/tutorial.pot
    R src/util/Cerealizer.py
    R src/util/Collada.py
    R src/util/LinedConfigParser.py
    R src/util/Log.py
    R src/util/Unicode.py
    R src/util/VFS.py
    R src/util/__init__.py
    R src/util/timer.py
    R src/views/Credits.py
    R src/views/Debug.py
    R src/views/Dialogs.py
    R src/views/GameResultsScene/GameResultsScene.py
    R src/views/GameResultsScene/__init__.py
    R src/views/GuitarScene/GuitarScene.py
    R src/views/GuitarScene/Neck.py
    R src/views/GuitarScene/Rockmeter.py
    R src/views/GuitarScene/Stage.py
    R src/views/GuitarScene/__init__.py
    R src/views/GuitarScene/instruments/Drum.py
    R src/views/GuitarScene/instruments/Guitar.py
    R src/views/GuitarScene/instruments/Instrument.py
    R src/views/GuitarScene/instruments/ProGuitar.py
    R src/views/GuitarScene/instruments/Vocalist.py
    R src/views/GuitarScene/instruments/__init__.py
    R src/views/MainMenu/Lobby.py
    R src/views/MainMenu/MainMenu.py
    R src/views/MainMenu/__init__.py
    R src/views/Menu.py
    R src/views/Scene.py
    R src/views/SceneFactory.py
    R src/views/SongChoosingScene/SongChoosingScene.py
    R src/views/SongChoosingScene/__init__.py
    R src/views/View.py
    R src/views/__init__.py
    R wiki/BasicInstructions.wiki
    R wiki/CareerTitlesIniInstructions.wiki
    R wiki/CommandLines.wiki
    R wiki/DevelopmentNotes.wiki
    R wiki/Donations.wiki
    R wiki/FAQ.wiki
    R wiki/FeatureFreeze.wiki
    R wiki/FoFixUsableAudioFiles.wiki
    R wiki/GameControllers.wiki
    R wiki/GameOptions.wiki
    R wiki/HowSongsAreHandled.wiki
    R wiki/KnownIssues.wiki
    R wiki/MakingShaders.wiki
    R wiki/MembersHowToCommit.wiki
    R wiki/MidiSectionsMappedOut.wiki
    R wiki/OldNews.wiki
    R wiki/ProjectStatistics.wiki
    R wiki/ReportingBugs.wiki
    R wiki/RequiredSourceModules.wiki
    R wiki/Roadmap.wiki
    R wiki/RunningUnderGNULinux.wiki
    R wiki/RunningUnderPython26.wiki
    R wiki/Shaders.wiki
    R wiki/SongFrettersTips.wiki
    R wiki/SongINIInstructions.wiki
    R wiki/TableOfContents.wiki
    R wiki/ThemeFileSettings.wiki
    R wiki/ThemeUsableImages.wiki
    R wiki/Translating.wiki

  Log Message:
  -----------
  Merge branch 'master' into crude-rmscu-update

Conflicts:
	fofix/game/Scorekeeper.py
	fofix/game/guitarscene/GuitarScene.py


Compare: https://github.com/fofix/fofix/compare/807ff7ef7a71...37b6c0669b61

More information about the fofix-commits mailing list