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
86,814 Commits 45 Branches 139 Tags
578a6794de9ba7679966fee9aec02c6b2bdbce94
Commit Graph
86814 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Max Horn 86240bb0dc ENGINES: Get rid of some s(n)printf calls 2011-06-02 18:31:58 +02:00
Strangerke d21ddbce79 TSAGE: Add comments on actions and hotspots of scene 4000. The buggy sequence is clearly identified, for potential future fix. 2011-06-02 17:05:48 +02:00
athrxx c1f00b1e8b FM-TOWNS AUDIO: fix regression 2011-06-02 16:56:01 +02:00
athrxx 4b77a5a12e FM-TOWNS AUDIO: cleanup 
(move some stuff from TownsAudioInterfaceInternal to TownsAudio_PcmChannel)
 2011-06-02 12:10:51 +02:00
athrxx d61dc2574b AUDIO: fix some typos in comments 2011-06-02 12:10:51 +02:00
Max Horn 080b590261 MADE: Remove all instances of s(n)printf 2011-06-02 10:49:09 +02:00
Max Horn 668ae0363e DRACI: Remove all instances of s(n)printf 2011-06-02 10:46:29 +02:00
Max Horn 59dfd6e859 TOON: Remove all instances of s(n)printf 2011-06-02 10:22:23 +02:00
D G Turner 263ef45499 M4: Replace snprintf() usage with Common::String::format() 
Safer and less portability issues.
 2011-06-02 04:52:34 +01:00
D G Turner d3b53d4c50 SWORD2: Replace snprintf() usage with Common::String::format() 
Safer and less portability issues.
 2011-06-02 04:38:47 +01:00
D G Turner 24ac81ead8 SWORD1: Replace snprintf() usage with Common::String::format() 
Safer and less portability issues.
 2011-06-02 04:21:48 +01:00
D G Turner c9156d369f TINSEL: Replace snprintf() usage with Common::String::format() 
Safer and less portability issues.
 2011-06-02 03:58:27 +01:00
D G Turner 0d379b3783 CINE: Replace snprintf() usage with Common::String::format() 
Safer and less portability issues.
 2011-06-02 03:44:31 +01:00
D G Turner 4b6c1a0c2b DRACI: Replace snprintf() usage with Common::String::format() 
Safer and less portability issues.
 2011-06-02 03:27:44 +01:00
D G Turner 9607aae5be TOUCHE: Replace snprintf() usage with Common::String::format() 
Safer and less portability issues.
 2011-06-02 03:17:34 +01:00
D G Turner 37886ba7bb CRUISE: Replace snprintf() usage with Common::String::format() 
Safer and less portability issues.
 2011-06-02 03:03:21 +01:00
D G Turner 889f5d119a DRASCULA: Replace snprintf() usage with Common::String::format() 
Safer and less portability issues.
 2011-06-02 02:53:48 +01:00
D G Turner 8356656575 GOB: Replace snprintf() usage with Common::String::format() 
Safer and less portability issues.
 2011-06-02 02:20:51 +01:00
Johannes Schickel 092142d880 BUILD: Enable Lands of Lore by default. 2011-06-02 03:03:50 +02:00
Arnaud Boutonne c720f463e4 TSAGE: Add workaround in order to fix crash in scene 5100 when Quinn forgets the Stasis Box 
Also present in the original!
 2011-06-02 00:53:19 +02:00
Max Horn 333be9c072 GUI: Replace some s(n)printf uses by Common::String::format 2011-06-02 00:07:18 +02:00
Max Horn 8f36c52e58 DEVTOOLS: Do not use -Wglobal-constructors on create_project.o 2011-06-01 23:57:21 +02:00
Max Horn 70d5da3bc4 DEVTOOLS: Link create_kyradat against libcommon.a, for scumm_stricmp 2011-06-01 23:57:21 +02:00
sylvaintv 3429a14c11 TOON: Fix crash #3308220 
Bug #3308220: "Crashes"
Added clipping to magnifier effect
 2011-06-01 23:49:19 +02:00
