scummvm/engines
Willem Jan Palenstijn 6ec9c81b57 Merge branch 'master' into mm
Conflicts:
	engines/access/access.cpp
	engines/access/asurface.h
	engines/access/bubble_box.cpp
	engines/access/bubble_box.h
	engines/access/martian/martian_game.cpp
	engines/access/player.cpp
	engines/access/player.h
	engines/access/resources.cpp
	engines/access/screen.cpp
	engines/access/screen.h
	engines/access/sound.cpp
	engines/access/sound.h
2015-07-22 22:43:42 +02:00
..
access Merge branch 'master' into mm 2015-07-22 22:43:42 +02:00
agi AGI: Disable unused palettes for compilation 2015-07-19 17:13:38 +02:00
agos MISC: Remove some unused private member variables 2015-07-19 17:13:18 +02:00
avalanche
bbvs AUDIO: Make makeAIFFStream return a RewindableAudioStream 2015-06-06 17:20:41 -04:00
cge
cge2
cine AUDIO: Remove all AudioStream access to OPL 2015-07-07 20:19:47 -04:00
composer
cruise AUDIO: Remove all AudioStream access to OPL 2015-07-07 20:19:47 -04:00
draci
drascula DRASCULA: comment "talk.cpp" 2015-03-01 17:23:28 +01:00
dreamweb
fullpipe FULLPIPE: Fix a warning 2015-07-04 01:51:44 +03:00
gob GOB: Get rid of unused Audio::mixer references 2015-07-19 17:06:18 +02:00
groovie GROOVIE: add support for TIMB chunk 2015-06-30 16:11:26 +02:00
hopkins JANITORIAL: Remove unnecessary semicolons 2015-01-21 01:29:22 +01:00
hugo HUGO: Avoid drawing text above screen (bug #6799) 2015-02-05 00:04:04 +01:00
kyra AUDIO: Remove all AudioStream access to OPL 2015-07-07 20:19:47 -04:00
lastexpress
lure LURE: Remove unused function prototype 2015-06-06 06:59:52 -04:00
made MADE: Fix palette fade in/out 2015-07-19 20:32:06 +02:00
mads AUDIO: Remove all AudioStream access to OPL 2015-07-07 20:19:47 -04:00
mohawk MOHAWK: Implement drawing the marbles a step away from the grid 2015-07-19 17:38:14 -04:00
mortevielle MORTEVIELLE: fixed text position 2015-01-29 13:24:24 +01:00
neverhood JANITORIAL: Remove unnecessary semicolons 2015-01-21 01:29:22 +01:00
parallaction AUDIO: Remove all AudioStream access to OPL 2015-07-07 20:19:47 -04:00
pegasus AUDIO: Make makeAIFFStream return a RewindableAudioStream 2015-06-06 17:20:41 -04:00
prince
queen AUDIO: Remove all AudioStream access to OPL 2015-07-07 20:19:47 -04:00
saga SAGA: Fix typo in commit 6a49654 2015-07-13 02:29:07 +03:00
sci SCI: Fix object init in SCI3 scripts which are larger than 64kb 2015-07-13 01:35:26 +03:00
scumm SCUMM: Get rid of unused Audio::mixer references 2015-07-19 17:12:05 +02:00
sherlock SHERLOCK: RT: Further fixes for credits display 2015-07-21 22:44:34 -04:00
sky AUDIO: Remove all AudioStream access to OPL 2015-07-07 20:19:47 -04:00
sword1
sword2
sword25 SWORD25: Draw next movie frame only when an update is needed 2015-05-03 12:19:17 +02:00
teenagent
testbed
tinsel TINSEL: DW1: enable Miles Audio for DOS only 2015-07-04 23:08:27 +02:00
toltecs TOLTECS: Use the Miles audio drivers for AdLib and MT-32 2015-06-28 11:56:58 +02:00
tony TONY: Fix inclusion of util.h 2015-07-04 01:51:48 +03:00
toon TOON: Check for quitting in runEventScript() 2015-05-15 11:13:13 +02:00
touche
tsage AUDIO: Remove all AudioStream access to OPL 2015-07-07 20:19:47 -04:00
tucker
voyeur VOYEUR: Remove unnecessary semicolon 2015-05-31 09:21:47 +02:00
wintermute WINTERMUTE: Fix typo 2015-07-12 18:50:22 +02:00
zvision MISC: Remove some unused private member variables 2015-07-19 17:13:18 +02:00
advancedDetector.cpp
advancedDetector.h
dialogs.cpp
dialogs.h
engine.cpp SCUMM: Add a "chained games manager" 2014-12-30 10:47:51 +01:00
engine.h SCUMM: Add a "chained games manager" 2014-12-30 10:47:51 +01:00
game.cpp
game.h
metaengine.h
module.mk
obsolete.cpp
obsolete.h
savestate.cpp
savestate.h
util.h