aboutsummaryrefslogtreecommitdiff
path: root/base
AgeCommit message (Collapse)Author
2011-10-07Merge remote branch 'upstream/master' into pegasusMatthew Hoops
Conflicts: video/qt_decoder.cpp
2011-10-06BASE: Slight cleanup.Johannes Schickel
2011-10-06BASE: Add another whitespace before "Starting $gamedescription".Johannes Schickel
This was removed by accident in 59739a7a0e3e4826ba7b27d5270a8d7a26b787ef.
2011-08-26Merge remote branch 'upstream/master' into pegasusMatthew Hoops
2011-08-22Merge remote-tracking branch 'origin/master' into soltys_wip2Alyssa Milburn
2011-08-22BASE: Fix indentationSven Hesse
2011-08-21BADA: Remove BADA defined check. Was a temp fix for simulator buildChris Warren-Smith
2011-08-21BADA: For some unknown reason the format string "%s\n" causes a core-dumpChris Warren-Smith
2011-08-21BADA: Initial BADA port implementationChris Warren-Smith
2011-08-19BASE: Remove leftover include for testing.Johannes Schickel
2011-08-19COMMON: intLog2 uses _BitScanReverse on MSVCBertrand Augereau
2011-08-14MAIN: Avoid adding the same extra path twiceeriktorbjorn
This doesn't make any practical difference, since the search manager already guards against duplicate paths, but it does get rid of a slightly confusing warning message when you have a global extra path configured.
2011-08-08RECORDER: Restore event recorder functionality.Eugene Sandulenko
It was badly broken after refactoring into EventObserver. Fitst, deinit() method was never called which lead to bad record files. Then, the concept of counting pollEvent() calls was ignored. Introduced dispatchPoll() method of EventObserver which is implemented in EventRecorder. It counts calls so is able to inject events at more proper time. Additionally now event times are recorded.
2011-08-07JANITORIAL: Remove trailing empty lines.Christoph Mallon
2011-07-20Merge remote branch 'upstream/master' into pegasusMatthew Hoops
2011-07-14COMPOSER: Add a first attempt at an engine.Alyssa Milburn
2011-07-07Merge remote-tracking branch 'origin/master' into soltys_wip2Alyssa Milburn
2011-07-04AUDIO: add registerDefault for music_driverathrxx
2011-07-02ENGINES: Clean up SaveStateDescriptor.Johannes Schickel
Now SaveStateDescriptor no longer subclasses HashMap. Instead all possible saved meta data is included directly into SaveStateDescriptor. This is slightly less flexible, but we never needed that flexibility so far. On the other hand it should reduce the memory usage. At least on my system (Linux/amd64) the old SaveStateDescriptor had a size of 928 and the new SaveStateDescriptor has a size of 200.
2011-06-30ALL: Require DECLARE_SINGLETON to be used in the Common namepsaceOri Avtalion
Silences the clang warning: static data member specialization of '_singleton' must originally be declared in namespace 'Common'; accepted as a C++0x extension [-Wc++0x-extensions] Wrapping "namespace Common {}" around the macro assignment causes clang to complain about a spurious semicolon, and removing the semicolon at the end of the macro causes some editors to misbehave. Changing the requirement of using the macro in one namespace (the global) to another (Common) seems a small price to pay to silence a warning.
2011-06-30WIN32: Add option to disable the console window, keeping the current default ↵Travis Howell
of enabling the console window.
2011-06-29Merge branch 'master' of github.com:scummvm/scummvm into soltys_wip2Strangerke
2011-06-24BASE: Mess with strtol error handling some more.Alyssa Milburn
WinCE's strtol can't actually do proper error handling because it is lacking errno, so just check the bounds instead. If you really have some need to pass LONG_MIN/LONG_MAX as command-line parameters then it could always be #ifdeffed, but I'm assuming no-one cares.
2011-06-23BASE: Correct usage of strtol().Christoph Mallon
- endptr needs not be initialised before calling strtol(), it is always set by strtol(). - endptr is never a null pointer after calling strtol(). - There is no need to rely on strtol() setting EINVAL (which is not guaranteed). Testing whether strtol() parsed till the end of the string is sufficient (it is guaranteed that the string is not empty at this point). - It is sufficient to just test for ERANGE without inspecting the return value, because a successful call to strtol() does not change errno. Signed-off-by: Alyssa Milburn <fuzzie@fuzzie.org>
2011-06-23ANALYSIS: Add static casts to is* functionsLittleboy
This fixes a potential problem with passing char values that would be sign-extended and yield unexpected results. See http://msdn.microsoft.com/en-us/library/ms245348.aspx
2011-06-23BASE: Fix build, and error handling in DO_OPTION_INT.Alyssa Milburn
This fixes the logic of 979fc29b (I hope) and includes some missing headers.
2011-06-23BASE: Check return value from strtol in DO_OPTION_INT macroJulien
2011-06-20ALL: Remove trailing whitespacesMax Horn
This tries to make our code a bit more compliant with our code formatting conventions. For future use, this is the command I used: git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//'
2011-06-16ENGINES: Warn user about games marked with ADGF_UNSTABLE flagsTarek Soliman
ADGF_UNSTABLE is always warned about. ADGF_TESTING is only warned about when running configure with --enable-relase. Both warnings are subject to the enable_wip_game_warning config option.
2011-06-16BASE: add TAINTED feature to gScummVMFeaturesTarek Soliman
When configure enables a WIP/unstable engine, the about box and scummvm --version will now display TAINTED in the "features compiled in" list
2011-06-15DREAMWEB: added autogenerated sourceVladimir
2011-09-10CGE: Add minimal engine and detectionStrangerke
2011-06-03Merge remote branch 'upstream/master' into pegasusMatthew Hoops
2011-06-01Merge pull request #20 from scott-t/t7g-iosclone2727
T7G iOS support
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-05-31Merge remote branch 'upstream/master' into t7g-iosMatthew Hoops
Conflicts: engines/groovie/script.cpp
2011-05-31BUILD: Fix compilation when --enable-plugins is enabled.D G Turner
2011-05-23COMMON: Modify Base::processSettings, get rid of Common::kArgumentNotProcessedMax Horn
Instead of defining a hacked up Common::Error code, split the return value of processSettings into two parts: An error code, and a value which indicates whether the specified command was completely handled by processSettings or not.
2011-05-23BACKENDS: Move SCUMMVM_SAVEPATH env var handling to POSIX savefile managerMax Horn
2011-05-21DS: Port of changes from branch-1-2-0 that I should really have moved into ↵agent-q
the trunk. "DS: Prevent the command line help string from being included in the binary." 5f3a90a5f6911188b8d1ded08dbdf6d233e9eb7b "GUI: Allow disabling of Mass Add dialog. Saves a few Kb of binary size on the DS, and is not particularly useful on that platform." 240ff87cf4472538d25a1c5628c8d15f1791ab1c "GUI: Don't search for theme zip files on startup when running on the DS. Themes aren't supported anyway, and the search severely delays startup." fe3b18ce0df03117081e83d99f4a2cbd864d3286
2011-05-18Merge remote branch 'upstream/master' into pegasusMatthew Hoops
2011-05-17FM-TOWNS AUDIO: Some more midi driver code for FM-TOWNS monkey2 and indy4athrxx
2011-05-12GIT: Clean up: Suppress SVN tags, now uselessstrangerke
2011-05-11Merge remote branch 'upstream/master' into t7g-iosMatthew 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-05BASE: Suppress pointless warning message (fixes bug #3291522)Max Horn
2011-05-05BASE: Suppress pointless warning message (fixes bug #3291522)Max Horn
2011-05-03Merge remote branch 'upstream/master' into pegasusMatthew Hoops
2011-05-02ALL: Mark printf and various other symbols as forbiddenMax 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-01RELEASE: Tag branch-1-3-0 and set versionEugene Sandulenko
2011-05-01RELEASE: This is 1.4.0gitEugene Sandulenko