aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-08-16Update branch specific save game changes, to prevent conflicts.Travis Howell
svn-id: r43421
2009-08-16Merged revisions ↵Travis Howell
43338-43340,43342,43344-43347,43349-43350,43352-43354,43357-43358,43362,43366,43369,43375,43377,43380,43383-43384,43386,43388,43390,43393,43400,43402,43404,43406-43409,43411,43413-43414 via svnmerge from https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk ........ r43338 | lordhoto | 2009-08-13 10:19:26 +1000 (Thu, 13 Aug 2009) | 1 line Little optimization in Screen::setPaletteIndex, now it only resets the palette, when the color index really changed. ........ r43339 | lordhoto | 2009-08-13 10:20:37 +1000 (Thu, 13 Aug 2009) | 1 line Fix key input in credits sequences. ........ r43340 | lordhoto | 2009-08-13 10:21:42 +1000 (Thu, 13 Aug 2009) | 1 line Fix serious bug in StaticResource::unloadId. ........ r43342 | lordhoto | 2009-08-13 10:26:41 +1000 (Thu, 13 Aug 2009) | 1 line Do not unload credits data after copying it to a temporary buffer in Kyrandia 1 Amiga, since the credits will be looped and need reload every time. ........ r43344 | strangerke | 2009-08-13 19:56:54 +1000 (Thu, 13 Aug 2009) | 1 line Initial save handler for Playtoons ........ r43345 | strangerke | 2009-08-13 19:59:44 +1000 (Thu, 13 Aug 2009) | 2 lines - Add a specific OPCODEFUNC checkData to avoid having a Playtoons workaround in working code - Replace OPCODEDRAW 0x20,0x23 and 0x25 ........ r43346 | strangerke | 2009-08-13 20:00:35 +1000 (Thu, 13 Aug 2009) | 1 line Suppress no longer needed Playtoons workaround ........ r43347 | strangerke | 2009-08-13 20:08:07 +1000 (Thu, 13 Aug 2009) | 1 line fix methods ........ r43349 | lordhoto | 2009-08-14 01:55:12 +1000 (Fri, 14 Aug 2009) | 1 line Implemented support for the "Lore of the Lands" special of Lands of Lore CD. ........ r43350 | lordhoto | 2009-08-14 02:41:07 +1000 (Fri, 14 Aug 2009) | 1 line Move version string in Modern theme beneath the Logo in high res mode, this saves some space and looks nicer. ........ r43352 | lordhoto | 2009-08-14 02:50:30 +1000 (Fri, 14 Aug 2009) | 1 line Little fix of new modern theme layout in the launcher for 3x. ........ r43353 | lordhoto | 2009-08-14 03:00:19 +1000 (Fri, 14 Aug 2009) | 1 line Cleanup. ........ r43354 | lordhoto | 2009-08-14 03:00:40 +1000 (Fri, 14 Aug 2009) | 1 line Cleanup. ........ r43357 | agent-q | 2009-08-14 07:46:41 +1000 (Fri, 14 Aug 2009) | 1 line Allow VOCs to stream from disk. Disabled by default, use symbol STREAM_AUDIO_FROM_DISK to enable. See patch #2834001. ........ r43358 | Kirben | 2009-08-14 10:44:36 +1000 (Fri, 14 Aug 2009) | 1 line The Nintendo DS hack for introduction in Simon the Sorcerer 1 is only required for Windows version (WAV format) now. ........ r43362 | anotherguest | 2009-08-14 16:42:57 +1000 (Fri, 14 Aug 2009) | 1 line Updated files from 1.0.0 branch ........ r43366 | drmccoy | 2009-08-15 01:22:43 +1000 (Sat, 15 Aug 2009) | 2 lines Setting gob3 save/load mode of the temporary sprite "intro.$$$" to ignore and remove the TempSpriteHandler. Gob3 doesn't use it at all and Lost in Time only saves (with an invalid index) and never loads ........ r43369 | joostp | 2009-08-15 02:13:00 +1000 (Sat, 15 Aug 2009) | 2 lines PSP: create an EBOOT.PBP when building via configure ........ r43375 | joostp | 2009-08-15 02:44:29 +1000 (Sat, 15 Aug 2009) | 2 lines Fix incorrect memset() call (reported by Peter Bortas). ........ r43377 | joostp | 2009-08-15 02:54:43 +1000 (Sat, 15 Aug 2009) | 2 lines add psp_clean build rule to clean up EBOOT.PBP and scummvm_stripped.elf ........ r43380 | joostp | 2009-08-15 03:18:03 +1000 (Sat, 15 Aug 2009) | 3 lines MIPSpro compilation fixes / workarounds (from a patch by Rainer Canavan) The hashmap.h change is ugly, but so far the only thing found to work. Suggestions for a better "fix" appreciated! ........ r43383 | lordhoto | 2009-08-15 03:49:30 +1000 (Sat, 15 Aug 2009) | 1 line Little fix for lopping credits in Kyrandia 1 Amiga. ........ r43384 | joostp | 2009-08-15 04:02:17 +1000 (Sat, 15 Aug 2009) | 2 lines PSP: also create param.sfo when building via configure ........ r43386 | joostp | 2009-08-15 04:34:01 +1000 (Sat, 15 Aug 2009) | 2 lines PSP: add svn revision + build date to SFO title. ........ r43388 | joostp | 2009-08-15 09:20:46 +1000 (Sat, 15 Aug 2009) | 2 lines remove double semi-colon -- hopefully this kicks the buildbot back into action =) ........ r43390 | waltervn | 2009-08-15 10:28:59 +1000 (Sat, 15 Aug 2009) | 2 lines SCI: Added enum for map and volume versions. Removed res_version setting from detection.cpp (should be detectable). Cleanup. ........ r43393 | dhewg | 2009-08-15 15:39:44 +1000 (Sat, 15 Aug 2009) | 1 line Fix compilation. ........ r43400 | Kirben | 2009-08-15 20:09:32 +1000 (Sat, 15 Aug 2009) | 1 line Fix regression, that caused multiple sounds in Simon the Sorcerer 2 to be cut off. ........ r43402 | Kirben | 2009-08-15 20:31:20 +1000 (Sat, 15 Aug 2009) | 1 line Restore code to clear screen, before playing videos with smaller resolution in the Amiga version of The Feeble Files. ........ r43404 | joostp | 2009-08-15 20:44:58 +1000 (Sat, 15 Aug 2009) | 2 lines Properly implement PSPFilesystemFactory::makeCurrentDirectoryFileNode() ........ r43406 | dreammaster | 2009-08-15 21:50:59 +1000 (Sat, 15 Aug 2009) | 1 line Added Dirty Rect handling functionality ........ r43407 | waltervn | 2009-08-15 22:09:47 +1000 (Sat, 15 Aug 2009) | 1 line SCI: Rename sci_version_t to SciVersion ........ r43408 | waltervn | 2009-08-15 22:17:23 +1000 (Sat, 15 Aug 2009) | 1 line SCI: Add missing versions to exe version parsing ........ r43409 | eriktorbjorn | 2009-08-16 00:13:48 +1000 (Sun, 16 Aug 2009) | 2 lines Removed unnecessary semi-colons. ........ r43411 | lordhoto | 2009-08-16 00:59:11 +1000 (Sun, 16 Aug 2009) | 1 line Added const qualifiers to static data. ........ r43413 | lordhoto | 2009-08-16 01:30:35 +1000 (Sun, 16 Aug 2009) | 1 line Yet another slight graphic fix for the Kyrandia 1 Amiga credits. ........ r43414 | buddha_ | 2009-08-16 05:04:21 +1000 (Sun, 16 Aug 2009) | 4 lines Fix for bug #2835581 (KQ3: Game Crash When Leaving Tavern as Fly): - Use AGI version 0x3149 instead of the previous 0x3086 - Makes ESC pause the game (Identical to original in this respect) ........ svn-id: r43418
2009-08-16Revert revision 43410, and add alternative fix.Travis Howell
svn-id: r43416
2009-08-15Fix for bug #2835581 (KQ3: Game Crash When Leaving Tavern as Fly):Kari Salminen
- Use AGI version 0x3149 instead of the previous 0x3086 - Makes ESC pause the game (Identical to original in this respect) svn-id: r43414
2009-08-15Yet another slight graphic fix for the Kyrandia 1 Amiga credits.Johannes Schickel
svn-id: r43413
2009-08-15Added const qualifiers to static data.Johannes Schickel
svn-id: r43411
2009-08-15Fix compile when compiling with --disable-heMatthew Hoops
svn-id: r43410
2009-08-15Removed unnecessary semi-colons.Torbjörn Andersson
svn-id: r43409
2009-08-15SCI: Add missing versions to exe version parsingWalter van Niftrik
svn-id: r43408
2009-08-15SCI: Rename sci_version_t to SciVersionWalter van Niftrik
svn-id: r43407
2009-08-15Added Dirty Rect handling functionalityPaul Gilbert
svn-id: r43406
2009-08-15Properly implement PSPFilesystemFactory::makeCurrentDirectoryFileNode()Joost Peters
svn-id: r43404
2009-08-15Restore code to clear screen, before playing videos with smaller resolution ↵Travis Howell
in the Amiga version of The Feeble Files. svn-id: r43402
2009-08-15Fix regression, that caused multiple sounds in Simon the Sorcerer 2 to be ↵Travis Howell
cut off. svn-id: r43400
2009-08-15Commented a memory leak whose fix requires a fundamental modification to the ↵Jody Northup
Action structure (replacing KeyState with ActionKey should do it) svn-id: r43399
2009-08-15Added support for mapping keys to ctrl, alt, shift, or combinations thereof ↵Jody Northup
(though ctrl+alt will never trigger for some reason) svn-id: r43398
2009-08-15Added hash function for ActionKey in preparation for replacing KeyStates in ↵Jody Northup
the main keymapper hashtable with ActionKeys, removed a duplicated comment line. svn-id: r43397
2009-08-15Added mandatory includes into hardware-key.h (so it can be included without ↵Jody Northup
compile error, without having to separately include several other header files), reworked ActionKey structure, changed HardwareKey::modMask from uint32 into byte. svn-id: r43396
2009-08-15Removed excessive modifier definitions, prevented excessive memory ↵Jody Northup
consumption if getHardwareKeyset is called multiple times. svn-id: r43395
2009-08-15Fix compilation.Andre Heider
svn-id: r43393
2009-08-15SCI: Added enum for map and volume versions. Removed res_version setting fromWalter van Niftrik
detection.cpp (should be detectable). Cleanup. svn-id: r43390
2009-08-14remove double semi-colon -- hopefully this kicks the buildbot back into ↵Joost Peters
action =) svn-id: r43388
2009-08-14PSP: add svn revision + build date to SFO title.Joost Peters
svn-id: r43386
2009-08-14PSP: also create param.sfo when building via configureJoost Peters
svn-id: r43384
2009-08-14Little fix for lopping credits in Kyrandia 1 Amiga.Johannes Schickel
svn-id: r43383
2009-08-14MIPSpro compilation fixes / workarounds (from a patch by Rainer Canavan)Joost Peters
The hashmap.h change is ugly, but so far the only thing found to work. Suggestions for a better "fix" appreciated! svn-id: r43380
2009-08-14add psp_clean build rule to clean up EBOOT.PBP and scummvm_stripped.elfJoost Peters
svn-id: r43377
2009-08-14Fix incorrect memset() call (reported by Peter Bortas).Joost Peters
svn-id: r43375
2009-08-14PSP: create an EBOOT.PBP when building via configureJoost Peters
svn-id: r43369
2009-08-14Setting gob3 save/load mode of the temporary sprite "intro.$$$" to ignore ↵Sven Hesse
and remove the TempSpriteHandler. Gob3 doesn't use it at all and Lost in Time only saves (with an invalid index) and never loads svn-id: r43366
2009-08-14Added proper saving/loading of mapped key modifiers. Fixed modifier ↵Jody Northup
recognition in a much less hackish manner, (but still using a minor hack as a stopgap until KeyState can be replaced as the primary lookup type for the keymapper). svn-id: r43363
2009-08-14Updated files from 1.0.0 branchLars Persson
svn-id: r43362
2009-08-14The Nintendo DS hack for introduction in Simon the Sorcerer 1 is only ↵Travis Howell
required for Windows version (WAV format) now. svn-id: r43358
2009-08-13Allow VOCs to stream from disk. Disabled by default, use symbol ↵Neil Millstone
STREAM_AUDIO_FROM_DISK to enable. See patch #2834001. svn-id: r43357
2009-08-13Cleanup.Johannes Schickel
svn-id: r43354
2009-08-13Cleanup.Johannes Schickel
svn-id: r43353
2009-08-13Little fix of new modern theme layout in the launcher for 3x.Johannes Schickel
svn-id: r43352
2009-08-13Move version string in Modern theme beneath the Logo in high res mode, this ↵Johannes Schickel
saves some space and looks nicer. svn-id: r43350
2009-08-13Implemented support for the "Lore of the Lands" special of Lands of Lore CD.Johannes Schickel
svn-id: r43349
2009-08-13fix methodsArnaud Boutonné
svn-id: r43347
2009-08-13Suppress no longer needed Playtoons workaroundArnaud Boutonné
svn-id: r43346
2009-08-13- Add a specific OPCODEFUNC checkData to avoid having a Playtoons workaround ↵Arnaud Boutonné
in working code - Replace OPCODEDRAW 0x20,0x23 and 0x25 svn-id: r43345
2009-08-13Initial save handler for Playtoons Arnaud Boutonné
svn-id: r43344
2009-08-13Merged revisions ↵Travis Howell
43245-43249,43251-43252,43257,43260,43262-43264,43266,43268-43270,43272-43280,43282-43285,43287,43289-43290,43292,43294,43299,43301,43303-43304,43307,43314,43318,43320-43326,43329,43332 via svnmerge from https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk ........ r43245 | lordhoto | 2009-08-11 11:24:15 +1000 (Tue, 11 Aug 2009) | 1 line Some fixes for the Kyrandia 1 Amiga outro. ........ r43246 | lordhoto | 2009-08-11 11:24:40 +1000 (Tue, 11 Aug 2009) | 1 line Finally fixed the string extraction for Kyrandia 1 Amiga. This should make the intro/outro strings work fine again. ........ r43247 | lordhoto | 2009-08-11 11:24:56 +1000 (Tue, 11 Aug 2009) | 1 line Some changes to get the Kyrandia 1 Amiga credits to show up at least. ........ r43248 | lordhoto | 2009-08-11 11:31:34 +1000 (Tue, 11 Aug 2009) | 1 line Fix in-game GUI text input field colors for Kyrandia 1 Amiga. ........ r43249 | lordhoto | 2009-08-11 11:47:29 +1000 (Tue, 11 Aug 2009) | 1 line Fix crash when using Will-O-Wisp in the grotto. ........ r43251 | lordhoto | 2009-08-11 12:12:09 +1000 (Tue, 11 Aug 2009) | 1 line Disable "Screen_LoK::fadeSpecialPalette" for Kyrandia 1 Amiga, like the original does. ........ r43252 | lordhoto | 2009-08-11 12:12:24 +1000 (Tue, 11 Aug 2009) | 1 line Implement palette differences for seq_playDrinkPotionAnim. ........ r43257 | anotherguest | 2009-08-11 17:52:59 +1000 (Tue, 11 Aug 2009) | 1 line Updated with m4.dat file ........ r43260 | anotherguest | 2009-08-11 18:01:41 +1000 (Tue, 11 Aug 2009) | 1 line Updated actions to support tinsel and made (from CE version) ........ r43262 | anotherguest | 2009-08-11 19:57:44 +1000 (Tue, 11 Aug 2009) | 1 line Enable virtual keyboard support, since qvga gfx is now supported. ........ r43263 | anotherguest | 2009-08-11 20:18:10 +1000 (Tue, 11 Aug 2009) | 1 line Include vkeybd default pack into installation file ........ r43264 | Hkz | 2009-08-11 20:28:15 +1000 (Tue, 11 Aug 2009) | 1 line Maniac Mansion NES: added workaround to fix dirty screen when loading a narrow room from a full width room ........ r43266 | Hkz | 2009-08-11 20:51:49 +1000 (Tue, 11 Aug 2009) | 1 line code formatting fixes ........ r43268 | waltervn | 2009-08-11 22:57:51 +1000 (Tue, 11 Aug 2009) | 2 lines SCI: Turn off logging in debugger. ........ r43269 | athrxx | 2009-08-12 00:34:33 +1000 (Wed, 12 Aug 2009) | 1 line LOL: some minor fixes ........ r43270 | Kirben | 2009-08-12 00:42:44 +1000 (Wed, 12 Aug 2009) | 1 line Add option to disable later games (Feeble Files, Puzzle Pack) in AGOS game engine, which require higher resolution. ........ r43272 | lordhoto | 2009-08-12 01:34:13 +1000 (Wed, 12 Aug 2009) | 1 line Fix Kallak's note displaying in Kyrandia 1 Amiga and Kyrandia 1 DOS CD. ........ r43273 | lordhoto | 2009-08-12 01:34:28 +1000 (Wed, 12 Aug 2009) | 1 line Implement differences in seq_winterScroll1 for Kyrandia 1 Amiga. ........ r43274 | lordhoto | 2009-08-12 01:34:55 +1000 (Wed, 12 Aug 2009) | 3 lines - Yet another minor difference in seq_winterScroll2 - Fix wrong offsets of flasks strings for Kyrandia 1 Amiga in kyra.dat - Increase kyra.dat version ........ r43275 | lordhoto | 2009-08-12 01:35:13 +1000 (Wed, 12 Aug 2009) | 1 line Fix bug in Amiga specific bits of o1_fadeSpecialPalette, this should make the cauldron water change color correctly. ........ r43276 | lordhoto | 2009-08-12 01:35:30 +1000 (Wed, 12 Aug 2009) | 1 line Fix AGOS compilation. ........ r43277 | lordhoto | 2009-08-12 02:18:01 +1000 (Wed, 12 Aug 2009) | 1 line Fix graphics glitch in Darm's abode in Kyrandia 1 Amiga. ........ r43278 | lordhoto | 2009-08-12 02:18:43 +1000 (Wed, 12 Aug 2009) | 1 line Fix thumbnails for savegames made via the in-game GUI of Kyrandia 1 Amiga. ........ r43279 | lordhoto | 2009-08-12 02:46:20 +1000 (Wed, 12 Aug 2009) | 1 line Cleanup. ........ r43280 | lordhoto | 2009-08-12 02:46:38 +1000 (Wed, 12 Aug 2009) | 1 line Enable dirty rect handling for the Amiga version again. ........ r43282 | buddha_ | 2009-08-12 03:44:06 +1000 (Wed, 12 Aug 2009) | 1 line Fix compilation on MSVC8/9 after r43270: Add ENABLE_AGOS2 and ENABLE_PN to global Visual Studio properties. ........ r43283 | lordhoto | 2009-08-12 04:16:21 +1000 (Wed, 12 Aug 2009) | 1 line Don't allow menu / inventory usage in o1_waitForConfirmationMouseClick, just like the original does. This prevents creating bad saves like in bug #2835715 "KYRA: GFX glitch in Amiga version at the bridge". ........ r43284 | lordhoto | 2009-08-12 04:17:07 +1000 (Wed, 12 Aug 2009) | 1 line Fix for bug #2835715 "KYRA: GFX glitch in Amiga version at the bridge", which was caused by featuring restoring of Brandon's position on save load, which the original did not support. ........ r43285 | lordhoto | 2009-08-12 04:17:53 +1000 (Wed, 12 Aug 2009) | 1 line Fix graphical glitches when loading saves where Brandon is in Will-O-Wisp form. ........ r43287 | dhewg | 2009-08-12 05:11:26 +1000 (Wed, 12 Aug 2009) | 1 line Fixed an endian bug in the ADPCM decoder (#2211901). ........ r43289 | waltervn | 2009-08-12 06:18:15 +1000 (Wed, 12 Aug 2009) | 2 lines SCI: Added a crude speed throttler. ........ r43290 | lordhoto | 2009-08-12 07:53:06 +1000 (Wed, 12 Aug 2009) | 1 line Mention support for Kyrandia 1 Amiga in 1.1.0. ........ r43292 | Kirben | 2009-08-12 09:40:07 +1000 (Wed, 12 Aug 2009) | 1 line vc22_setPaletteOld was renamed to vc22_setPalette, since function was virtualized. ........ r43294 | Kirben | 2009-08-12 10:53:35 +1000 (Wed, 12 Aug 2009) | 1 line Fix building with specific games disabled in MSVC. ........ r43299 | Kirben | 2009-08-12 11:21:25 +1000 (Wed, 12 Aug 2009) | 1 line Fix bug #2835822 - SSPP: Sounds from DIMP appearing randomly in other games. ........ r43301 | Kirben | 2009-08-12 11:35:42 +1000 (Wed, 12 Aug 2009) | 1 line Update status of Amiga version of The Legend of Kyrandia. ........ r43303 | Kirben | 2009-08-12 11:44:17 +1000 (Wed, 12 Aug 2009) | 1 line Update status of The Legend of Kyrandia. ........ r43304 | Kirben | 2009-08-12 12:24:03 +1000 (Wed, 12 Aug 2009) | 1 line Enable Personal Nightmare by default. ........ r43307 | sev | 2009-08-12 14:36:01 +1000 (Wed, 12 Aug 2009) | 2 lines Fix formatting ........ r43314 | dhewg | 2009-08-12 17:37:45 +1000 (Wed, 12 Aug 2009) | 1 line Removed duplicated functions. ........ r43318 | lordhoto | 2009-08-13 00:02:18 +1000 (Thu, 13 Aug 2009) | 1 line Change SJIS code guard to also check whether dynamic plugins are enabled. ........ r43320 | lordhoto | 2009-08-13 03:10:47 +1000 (Thu, 13 Aug 2009) | 1 line Implement difference for the Kyrandia 1 Amiga version in TextDisplayer::printCharacterText. ........ r43321 | lordhoto | 2009-08-13 03:11:04 +1000 (Thu, 13 Aug 2009) | 1 line Cleanup. ........ r43322 | lordhoto | 2009-08-13 03:13:46 +1000 (Thu, 13 Aug 2009) | 1 line Oops forgot a "{". ........ r43323 | lordhoto | 2009-08-13 04:05:41 +1000 (Thu, 13 Aug 2009) | 1 line Further cleaning up credits player code for Kyra1. ........ r43324 | lordhoto | 2009-08-13 04:06:32 +1000 (Thu, 13 Aug 2009) | 1 line Fix graphics glitch in credits of Kyrandia 1 German. ........ r43325 | lordhoto | 2009-08-13 04:07:27 +1000 (Thu, 13 Aug 2009) | 1 line Add a slight paranoia check to drawCharANSI. ........ r43326 | lordhoto | 2009-08-13 04:08:01 +1000 (Thu, 13 Aug 2009) | 1 line Put some more IHNM / SAGA2 specific code into compile guards. ........ r43329 | lordhoto | 2009-08-13 08:05:09 +1000 (Thu, 13 Aug 2009) | 1 line Implement special Kyrandia 1 Amiga credits text scroller. ........ r43332 | lordhoto | 2009-08-13 09:16:35 +1000 (Thu, 13 Aug 2009) | 1 line Properly respect users sfx/music config settings for MIDI output. ........ svn-id: r43343
2009-08-13Do not unload credits data after copying it to a temporary buffer in ↵Johannes Schickel
Kyrandia 1 Amiga, since the credits will be looped and need reload every time. svn-id: r43342
2009-08-13Fix serious bug in StaticResource::unloadId.Johannes Schickel
svn-id: r43340
2009-08-13Fix key input in credits sequences.Johannes Schickel
svn-id: r43339
2009-08-13Little optimization in Screen::setPaletteIndex, now it only resets the ↵Johannes Schickel
palette, when the color index really changed. svn-id: r43338
2009-08-12Properly respect users sfx/music config settings for MIDI output.Johannes Schickel
svn-id: r43332
2009-08-12Implement special Kyrandia 1 Amiga credits text scroller.Johannes Schickel
svn-id: r43329