Age | Commit message (Collapse) | Author | |
---|---|---|---|
2011-06-01 | Merge pull request #20 from scott-t/t7g-ios | clone2727 | |
T7G iOS support | |||
2011-06-01 | Merge branch 'branch-1-3-0' into master | Max Horn | |
I manually resolved all conflicts, and inspected every single change. Many were due to the version string mismatch and thus easily resolved. The MSVC project files add in the 1-3-0 branch were not merged, neither where the changes to gui/themes/translations.dat. Conflicts: NEWS backends/base-backend.cpp backends/graphics/samsungtvsdl/samsungtvsdl-graphics.cpp backends/module.mk backends/platform/ds/arm9/makefile backends/platform/psp/README.PSP backends/platform/samsungtv/main.cpp backends/platform/samsungtv/samsungtv.cpp backends/saves/posix/posix-saves.cpp base/commandLine.cpp base/internal_version.h base/main.cpp common/array.h configure devtools/create_project/create_project.cpp dists/android/AndroidManifest.xml dists/android/plugin-manifest.xml dists/iphone/Info.plist dists/irix/scummvm.spec dists/macosx/Info.plist dists/redhat/scummvm-tools.spec dists/redhat/scummvm.spec dists/scummvm.rc dists/slackware/scummvm.SlackBuild dists/wii/meta.xml engines/sci/parser/vocabulary.cpp engines/tinsel/handle.cpp gui/themes/translations.dat | |||
2011-05-31 | Merge remote branch 'upstream/master' into t7g-ios | Matthew Hoops | |
Conflicts: engines/groovie/script.cpp | |||
2011-05-31 | AUDIO: Plug MPEG-4/QuickTime audio into openStreamFile | Matthew Hoops | |
2011-05-31 | AUDIO: Fix GCC Compilation Warning in FM-Towns Softsynth. | D G Turner | |
2011-05-30 | FM-TOWNS AUDIO: fix destructors (thread safety) | athrxx | |
2011-05-29 | FM-TOWNS AUDIO: Unlock internal mutex before calling imuse timer proc. | athrxx | |
2011-05-25 | ALL: initialise -> initialize | Matthew Hoops | |
2011-05-25 | ALL: recognise -> recognize | Matthew Hoops | |
2011-05-23 | AUDIO: Explicitly instantiate & name RandomSource used by MAME OPL | Max Horn | |
2011-05-21 | SWORD25: Fix compilation when libvorbis is not present | md5 | |
(cherry picked from commit 2d3ad096ab92a6ddcd2b14436937649bbabcd12f) | |||
2011-05-21 | DS: Fix some OPL data which was incorrectly freed from the main heap on the ↵ | agent-q | |
DS port | |||
2011-05-20 | FM-TOWNS AUDIO: fix gcc warnings | athrxx | |
2011-05-20 | FM-TOWNS AUDIO: fix thread lockups and cleanup | athrxx | |
- fixed lockup situation in imuse destructor (only concerning the fm-towns driver) - fixed lockup situation when AudioCDManager functions get called (in both cases both the main thread and the mixer thread would get locked in different mutex belonging to the other thread) | |||
2011-05-20 | AUDIO: Remove leftover "forward" declaration after real declaration in the ↵ | Johannes Schickel | |
TOWNS midi code. | |||
2011-05-17 | AUDIO: Remove SVN Id/URL keywords from a few newly added files. | Johannes Schickel | |
2011-05-17 | FM-TOWNS AUDIO: hopefully fix ps2 port compile | athrxx | |
2011-05-17 | AUDIO: Fix warning | Willem Jan Palenstijn | |
2011-05-17 | FM-TOWNS AUDIO: Fix GCC warnings | athrxx | |
2011-05-17 | FM-TOWNS AUDIO: Fix several CppCheck warnings | athrxx | |
2011-05-17 | FM-TOWNS AUDIO: Some fixes and renaming | athrxx | |
- renamed some stuff in the new midi driver code - fixed minor bug in midi driver code - fixed minor bug in euphony driver code - add some functionality to towns audio interface | |||
2011-05-17 | FM-TOWNS AUDIO: Fix some bugs and rename some stuff in the midi driver code | athrxx | |
2011-05-17 | FM-TOWNS AUDIO: Fix note off event in midi driver | athrxx | |
2011-05-17 | FM-TOWNS AUDIO: Fix some midi driver bugs | athrxx | |
2011-05-17 | FM-TOWNS AUDIO: Some midi code fixes and some renaming | athrxx | |
2011-05-17 | FM-TOWNS AUDIO: Improve thread safety | athrxx | |
2011-05-17 | FM-TOWNS AUDIO: Some more midi driver code | athrxx | |
2011-05-17 | FM-TOWNS AUDIO: Fix mod wheel setting | athrxx | |
2011-05-17 | FM-TOWNS AUDIO: Start fixing midi driver tempo | athrxx | |
2011-05-17 | FM-TOWNS AUDIO: More midi driver code | athrxx | |
2011-05-17 | FM-TOWNS AUDIO: Some renaming in the euphony driver code | athrxx | |
2011-05-17 | FM-TOWNS AUDIO: More midi driver code (effect processing) | athrxx | |
2011-05-17 | FM-TOWNS AUDIO: Implement some midi commands | athrxx | |
2011-05-17 | FM-TOWNS AUDIO: Some more midi driver code | athrxx | |
2011-05-17 | FM-TOWNS AUDIO: Implement some more midi driver code | athrxx | |
2011-05-17 | FM-TOWNS AUDIO: Implement some midi driver functions | athrxx | |
2011-05-17 | SCUMM: Adapt code to latest FM-TOWNS audio driver changes | athrxx | |
2011-05-17 | FM-TOWNS AUDIO: Change internal interface layout | athrxx | |
2011-05-17 | FM-TOWNS AUDIO: Some more midi driver code for FM-TOWNS monkey2 and indy4 | athrxx | |
2011-05-17 | COMMON: Forbid use of some more symbols | Max Horn | |
2011-05-17 | AUDIO: Fix typo | Max Horn | |
2011-05-16 | AUDIO: Clarify required parameters for mixCallback. | Alyssa Milburn | |
Also, add an assert() to make invalid lengths obvious. | |||
2011-05-13 | SWORD25: Fix compilation when libvorbis is not present | md5 | |
2011-05-13 | AUDIO: Fix QuickTime stereo audio seeking | Matthew Hoops | |
2011-05-12 | GIT: Clean up: Suppress SVN tags, now useless | strangerke | |
2011-05-11 | AUDIO: Fix usage of Timestamp::convertToFramerate | Matthew Hoops | |
2011-05-11 | Merge remote branch 'upstream/master' into t7g-ios | Matthew Hoops | |
Conflicts: audio/decoders/qdm2.h common/util.cpp engines/groovie/music.cpp engines/groovie/resource.h video/qt_decoder.cpp video/qt_decoder.h | |||
2011-05-10 | AUDIO: Change byte data tables to type AdLibInstrument | Max Horn | |
2011-05-02 | ALL: Mark printf and various other symbols as forbidden | Max Horn | |
Right now, a few places in the frontend code still use printf and consorts. We mark the affected files with a FIXME for now, and add a dedicated exception for each. To be fixed! Also tweak FORBIDDEN_SYMBOL_REPLACEMENT to hopefully really always enforce a compiler error | |||
2011-05-02 | AUDIO: Rename clock() -> updateClock() in SID emulator | Max Horn | |