aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-06-01COMMON: Add comment about MSVC's _snprintf.Johannes Schickel
This includes a FIXME, since _snprintf behaves differently to snprintf. Not only in the return value (which is a minor difference, since we usually do not use it), but also since it does not always include a terminating null.
2011-06-01ANDROID: Revert stable-only changes from commit cf41ac0f which I ↵Max Horn
accidentally merged
2011-06-01DETECTOR: Clarify warning a bitMax Horn
2011-06-01DETECTOR: Get rid of unused kADFlagDontAugmentPreferredTargetMax Horn
It doesn't seem very useful to keep this around for future uses, either, at least I couldn't think of a convincing argument. If we really need something like this one day again, it is trivial enough to add it back.
2011-06-01Merge pull request #20 from scott-t/t7g-iosclone2727
T7G iOS support
2011-06-01GROOVIE: Detect iOS platform based on binary existenceScott Thomas
Change to choice of music file encoding means the gu16.m4a may not exist
2011-06-01PS2: Do not add RELEASE_BUILDMax Horn
First merge screw up: I meant to comment these lines out (as they area now -- in fact, these lines did not exist pre-merge at all, I moved the -DRELEASE_BUILD additions manually to their own lines, so I could comment them out, and then promptly forgot. *sigh*) On the pro side, it was very easy to spot and correct this mistake!
2011-06-01Merge branch 'branch-1-3-0' into masterMax 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-06-01COMMON: Move SDL endian check a bit downMax Horn
2011-05-31GROOVIE: Rename MusicPlayerMPEG4 to MusicPlayerIOSMatthew Hoops
More fitting now that other music formats can be used now
2011-05-31Merge remote branch 'upstream/master' into t7g-iosMatthew Hoops
Conflicts: engines/groovie/script.cpp
2011-05-31GROOVIE: Use openStreamFile() to open iOS audio filesMatthew Hoops
Now MP3, FLAC, Vorbis, and QuickTime/MPEG-4 audio files can be used interchangeably.
2011-05-31AUDIO: Plug MPEG-4/QuickTime audio into openStreamFileMatthew Hoops
2011-05-31COMMON: Include SDL_endian.h instead of SDL_byteorder.hMax Horn
2011-05-31SCI: Fix up start/end points when pathfinding with opt == 0.Walter van Niftrik
Fixes bug #3304901: "SCI: Freddy Pharkas - Stuck in the brothel door".
2011-05-31CONFIGURE: move some libs required by n64 portFabio Battaglia
Some system libs weren't found during link stage, this should fix it
2011-05-31COMMON: Simplify OverlayColor definitionMax Horn
This typedef still should be moved somewhere else. Maybe a header file of its own?
2011-05-31COMMON: Move scumm_str(n)icmp declaration to str.hMax Horn
2011-05-31COMMON: Move some weird WinCE/MSVC snprintf-#define aroundMax Horn
2011-05-31COMMON: Shorten endianess / mem align guessing logic in scummsys.hMax Horn
2011-05-31COMMON: Move more stuff from scummsys.h to portdefs.hMax Horn
2011-05-31COMMON: Move some code from scummsys.h to relevant portdefs.h filesMax Horn
2011-05-31AUDIO: Fix GCC Compilation Warning in FM-Towns Softsynth.D G Turner
2011-05-31BUILD: Fix typo which broke WebOS buildsMax Horn
2011-05-31BUILD: Fix compilation when --enable-plugins is enabled.D G Turner
2011-05-31BUILD: Fix Linking.D G Turner
These defines are adding to, not replacing the MODULES list.
2011-05-31BUILD: Compile more files only when necessaryMax Horn
2011-05-31BUILD: Add SDL_BACKEND=1 to config.mk for all SDL based backendsMax Horn
2011-05-30WINCE: Remove unnecessary -I flagsMax Horn
2011-05-30BUILD: Only add one option per line to INCLUDES/CXXFLAGS/LDFLAGSMax Horn
This improves (IMHO) readability, and makes it easier to diff for changes in compiler options.
2011-05-30TSAGE: Changed parameter to animate call from NULL to 0 for better type matchingPaul Gilbert
2011-05-30TSAGE: Bugfix for saving in scene #2150Paul Gilbert
2011-05-30TSAGE: General cleanup of object classPaul Gilbert
2011-05-30FM-TOWNS AUDIO: fix destructors (thread safety)athrxx
2011-05-30TSAGE: Fix a mess in Seeker's actions in scene 2100strangerke
2011-05-30TSAGE: Fix a glitch in scene 2320 (no idea if it was visible or not)strangerke
2011-05-30TSAGE: Fix a bug in scene 7000, after talking to Skeenarstrangerke
2011-05-29COMMON: Limit pragma warning use in algorithm.h to MSVC.Johannes Schickel
Since we only want to disable a MSVC specific warning with it and other compilers might have different warnings numbers it is safer to only target MSVC here.
2011-05-29SCI: Added a more generalized fix for bug #3306417md5
2011-05-29AGOS: Silenced a false positive warning in MSVCmd5
2011-05-29CREATE_PROJECT: Fixed typomd5
2011-05-29VS: Disabled libpng, libtheora and opengl in the VS solution filesmd5
2011-05-29SCI: Make 'quit' an alias for 'quit game' in the consoleWillem Jan Palenstijn
2011-05-29CREATE_PROJECT: Disable PNG, Theora and OpenGL by default.md5
PNG and Theora are used for the sword25 engine, which isn't stable yet. OpenGL isn't stable yet.
2011-05-29SCUMM: Fix bug #1013617athrxx
(ZAK FM-TOWNS: Wrong verb ('Teleport To') shown)
2011-05-29KYRA: pause midi sounds while gmm is runningathrxx
2011-05-29FM-TOWNS AUDIO: Unlock internal mutex before calling imuse timer proc.athrxx
2011-05-29SCUMM: implement some missing (very low relevance) imuse codeathrxx
1) Don't skip transpose setting in sysex command 0. There are only a few sounds where this setting is used (mainly sfx). 2) Make MI2 and INDY4 read certain player start parameters from the sound resource. The start parameters usually match our default parameters (exception: e.g. LeChuck's Fortress). The use of these parameters has been dropped in DOTT (they use default parameters like we do).
2011-05-29KYRA: remove useless mutex from sound_townsathrxx
2011-05-28TSAGE: Fix a glitch in scene 5100, add some commentsstrangerke