ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
137,148 Commits 45 Branches 139 Tags
de151ea3fddd6a2d36a41400a55366bd2a6a94de
Commit Graph
1357 Commits
Author SHA1 Message Date
clone2727 49a8f7675f Merge pull request #20 from scott-t/t7g-ios 
T7G iOS support
 2011-06-01 07:04:05 -07:00
Max Horn a4610df482 Merge branch 'branch-1-3-0' into master 
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-01 15:15:31 +02:00
Matthew Hoops aa49b38c5a Merge remote branch 'upstream/master' into t7g-ios 
Conflicts:
	engines/groovie/script.cpp
 2011-05-31 14:16:29 -04:00
D G Turner 5a2e6e4f3f BUILD: Fix compilation when --enable-plugins is enabled. 2011-05-31 04:44:12 +01:00
Max Horn 20cad6e8b6 COMMON: Modify Base::processSettings, get rid of Common::kArgumentNotProcessed 
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-23 19:39:25 +02:00
Max Horn 590c6ede63 BACKENDS: Move SCUMMVM_SAVEPATH env var handling to POSIX savefile manager 2011-05-23 19:12:26 +02:00
agent-q 92a71f7452 DS: Port of changes from branch-1-2-0 that I should really have moved into the trunk. 
"DS: Prevent the command line help string from being included in the binary."
5f3a90a5f6

"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."
240ff87cf4

"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."
fe3b18ce0d
 2011-05-21 15:45:51 +01:00
Pawel Kolodziejski 356c9c8c07 sync with scummvm 2011-05-18 23:33:39 +02:00
athrxx 5c34e33c2c FM-TOWNS AUDIO: Some more midi driver code for FM-TOWNS monkey2 and indy4 2011-05-17 20:24:24 +02:00
strangerke 69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Matthew Hoops a1d41da096 Merge remote branch 'upstream/master' into t7g-ios 
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-11 00:30:28 -04:00
Pawel Kolodziejski 0f5de71f70 sync with scummvm 2011-05-08 15:38:26 +02:00
Max Horn b2748520bb BASE: Suppress pointless warning message (fixes bug #3291522) 2011-05-05 17:44:49 +02:00
Max Horn f9868c807d BASE: Suppress pointless warning message (fixes bug #3291522) 2011-05-05 17:43:33 +02:00
Max Horn 59e77ed667 ALL: Mark printf and various other symbols as forbidden 
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 16:31:31 +02:00
Pawel Kolodziejski 6be453780f synced with scummvm 2011-05-01 17:49:40 +02:00
Eugene Sandulenko 40df14a755 RELEASE: Tag branch-1-3-0 and set version 2011-05-01 14:43:36 +03:00
Eugene Sandulenko 204a9c2e51 RELEASE: This is 1.4.0git 2011-05-01 14:44:20 +03:00
Ori Avtalion 9414d7a6e2 JANITORIAL: Reduce header dependencies in shared code 
Some backends may break as I only compiled SDL
 2011-04-28 15:08:58 +03:00
Ori Avtalion cd6ee0589d JANITORIAL: Format forward declarations to follow convention 2011-04-28 12:20:34 +03:00
Pawel Kolodziejski ef33f3d675 bump version to 0.0.7 2011-04-25 20:59:14 +02:00
Pawel Kolodziejski 7dc9a82b0f opengl renderer by default 2011-04-25 17:38:33 +02:00
Johannes Schickel aee0fa34bf BASE: Remove unused variable in DO_OPTION_INT. 2011-04-25 15:26:23 +02:00
Littleboy e086321dfa CREATE_PROJECT: Merge with latest version of create_project from the ScummVM repository 
- Add revision template to base/ folder
 - Add residual configuration file
 2011-04-25 05:44:50 +08:00
Littleboy c4cb940a0a CREATE_PROJECT: Add a set of batch files to create Visual Studio and Code::Blocks project files 
- Add build output folders and generated binaries to the ignore file
 - Remove old project files
 2011-04-25 05:44:25 +08:00
Littleboy 11b907ebf4 CREATE_PROJECT: Update revision number support (fixes bug #3280881) 
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-24 16:59:46 -04:00
Max Horn 3a574199b0 COMMON: Cleanup names/handling of some error codes 2011-04-18 18:22:04 +02:00
Max Horn cd2fcaf4ca COMMON: Remove kInvalidPathError 2011-04-18 18:22:03 +02:00
Max Horn 73f04118f3 COMMON: Rename Error to ErrorCode, introduce new Error class 2011-04-18 18:22:02 +02:00
Pawel Kolodziejski 252d484434 common/sys.h -> common/scummsys.h to minimalize diffs with scummvm 2011-04-17 01:00:10 +02:00
Pawel Kolodziejski 99ee683308 cleanup headers 2011-04-16 14:08:33 +02:00
Pawel Kolodziejski 0640dcf2c7 synced with scummvm to 2011-Apr-13 2011-04-14 12:41:26 +02:00
Matthew Hoops 6d153f311c Merge remote branch 'upstream/master' into t7g-ios 
Conflicts:
	video/qt_decoder.cpp
 2011-04-13 16:04:29 -04:00
Paul Gilbert e6090415b6 Merge remote branch 'remotes/dreammaster/tsage' 2011-04-13 21:08:05 +10:00
Pawel Kolodziejski fb0b422489 revert to svn, imported in one of previous pull request 2011-04-12 15:16:24 +02:00
Matthew Hoops 78f17f290a BASE: Add AAC to the version string when compiled in 2011-04-11 21:37:44 -04:00
usineur 9ca8032154 french version detection 2011-04-11 23:50:47 +08:00
Pawel Kolodziejski 241c7a8c6e synced with scummvm svn rev 53000 2011-04-11 15:40:01 +02:00
Pawel Kolodziejski 697ed42447 synced with scummvm svn rev 51000 2011-04-11 11:41:07 +02:00
Pawel Kolodziejski be1b3ab884 synced with scummvm svn rev 50000 2011-04-11 02:28:51 +02:00
Pawel Kolodziejski e3a475ff7b synced with scummvm rev svn 49000 2011-04-10 21:59:04 +02:00
Pawel Kolodziejski bccbcae43c synced rest files, missed with last sync rev 47951 2011-04-10 15:45:37 +02:00
dhewg 0e6cdfd675 ANDROID: Experimental MIDI Driver 
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-25 14:43:52 +01:00
md5 e99dcac2f6 AUDIO: Set default values for the MT-32 and GM device settings 
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-03-01 12:22:19 +02:00
Paul Gilbert 7042d95cfe TSAGE: Added the engine in a separate branch 2011-02-14 20:37:27 +11:00
dhewg d794bfc4fa GIT: use git for describing the version. 2011-02-12 19:03:36 +01:00
Jordi Vilalta Prat a422763833 BUILD: Remove explicit references to SVN in revision variable names. 
svn-id: r55898
 2011-02-12 16:43:57 +00:00
Ori Avtalion 84a8bdc86b JANITORIAL: Remove duplicate #include's 
svn-id: r55889
 2011-02-12 10:00:52 +00:00
Max Horn 42ab839dd6 AUDIO: Rename sound/ dir to audio/ 
svn-id: r55850
 2011-02-09 01:09:01 +00:00
Yotam Barnoy c4095aabc5 PLUGINS: for uncached plugins, first check the loaded plugin before looking 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
 2011-01-02 10:08:02 +00:00