Julien 9717d5be6f CREATE_PROJECT: Add stubs for Xcode provider 2011-06-01 17:34:32 -04:00
Max Horn 9db33ea544 ALL: Removed last traces of the MPEG2 code 2011-06-01 23:17:43 +02:00
Julien 5eae0e1a5c CREATE_PROJECT: Fix type conversion warning 2011-06-01 16:36:47 -04:00
Julien 4c64cfc213 CREATE_PROJECT: Add Xcode project 2011-06-01 16:35:15 -04:00
Julien 6f5c18c661 GIT: Ignore XCode user data 2011-06-01 16:28:21 -04:00
Johannes Schickel d2a8e8023e COMMON: Implement two simple workaround wrappers for _vsnprintf and _snprintf for MSVC. 
This should assure vsnprintf and snprintf will now also always null
terminate the result even for MSVC.

Currently the functions are placed in scummsys.h, but that causes us
to include two standard C library headers there (for MSVC at least).
This is not particulary nice, so we should think of a better solution
here.
 2011-06-01 22:18:28 +02:00
Strangerke c0d70b6dbb TSAGE: Fix a valgrind warning in SceneObject initialization 2011-06-01 19:04:38 +02:00
Strangerke a2cad5a3d0 TSAGE: Little modification in order to match the executable in scene 6100 2011-06-01 19:01:48 +02:00
Max Horn 4bfd23783a DC: Clarify comment 2011-06-01 18:17:35 +02:00
Max Horn b0a460e849 DC: Use 'noserial' for release builds 2011-06-01 18:17:01 +02:00
Johannes Schickel 007a33515f COMMON: Add note about us defining vsnprintf as _vsnprintf for older MSVC versions. 2011-06-01 17:31:33 +02:00
Johannes Schickel 2f8e9b954e COMMON: Add comment about MSVC's _snprintf. 
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-01 17:28:59 +02:00
Max Horn 29ed72115e ANDROID: Revert stable-only changes from commit cf41ac0f which I accidentally merged 2011-06-01 16:45:18 +02:00
Max Horn 48dac6ab7f DETECTOR: Clarify warning a bit 2011-06-01 16:44:35 +02:00
Max Horn 136ffb5e0a DETECTOR: Get rid of unused kADFlagDontAugmentPreferredTarget 
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-01 16:44:35 +02:00
clone2727 49a8f7675f Merge pull request #20 from scott-t/t7g-ios 
T7G iOS support
 2011-06-01 07:04:05 -07:00
Scott Thomas dfb6822886 GROOVIE: Detect iOS platform based on binary existence 
Change to choice of music file encoding means the gu16.m4a may not exist
 2011-06-01 23:20:12 +09:30
Max Horn 90f2cde9fa PS2: Do not add RELEASE_BUILD 
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!
desc/1.4.0git1 		2011-06-01 15:48:44 +02: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
Paul Gilbert 12464b101f TSAGE: Added sound driver classes copied from CRUISE engine 2011-06-01 21:02:00 +10:00
Max Horn a4d105c902 COMMON: Move SDL endian check a bit down 2011-06-01 10:43:02 +02:00
Matthew Hoops 5bb4ef13c5 GROOVIE: Rename MusicPlayerMPEG4 to MusicPlayerIOS 
More fitting now that other music formats can be used now
 2011-05-31 14:25:20 -04: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
Matthew Hoops d3ea9ab2a9 GROOVIE: Use openStreamFile() to open iOS audio files 
Now MP3, FLAC, Vorbis, and QuickTime/MPEG-4 audio files can be used interchangeably.
 2011-05-31 14:06:46 -04:00
Matthew Hoops bf8cfcb6b7 AUDIO: Plug MPEG-4/QuickTime audio into openStreamFile 2011-05-31 13:58:05 -04:00
Max Horn c86a6c466f COMMON: Include SDL_endian.h instead of SDL_byteorder.h 2011-05-31 18:08:25 +02:00