aboutsummaryrefslogtreecommitdiff
path: root/base
AgeCommit message (Collapse)Author
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-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-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
2011-04-28JANITORIAL: Reduce header dependencies in shared codeOri Avtalion
Some backends may break as I only compiled SDL
2011-04-28JANITORIAL: Format forward declarations to follow conventionOri Avtalion
2011-04-25BASE: Remove unused variable in DO_OPTION_INT.Johannes Schickel
2011-04-24CREATE_PROJECT: Update revision number support (fixes bug #3280881)Littleboy
Replace existing environment variable based revision number support by a file-based method - Generate a special header file in the build output folder with the current revision number - Include the new header file from internal_version.h when a specific define is set - Update create_project to define SCUMMVM_INTERNAL_REVISION as needed and add the build output folder to the include path - Remove support for git-svn clones in the revision script (not useful anymore after the switch to git)
2011-04-18COMMON: Cleanup names/handling of some error codesMax Horn
2011-04-18COMMON: Remove kInvalidPathErrorMax Horn
2011-04-18COMMON: Rename Error to ErrorCode, introduce new Error classMax Horn
2011-04-13Merge remote branch 'upstream/master' into t7g-iosMatthew Hoops
Conflicts: video/qt_decoder.cpp
2011-04-13Merge remote branch 'remotes/dreammaster/tsage'Paul Gilbert
2011-04-11BASE: Add AAC to the version string when compiled inMatthew Hoops
2011-03-25ANDROID: Experimental MIDI Driverdhewg
Based on the SONiVOX® Embedded Audio Synthesis (EAS™) library, which is part of the base Android OS. CPU stats (Cortex A8 1GHz, monkey1 intro, peak values): MAME OPL: 30% DosBox OPL: 26% EAS: 19%
2011-03-01AUDIO: Set default values for the MT-32 and GM device settingsmd5
This fixes the case where an MT-32 music type is erroneously returned with the default GUI audio settings if an engine specifies MDT_PREFER_MT32. Many thanks to wjp and fuzzie for their help and work on this
2011-02-14TSAGE: Added the engine in a separate branchPaul Gilbert
2011-02-12GIT: use git for describing the version.dhewg
2011-02-12BUILD: Remove explicit references to SVN in revision variable names.Jordi Vilalta Prat
svn-id: r55898
2011-02-12JANITORIAL: Remove duplicate #include'sOri Avtalion
svn-id: r55889
2011-02-09AUDIO: Rename sound/ dir to audio/Max Horn
svn-id: r55850
2011-01-02PLUGINS: for uncached plugins, first check the loaded plugin before looking ↵Yotam Barnoy
elsewhere There are some calls to EngineManager::findGame() from within games, such as when loading saved games. It's critical not to unload the plugin from memory or other threads may crash. Therefore, we first scan using any plugin that's already in memory. svn-id: r55089
2010-12-30PLUGINS: rename ONE_PLUGIN_AT_A_TIME define to UNCACHED_PLUGINSYotam Barnoy
ONE_PLUGIN_AT_A_TIME is too long. svn-id: r55064
2010-12-29PLUGINS: fixed MSVC buildFlorian Kagerer
svn-id: r55062
2010-12-29PLUGINS: single plugin model now saves plugin filename to config fileYotam Barnoy
After searching for the right plugin once, the filename will be saved to the config file under the domain 'plugin_files'. The key is the gameid and the value is the plugin file. The backup mechanism is searching plugin by plugin. svn-id: r55061
2010-12-23PLUGINS: PluginManager minor cleanupsYotam Barnoy
svn-id: r55027
2010-12-23PLUGINS: switched plugin manager to inheritance rather than #definesYotam Barnoy
The reason for this was that I found issues where the wrong functions were called in EngineManager for single plugin operation. Rather than inserting more messy #defines, I preferred to change the PluginManager to use virtual functions, which also makes EngineManager simpler. svn-id: r55024
2010-12-23PLUGINS: don't fully load each plugins at startup for single plugin methodYotam Barnoy
The reason to load each plugin was to figure out if it's a sound or engine plugin. Since all our plugin files are currently engines, there's no reason to load every file. If we get dynamic sound plugins, it'd be a good idea to make a quick and easy way to know which kind of plugin it is (e.g. a prefix or suffix in the filename). svn-id: r55021
2010-12-04BASE: Only clear debug channels after destructing the engine object in runGame.Johannes Schickel
This should fix missing debugC output when the engine object uses debugC etc. in its destructor (or functions called from there). In theory all the engines should do that themselves, but to avoid any issues because of them not doing it we still do it here to be safe. svn-id: r54757
2010-11-30I18N: Don't build TranslationManager when translation is disabled.Jordi Vilalta Prat
svn-id: r54684
2010-11-28MAIN: Fix --gfx-mode regressionTorbjörn Andersson
We cannot check for supported graphics mode until after the backend has been initialised, or there won't be a graphics manager to ask. svn-id: r54534
2010-11-19BUILD: Revert r53427.Johannes Schickel
create_project will now use a different approach than recreating base/internal_version.h. This is also because recreating this file might result in accidental commits of the modified file and thus "screw up" the version string on different systems. svn-id: r54383
2010-11-18MAIN: initialized more singletons early to prevent fragmentation.Yotam Barnoy
svn-id: r54315
2010-11-18MAIN: added early call to getAudioCdManager to prevent late allocationYotam Barnoy
This reduces fragmentation. svn-id: r54310
2010-11-16GUI: Rename gui/GuiManager.* to gui/gui-manager.*Max Horn
svn-id: r54265
2010-11-16COMMON: Simplify DECLARE_SINGLETON macroMax Horn
This makes it possible to write DECLARE_SINGLETON(foo); instead of DECLARE_SINGLETON(foo) without causing a warning about an extra semicolon. The extra semicolon helps some editors at parsing the C++ code. svn-id: r54258
2010-11-15CONFIGMAN: added defragmentation methods for one-plugin-at-a-timeYotam Barnoy
One-plugin-at-a-time can have fragmentation caused by the ConfigManager if a game changes any configuration value. By reallocating and copying over the ConfigManager, we avoid this problem. svn-id: r54243
2010-11-15PLUGINS: moved plugin-at-a-time unload to be after deleting the engine.Yotam Barnoy
Calling the Engine's destructor after unloading the plugin caused crashes. svn-id: r54242
2010-11-08BACKENDS: Partial merge of gsoc2010-opengl: Audio CD changes onlyMax Horn
This commit contains the AudioCDManager changes from the gsoc2010-opengl branch. The other changes in that branch are restricted to the backends directory only (plus configure). The Nintendo DS and Dreamcast ports still need to be ported over to the new Audio CD system, but that should be fairly easy to do. svn-id: r54147
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-03 11:48:24 +0000