aboutsummaryrefslogtreecommitdiff
path: root/engines
AgeCommit message (Collapse)Author
2015-10-10MADS: Phantom: Add a check on conversation restore in scene 1XX, rework some ↵Strangerke
checks
2015-10-10MADS: Phantom: Implement Scene101::enter(), add some empty (new) engine ↵Strangerke
functions
2015-09-22MADS: Phantom - Implement Scene1xx functionsStrangerke
2015-09-21MADS: Allow multiple animations for Phantom and later gamesStrangerke
2015-08-30Merge branch 'master' into phantomPaul Gilbert
Conflicts: engines/mads/phantom/game_phantom.cpp engines/mads/phantom/globals_phantom.h engines/mads/phantom/phantom_scenes.h engines/mads/phantom/phantom_scenes1.cpp engines/mads/phantom/phantom_scenes1.h engines/sherlock/events.cpp engines/sherlock/inventory.cpp engines/sherlock/journal.cpp engines/sherlock/map.cpp engines/sherlock/map.h engines/sherlock/module.mk engines/sherlock/music.cpp engines/sherlock/music.h engines/sherlock/objects.cpp engines/sherlock/objects.h engines/sherlock/people.cpp engines/sherlock/people.h engines/sherlock/resources.cpp engines/sherlock/resources.h engines/sherlock/scalpel/drivers/adlib.cpp engines/sherlock/scalpel/drivers/mididriver.h engines/sherlock/scalpel/scalpel.cpp engines/sherlock/scalpel/scalpel_scene.cpp engines/sherlock/scalpel/scalpel_scene.h engines/sherlock/scalpel/scalpel_user_interface.cpp engines/sherlock/scalpel/scalpel_user_interface.h engines/sherlock/scalpel/settings.cpp engines/sherlock/scalpel/tsage/logo.cpp engines/sherlock/scalpel/tsage/logo.h engines/sherlock/scene.cpp engines/sherlock/scene.h engines/sherlock/screen.cpp engines/sherlock/screen.h engines/sherlock/sherlock.cpp engines/sherlock/sherlock.h engines/sherlock/sound.cpp engines/sherlock/sound.h engines/sherlock/surface.cpp engines/sherlock/surface.h engines/sherlock/talk.cpp engines/sherlock/talk.h engines/sherlock/tattoo/tattoo.cpp engines/sherlock/tattoo/tattoo.h engines/sherlock/tattoo/tattoo_scene.cpp engines/sherlock/tattoo/tattoo_scene.h engines/sherlock/tattoo/tattoo_user_interface.cpp engines/sherlock/tattoo/tattoo_user_interface.h engines/sherlock/user_interface.cpp engines/sherlock/user_interface.h
2015-08-30SHERLOCK: SS: Make _frameRate unsigned to fix GCC warningsPaul Gilbert
2015-08-30SHERLOCK: SS: Fix speed of intro sequencePaul Gilbert
2015-08-30SHERLOCK: Syntax fixesPaul Gilbert
2015-08-30SHERLOCK: Add "listfiles" debugger commandTorbjörn Andersson
To make it easier to use the "dumpfile" command. There is little- to-no sanity checking in this one...
2015-08-29SHERLOCK: RT: Don't check for gameplay keys when entering copy protectionPaul Gilbert
2015-08-29SHERLOCK: RT: Fix crash visiting Lawton's house after he's fledPaul Gilbert
2015-08-30SHERLOCK: Finish implementation of song / songs debugger commandsTorbjörn Andersson
This adds support for Rose Tattoo and 3DO version of Serrated Scalpel.
2015-08-29SHERLOCK: RT: Fix resetting cursor after buying coffee from GreengrocerPaul Gilbert
2015-08-29SHERLOCK: RT: Reset each person _resetNPCPath when starting a scriptPaul Gilbert
2015-08-29SHERLOCK: RT: Replace constant with it's proper enum valuePaul Gilbert
2015-08-29SHERLOCK: Fix comment typosTorbjörn Andersson
2015-08-29SHERLOCK: Rework the "song" debugger commandTorbjörn Andersson
Instead of taking a room number (which didn't work in Rose Tattoo), it now takes a song name. To see which songs are available, use the "songs" command. Note that this is still only works for Serrated Scalpel, since I haven't implemented getting a list of available songs for Rose Tattoo. I need to study the resource manager a bit first...
2015-08-29SHERLOCK: RT: Fix playing music when displaying the mapPaul Gilbert
2015-08-29SHERLOCK: RT: Add extra delay after showing scene image in the mapPaul Gilbert
The original relied on the delay loading the resources for the scene to show the image for a few seconds, but since scene loading is so much faster now, introduce an extra delay to keep it briefly on-screen
2015-08-29SHERLOCK: RT: Fix redundant extra wait after talking to LLoyd JonesPaul Gilbert
2015-08-28SHERLOCK: RT: Workaround for monkey cap cutscene ending too quicklyPaul Gilbert
Somewhat unusually, the cutscene for the monkey stealing Hodgkins cap (wilb29a.tlk) is ended immediately after they both run off-screen, but the characters aren't properly marked as hidden until several seconds later when another script, 30cuend, is called. If a user saved the game really quickly before 30cuend is fired, it can leave the game in an in-consistent state. This commit fixes that by forcing the WAIT cursor to remain active until 30cuend has executed.
2015-08-28SHERLOCK: RT: Enforce wait cursor when pausing without control in scriptsPaul Gilbert
2015-08-27SHERLOCK: RT: Reset _npcIndex when loading savegamePaul Gilbert
2015-08-27SHERLOCK: RT: Fix previous commit, and make talkTo virtualPaul Gilbert
2015-08-27SHERLOCK: RT: Fix talkTo filename getting changed mid-scriptPaul Gilbert
Calls to cmdPauseWithoutControl can allow a second script to run, with it's own filename. This shouldn't change the filename for the outer call to talkTo
2015-08-27SHERLOCK: RT: Fix incorrect Watson movement at Aerodrome scenePaul Gilbert
2015-08-26SHERLOCK: RT: Workaround for Park Lake bug with Watson's dialogsPaul Gilbert
2015-08-25SHERLOCK: Set game speed to match the originalsPaul Gilbert
This applies to make both games match the originals. This is particularly important for Rose Tattoo, since there are several times Sherlock plays instruments, and the animations need to sync up with the music
2015-08-24SHERLOCK: Fix comment messagePaul Gilbert
2015-08-24SHERLOCK: RT: Fix aborting scripts prematurely after pausingPaul Gilbert
If a script was paused via a call to cmdPauseWithoutControl, and during this a second script is called and finishes, the first script was also being terminated prematurely
2015-08-23SHERLOCK: RT: Fix z-ordering when picking up Hat PinPaul Gilbert
2015-08-23SHERLOCK: RT: Fix Watson going off-screen in Cambridge scenePaul Gilbert
2015-08-23SHERLOCK: SS: Rename mirror-related methodsPaul Gilbert
2015-08-23SHERLOCK: RT: Workaround for incorrect tooltip for man on train ridePaul Gilbert
2015-08-23SHERLOCK: Replace various scene numbers with enum valuesPaul Gilbert
2015-08-23SHERLOCK: RT: Reduce game speed to make it more like the originalPaul Gilbert
This actually fixes a bug when the lady storms out of Rumsey's Haberdashery.. if she leaves too quickly, Watson's farewell dialog is still active, and stops a needed flag being set
2015-08-23SHERLOCK: RT: Fix getting image offsets on unscaled imagesPaul Gilbert
2015-08-22SHERLOCK: RT: Add missing verb filter for actions starting with '*'Paul Gilbert
This fixes '*Solve' appearing as an option in the right click menu for the Foolscap before you pick it up
2015-08-22SHERLOCK: RT: Simplified implementation of transBlitFromPaul Gilbert
2015-08-22SHERLOCK: RT: Cleanup of sDrawXOffset & sDrawYOffsetPaul Gilbert
2015-08-22SHERLOCK: RT: Fix Sherlock being drawn behind desk at HospitalPaul Gilbert
2015-08-22SHERLOCK: RT: Workaround for occasional crash changing char sequencePaul Gilbert
2015-08-22SHERLOCK: RT: Fix dialog background shading data after viewing journalPaul Gilbert
2015-08-21SHERLOCK: 3DO: Cleanup of conversation message playbackPaul Gilbert
The changes remove most of the hardcoding that was in place for showing the conversation movies, and have them triggered like the Rose Tattoo speech files. It will still need some work to hook it into our new voice playback, though, so text dialogs are closed at the right time
2015-08-21SHERLOCK: RT: Fix flickering newspaper inside Baker StreetPaul Gilbert
2015-08-21SHERLOCK: RT: Implement journal scrollbar thumbnail draggingPaul Gilbert
2015-08-21SHERLOCK: SS: Simplify pushSequenceEntryPaul Gilbert
2015-08-21SHERLOCK: Remove unused variableTorbjörn Andersson
2015-08-20SHERLOCK: RT: Minor fixes and added highlight enum to JournalPaul Gilbert
2015-08-20SHERLOCK: RT: Don't record journal entries during Watson's prologuePaul Gilbert