Travis Howell 7d9890ff2e Merged revisions 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-13 00:32:15 +00:00
..
he	Merged revisions 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	2009-08-13 00:32:15 +00:00
imuse	The error() and warning() functions add ! and newline automatically. (I didn't	2009-05-31 10:02:16 +00:00
imuse_digi	Added some more information to the "Compressed sound ... invalid" error. Maybe	2009-08-01 15:42:42 +00:00
insane	SCUMM: Commit of parentheses patch from salty-horse. (from -devel "Enabling -Wparentheses in the Makefile").	2009-03-30 12:10:10 +00:00
smush	Added more GCC_PRINTF attributes, and fixed resulting warnings in format strings	2009-07-03 10:40:49 +00:00
actor.cpp	Merged revisions 42578,42587-42593,42596-42599,42606,42608-42611,42614-42615,42619,42623-42626,42632-42642,42645,42654-42656,42658-42664,42668,42671-42677,42679,42681,42685,42690,42693,42695-42697,42699,42701,42704-42729,42736-42740,42742-42744,42746-42748,42751-42753,42755,42757,42759,42761,42765-42768,42771,42773,42776,42780,42782-42783,42785,42787,42790-42793,42795,42798-42799,42801,42807,42809,42812-42826,42842-42845,42847,42849,42851,42856-42859,42861,42863,42866,42868,42870,42880-42881,42886-42887,42889-42890,42892,42894-42895,42898,42900,42904,42907,42910-42912,42918,42920,42922-42924,42926,42929,42932,42934-42935,42937-42941,42943,42946-42947,42950-42953,42955,42958-42959,42964-42965,42973-42974,42995-42996,42999,43001,43003,43005,43007-43008,43010-43011,43013,43020,43023,43025,43027,43029,43033,43035,43037,43039,43041-43043,43048,43056 via svnmerge from	2009-08-05 02:26:51 +00:00
actor.h	Merged revisions 42578,42587-42593,42596-42599,42606,42608-42611,42614-42615,42619,42623-42626,42632-42642,42645,42654-42656,42658-42664,42668,42671-42677,42679,42681,42685,42690,42693,42695-42697,42699,42701,42704-42729,42736-42740,42742-42744,42746-42748,42751-42753,42755,42757,42759,42761,42765-42768,42771,42773,42776,42780,42782-42783,42785,42787,42790-42793,42795,42798-42799,42801,42807,42809,42812-42826,42842-42845,42847,42849,42851,42856-42859,42861,42863,42866,42868,42870,42880-42881,42886-42887,42889-42890,42892,42894-42895,42898,42900,42904,42907,42910-42912,42918,42920,42922-42924,42926,42929,42932,42934-42935,42937-42941,42943,42946-42947,42950-42953,42955,42958-42959,42964-42965,42973-42974,42995-42996,42999,43001,43003,43005,43007-43008,43010-43011,43013,43020,43023,43025,43027,43029,43033,43035,43037,43039,43041-43043,43048,43056 via svnmerge from	2009-08-05 02:26:51 +00:00
akos.cpp	Fix endian issue, the palette must be in little endian.	2009-06-05 00:33:25 +00:00
akos.h	Fix the color of Poodles Galore's finger nails in Spy Fox 3.	2009-06-04 11:03:45 +00:00
base-costume.cpp	Add 16bit color support for later HE games.	2009-06-04 01:05:47 +00:00
base-costume.h	Fix the color of Poodles Galore's finger nails in Spy Fox 3.	2009-06-04 11:03:45 +00:00
bomp.cpp	Fixed the spaces before tabs.	2008-01-28 00:14:17 +00:00
bomp.h	Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots	2007-05-30 21:56:52 +00:00
boxes.cpp	Correct error in revision 26678.	2009-07-23 07:49:28 +00:00
boxes.h	Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots	2007-05-30 21:56:52 +00:00
camera.cpp	SCUMM: Split intern.h into multiple headers	2009-03-20 16:33:58 +00:00
charset-fontdata.cpp	Committed my own patch #2278665 ("SCUMM: Font data in old SCUMM games") to get	2008-11-14 14:03:08 +00:00
charset.cpp	Add 16bit color support for later HE games.	2009-06-04 01:05:47 +00:00
charset.h	Committed my own patch #2278665 ("SCUMM: Font data in old SCUMM games") to get	2008-11-14 14:03:08 +00:00
costume.cpp	Merged revisions 42578,42587-42593,42596-42599,42606,42608-42611,42614-42615,42619,42623-42626,42632-42642,42645,42654-42656,42658-42664,42668,42671-42677,42679,42681,42685,42690,42693,42695-42697,42699,42701,42704-42729,42736-42740,42742-42744,42746-42748,42751-42753,42755,42757,42759,42761,42765-42768,42771,42773,42776,42780,42782-42783,42785,42787,42790-42793,42795,42798-42799,42801,42807,42809,42812-42826,42842-42845,42847,42849,42851,42856-42859,42861,42863,42866,42868,42870,42880-42881,42886-42887,42889-42890,42892,42894-42895,42898,42900,42904,42907,42910-42912,42918,42920,42922-42924,42926,42929,42932,42934-42935,42937-42941,42943,42946-42947,42950-42953,42955,42958-42959,42964-42965,42973-42974,42995-42996,42999,43001,43003,43005,43007-43008,43010-43011,43013,43020,43023,43025,43027,43029,43033,43035,43037,43039,43041-43043,43048,43056 via svnmerge from	2009-08-05 02:26:51 +00:00
costume.h	Merged revisions 42578,42587-42593,42596-42599,42606,42608-42611,42614-42615,42619,42623-42626,42632-42642,42645,42654-42656,42658-42664,42668,42671-42677,42679,42681,42685,42690,42693,42695-42697,42699,42701,42704-42729,42736-42740,42742-42744,42746-42748,42751-42753,42755,42757,42759,42761,42765-42768,42771,42773,42776,42780,42782-42783,42785,42787,42790-42793,42795,42798-42799,42801,42807,42809,42812-42826,42842-42845,42847,42849,42851,42856-42859,42861,42863,42866,42868,42870,42880-42881,42886-42887,42889-42890,42892,42894-42895,42898,42900,42904,42907,42910-42912,42918,42920,42922-42924,42926,42929,42932,42934-42935,42937-42941,42943,42946-42947,42950-42953,42955,42958-42959,42964-42965,42973-42974,42995-42996,42999,43001,43003,43005,43007-43008,43010-43011,43013,43020,43023,43025,43027,43029,43033,43035,43037,43039,43041-43043,43048,43056 via svnmerge from	2009-08-05 02:26:51 +00:00
cursor.cpp	Changed cursor manager functions to take *Graphics::PixelFormat with default parameter of NULL (and initialize NULL pointers with CLUT8), rather than taking a Graphics::PixelFormat with default parameter of Graphics::PixelFormat::createFormatCLUT8()	2009-06-26 08:50:11 +00:00
debugger.cpp	Strip trailing whitespaces in the whole code base.	2009-05-24 15:17:42 +00:00
debugger.h	Workaround for bug #1804278: "MONKEY: Mouse is invisible after loading"	2008-01-02 18:44:20 +00:00
detection_tables.h	Add support for Italian MM NES	2009-08-10 19:31:08 +00:00
detection.cpp	SCUMM: Properly detect & distinguish the three FM-TOWNS double-demos	2009-07-30 21:56:04 +00:00
detection.h	Add support for GUI options to SCUMM engine	2009-06-06 17:59:54 +00:00
dialogs.cpp	Simplify the code to check whether loading or saving a game is possible.	2009-07-23 05:48:20 +00:00
dialogs.h	Fix bug #1745396: "MI: Saved game from the credits sequence fails to load".	2009-07-22 19:25:53 +00:00
file_nes.cpp	Add support for Italian MM NES	2009-08-10 19:31:08 +00:00
file_nes.h	Add support for Italian MM NES	2009-08-10 19:31:08 +00:00
file.cpp	Make ScummFile::eos() consistent with Stream::eos().	2009-07-20 20:55:28 +00:00
file.h	Make ScummFile::eos() consistent with Stream::eos().	2009-07-20 20:55:28 +00:00
gfx.cpp	Merged revisions 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	2009-08-13 00:32:15 +00:00
gfx.h	Fix regression in scrolling rooms.	2009-06-18 06:10:13 +00:00
gfxARM.s	Updates to the scummvm blitting code as discussed on the mailing list.	2008-08-18 20:04:15 +00:00
help.cpp	Fixed the spaces before tabs.	2008-01-28 00:14:17 +00:00
help.h	Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots	2007-05-30 21:56:52 +00:00
input.cpp	Remove keyboard support for mouse buttons, since it interferes with load/save scripts in HE games and input scripts in others games (COMI, FT). It isn't much use anyway, since we dropped support for cursor movement via keyboard long ago.	2009-07-23 10:31:06 +00:00
midiparser_eup.cpp	Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.	2007-09-19 08:40:12 +00:00
midiparser_ro.cpp	Made the Loom Roland music fix a bit more specific. Only one song in EGA Loom	2008-01-03 19:43:43 +00:00
module.mk	Patch #1365914: "SCUMM: CMS support." Disabled by default. Still plenty to do.	2009-06-06 18:21:49 +00:00
music.h	Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots	2007-05-30 21:56:52 +00:00
nut_renderer.cpp	Changed all delete [] usages to delete[].	2008-05-07 14:31:45 +00:00
nut_renderer.h	Allow static and dynamic plugins to be used at the same time	2008-05-06 03:00:26 +00:00
object.cpp	Fixed GCC warnings.	2009-07-25 06:55:28 +00:00
object.h	Removed trailing spaces.	2008-01-27 19:47:41 +00:00
palette.cpp	Merged revisions 41219-41297,41299-41318,41322-41328,41331-41334,41336-41346,41348-41369,41372-41376,41379-41381,41384-41386,41389,41393,41395,41398,41400-41409,41419,41421,41423-41425,41428-41430,41432-41433,41452-41453,41458-41462,41465,41468,41470,41473-41474,41484-41490,41493,41496-41504,41506-41508,41516-41517,41519-41520,41528,41536-41538,41556-41557,41559-41560,41562-41576,41579,41584,41587-41592,41596,41598,41601-41603,41611,41618-41619,41630,41632-41635,41639,41641,41644-41647,41660,41663-41665,41668,41677,41679-41680,41683,41699-41705,41707-41709,41713-41715,41718-41727,41729-41736,41739-41763,41765-41766,41768-41774,41777-41778,41781-41799,41803,41806,41809-41813,41821-41823,41827,41833-41834,41836-41839,41841,41844-41848,41850-41853,41858-41860,41867-41871,41875-41887,41889-41893,41895-41897,41902-41903,41915-41917,41922,41929-41934,41938,41940-41964,41967-41968,41975,42007-42012,42020,42038-42041,42043-42044,42047-42050,42054-42056,42060,42062,42079,42081 via svnmerge from	2009-07-04 05:56:10 +00:00
player_mod.cpp	Add patch from Quietust - Correct music speed in Amiga V2/V3 games.	2008-10-11 02:25:55 +00:00
player_mod.h	Add patch #1891606 - Improved sound playback for Amiga SCUMM V2/V3 games.	2008-02-12 03:26:05 +00:00
player_nes.cpp	Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.	2007-09-19 08:40:12 +00:00
player_nes.h	Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots	2007-05-30 21:56:52 +00:00
player_v1.cpp	Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.	2007-09-19 08:40:12 +00:00
player_v1.h	Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots	2007-05-30 21:56:52 +00:00
player_v2.cpp	Fix 64 bit issue	2007-09-23 10:33:30 +00:00
player_v2.h	Replaced char usage by int8, since char is unsigned on Linux/PPC by default.	2009-07-14 19:32:25 +00:00
player_v2a.cpp	The error() and warning() functions add ! and newline automatically. (I didn't	2009-05-31 10:02:16 +00:00
player_v2a.h	Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots	2007-05-30 21:56:52 +00:00
player_v2cms.cpp	Flag what looks like a bug in the CMS player code -- somebody should verify and fix this properly	2009-07-01 20:51:47 +00:00
player_v3a.cpp	The error() and warning() functions add ! and newline automatically. (I didn't	2009-05-31 10:02:16 +00:00
player_v3a.h	Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots	2007-05-30 21:56:52 +00:00
proc3ARM.s	Set svn:keywords on asm files	2009-03-20 16:35:34 +00:00
resource_v2.cpp	Removed last traces of clearIOFailed. Yay :)	2009-07-29 21:39:00 +00:00
resource_v3.cpp	Removed last traces of clearIOFailed. Yay :)	2009-07-29 21:39:00 +00:00
resource_v4.cpp	Make ScummFile::eos() consistent with Stream::eos().	2009-07-20 20:55:28 +00:00
resource.cpp	Merged revisions 42578,42587-42593,42596-42599,42606,42608-42611,42614-42615,42619,42623-42626,42632-42642,42645,42654-42656,42658-42664,42668,42671-42677,42679,42681,42685,42690,42693,42695-42697,42699,42701,42704-42729,42736-42740,42742-42744,42746-42748,42751-42753,42755,42757,42759,42761,42765-42768,42771,42773,42776,42780,42782-42783,42785,42787,42790-42793,42795,42798-42799,42801,42807,42809,42812-42826,42842-42845,42847,42849,42851,42856-42859,42861,42863,42866,42868,42870,42880-42881,42886-42887,42889-42890,42892,42894-42895,42898,42900,42904,42907,42910-42912,42918,42920,42922-42924,42926,42929,42932,42934-42935,42937-42941,42943,42946-42947,42950-42953,42955,42958-42959,42964-42965,42973-42974,42995-42996,42999,43001,43003,43005,43007-43008,43010-43011,43013,43020,43023,43025,43027,43029,43033,43035,43037,43039,43041-43043,43048,43056 via svnmerge from	2009-08-05 02:26:51 +00:00
resource.h	Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots	2007-05-30 21:56:52 +00:00
room.cpp	SCUMM: Split intern.h into multiple headers	2009-03-20 16:33:58 +00:00
saveload.cpp	Merged revisions 42578,42587-42593,42596-42599,42606,42608-42611,42614-42615,42619,42623-42626,42632-42642,42645,42654-42656,42658-42664,42668,42671-42677,42679,42681,42685,42690,42693,42695-42697,42699,42701,42704-42729,42736-42740,42742-42744,42746-42748,42751-42753,42755,42757,42759,42761,42765-42768,42771,42773,42776,42780,42782-42783,42785,42787,42790-42793,42795,42798-42799,42801,42807,42809,42812-42826,42842-42845,42847,42849,42851,42856-42859,42861,42863,42866,42868,42870,42880-42881,42886-42887,42889-42890,42892,42894-42895,42898,42900,42904,42907,42910-42912,42918,42920,42922-42924,42926,42929,42932,42934-42935,42937-42941,42943,42946-42947,42950-42953,42955,42958-42959,42964-42965,42973-42974,42995-42996,42999,43001,43003,43005,43007-43008,43010-43011,43013,43020,43023,43025,43027,43029,43033,43035,43037,43039,43041-43043,43048,43056 via svnmerge from	2009-08-05 02:26:51 +00:00
saveload.h	SCUMM: Moved _inventoryOffset to ScummEngine_v2 and save it.	2009-07-28 23:19:33 +00:00
script_v0.cpp	Add patch #2821100 - MM C64 Objects / Verb fixes, with minor clean up applied.	2009-07-25 06:27:41 +00:00
script_v2.cpp	Fix bug #2687801 - ZAK: Cannot pickup Ladder on Mars Youth Hostel.	2009-05-26 01:25:44 +00:00
script_v3.cpp	SCUMM: Moved ScummEngine_v2::o2_setBoxFlags to ScummEngine_v3::o3_setBoxFlags	2009-04-19 01:00:31 +00:00
script_v4.cpp	Changed SaveFileManager methods to take Common::String params (instead of char pointers)	2009-05-29 14:38:22 +00:00
script_v5.cpp	add "-IQ" suffix test to SO_LOAD_STRING (same as SO_SAVE_STRING) ; fixes french version of atlantis	2009-07-18 21:26:44 +00:00
script_v6.cpp	Adjust workaround for bug #2826144, to use hard coded offset, that should be safe in all language versions.	2009-07-24 13:30:26 +00:00
script_v8.cpp	SCUMM: Got rid of o6_invalid	2009-04-16 09:27:02 +00:00
script.cpp	SCUMM: Fix verb/sentence handling in Indy3 mac (there, a double click must be used to trigger a verb/sentence)	2009-07-29 20:35:50 +00:00
script.h	SCUMM: Switched opcode tables to use Common::Functor0 (a bit like Kyra does it)	2009-04-16 09:26:37 +00:00
scumm_v0.h	Add patch #2821100 - MM C64 Objects / Verb fixes, with minor clean up applied.	2009-07-25 06:27:41 +00:00
scumm_v2.h	SCUMM: Moved _inventoryOffset to ScummEngine_v2 and save it.	2009-07-28 23:19:33 +00:00
scumm_v3.h	SCUMM: Moved o5_saveLoadGame and o5_saveLoadVars to ScummEngine_v4 (the highest SCUMM version to implement these opcodes. Actually, our code was bugged in so far as we only ever invoked o5_saveLoadGame in V3 games, never in V4 games (but this properly never mattered ;)	2009-04-19 01:01:54 +00:00
scumm_v4.h	SCUMM: Moved o5_saveLoadGame and o5_saveLoadVars to ScummEngine_v4 (the highest SCUMM version to implement these opcodes. Actually, our code was bugged in so far as we only ever invoked o5_saveLoadGame in V3 games, never in V4 games (but this properly never mattered ;)	2009-04-19 01:01:54 +00:00
scumm_v5.h	SCUMM: Introduced new method ScummEngine_v5::jumpRelative; unified some v0 and v2 opcodes	2009-04-20 12:35:17 +00:00
scumm_v6.h	Fix bug #2821215 - DIG: Skipping planetarium animation disables F5 menu.	2009-07-15 02:06:26 +00:00
scumm_v7.h	Fix bug #2821215 - DIG: Skipping planetarium animation disables F5 menu.	2009-07-15 02:06:26 +00:00
scumm_v8.h	SCUMM: Switched opcode tables to use Common::Functor0 (a bit like Kyra does it)	2009-04-16 09:26:37 +00:00
scumm-md5.h	Add support for Italian MM NES	2009-08-10 19:31:08 +00:00
scumm.cpp	Merged revisions 42578,42587-42593,42596-42599,42606,42608-42611,42614-42615,42619,42623-42626,42632-42642,42645,42654-42656,42658-42664,42668,42671-42677,42679,42681,42685,42690,42693,42695-42697,42699,42701,42704-42729,42736-42740,42742-42744,42746-42748,42751-42753,42755,42757,42759,42761,42765-42768,42771,42773,42776,42780,42782-42783,42785,42787,42790-42793,42795,42798-42799,42801,42807,42809,42812-42826,42842-42845,42847,42849,42851,42856-42859,42861,42863,42866,42868,42870,42880-42881,42886-42887,42889-42890,42892,42894-42895,42898,42900,42904,42907,42910-42912,42918,42920,42922-42924,42926,42929,42932,42934-42935,42937-42941,42943,42946-42947,42950-42953,42955,42958-42959,42964-42965,42973-42974,42995-42996,42999,43001,43003,43005,43007-43008,43010-43011,43013,43020,43023,43025,43027,43029,43033,43035,43037,43039,43041-43043,43048,43056 via svnmerge from	2009-08-05 02:26:51 +00:00
scumm.h	Merged revisions 42578,42587-42593,42596-42599,42606,42608-42611,42614-42615,42619,42623-42626,42632-42642,42645,42654-42656,42658-42664,42668,42671-42677,42679,42681,42685,42690,42693,42695-42697,42699,42701,42704-42729,42736-42740,42742-42744,42746-42748,42751-42753,42755,42757,42759,42761,42765-42768,42771,42773,42776,42780,42782-42783,42785,42787,42790-42793,42795,42798-42799,42801,42807,42809,42812-42826,42842-42845,42847,42849,42851,42856-42859,42861,42863,42866,42868,42870,42880-42881,42886-42887,42889-42890,42892,42894-42895,42898,42900,42904,42907,42910-42912,42918,42920,42922-42924,42926,42929,42932,42934-42935,42937-42941,42943,42946-42947,42950-42953,42955,42958-42959,42964-42965,42973-42974,42995-42996,42999,43001,43003,43005,43007-43008,43010-43011,43013,43020,43023,43025,43027,43029,43033,43035,43037,43039,43041-43043,43048,43056 via svnmerge from	2009-08-05 02:26:51 +00:00
sound.cpp	Provide a better detection method for Indy3 Mac sound effects. This fixes sounds such as the music that plays when Indy uses the whip on the hook in the giant cork. This also is a proper fix for bug #1852635 -- Sound 54 is actually not a sound effect.	2009-08-10 23:01:11 +00:00
sound.h	Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots	2007-05-30 21:56:52 +00:00
string.cpp	Fix cursor position, when entering a save game name in HE games.	2009-07-24 05:20:44 +00:00
usage_bits.cpp	Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.	2007-09-19 08:40:12 +00:00
usage_bits.h	Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots	2007-05-30 21:56:52 +00:00
util.cpp	Move tag2str() to common/	2008-01-21 12:44:39 +00:00
util.h	Move tag2str() to common/	2008-01-21 12:44:39 +00:00
vars.cpp	Add patch #2821100 - MM C64 Objects / Verb fixes, with minor clean up applied.	2009-07-25 06:27:41 +00:00
verbs.cpp	SCUMM: cleanup	2009-07-29 08:55:04 +00:00
verbs.h	Introduced ClickArea enum, some related cleanup in runInputScript and checkExecVerbs	2007-06-29 23:08:15 +00:00