Matthew Hoops a1d41da096 Merge remote branch 'upstream/master' into t7g-ios ...

Conflicts:
	audio/decoders/qdm2.h
	common/util.cpp
	engines/groovie/music.cpp
	engines/groovie/resource.h
	video/qt_decoder.cpp
	video/qt_decoder.h

2011-05-11 00:30:28 -04:00

..

agi

AGI: Replace Winnie macros with functions

2011-05-07 15:25:55 -04:00

agos

Merge pull request #16 "Add a PixelFormat to Graphics::Surface.".

2011-05-01 16:54:45 +02:00

cine

JANITORIAL: Reduce header dependencies in shared code

2011-04-28 15:08:58 +03:00

cruise

JANITORIAL: Reduce header dependencies in shared code

2011-04-28 15:08:58 +03:00

draci

Merge pull request #16 "Add a PixelFormat to Graphics::Surface.".

2011-05-01 16:54:45 +02:00

drascula

DRASCULA: Handle pitch in code using lockScreen()

2011-05-05 00:04:10 +02:00

gob

GOB: Create a SafeSubReadStream for files in STKs

2011-05-06 16:47:49 +02:00

groovie

Merge remote branch 'upstream/master' into t7g-ios

2011-05-11 00:30:28 -04:00

hugo

Merge pull request #16 "Add a PixelFormat to Graphics::Surface.".

2011-05-01 16:54:45 +02:00

kyra

KYRA: Fix compilation when LoL is disabled.

2011-04-28 18:16:01 +02:00

lastexpress

LASTEXPRESS: Implement item selection and scene loading

2011-05-10 19:18:32 -04:00

lure

JANITORIAL: Reduce header dependencies in shared code

2011-04-28 15:08:58 +03:00

m4

M4: Fix a typo; cleanup

2011-05-06 23:16:10 -04:00

made

Merge pull request #16 "Add a PixelFormat to Graphics::Surface.".

2011-05-01 16:54:45 +02:00

mohawk

MOHAWK: Use new MacCursor code instead of convertCrsrCursor()

2011-05-05 19:35:31 -04:00

parallaction

Merge pull request #16 "Add a PixelFormat to Graphics::Surface.".

2011-05-01 16:54:45 +02:00

queen

QUEEN: Delete the parser before closing the driver.

2011-05-07 22:19:59 +02:00

saga

Merge pull request #16 "Add a PixelFormat to Graphics::Surface.".

2011-05-01 16:54:45 +02:00

sci

SCI: Line wrap some comments

2011-05-09 14:46:17 +02:00

scumm

SCUMM: Use new MacCursor code instead of convertCrsrCursor()

2011-05-05 19:46:33 -04:00

sky

JANITORIAL: Reduce header dependencies in shared code

2011-04-28 15:08:58 +03:00

sword1

JANITORIAL: Reduce header dependencies in shared code

2011-04-28 15:08:58 +03:00

sword2

SWORD2: Replace SafeSubReadStream with the same-name class in Common

2011-05-06 16:47:48 +02:00

sword25

SWORD25: Disabled code which isn't necessary with our PNG decoder

2011-05-05 22:12:38 +03:00

teenagent

Merge pull request #16 "Add a PixelFormat to Graphics::Surface.".

2011-05-01 16:54:45 +02:00

testbed

JANITORIAL: Reduce header dependencies in shared code

2011-04-28 15:08:58 +03:00

tinsel

TINSEL: Cleanup reel saving code

2011-05-10 14:43:54 +02:00

toon

Merge pull request #16 "Add a PixelFormat to Graphics::Surface.".

2011-05-01 16:54:45 +02:00

touche

JANITORIAL: Reduce header dependencies in shared code

2011-04-28 15:08:58 +03:00

tsage

TSAGE: Fix a glitch in setCursor()

2011-05-10 23:51:20 +02:00

tucker

JANITORIAL: Reduce header dependencies in shared code

2011-04-28 15:08:58 +03:00

advancedDetector.cpp

ALL: Mark printf and various other symbols as forbidden

2011-05-02 16:31:31 +02:00

advancedDetector.h

JANITORIAL: Reduce header dependencies in shared code

2011-04-28 15:08:58 +03:00

dialogs.cpp

JANITORIAL: Reduce header dependencies in shared code

2011-04-28 15:08:58 +03:00

dialogs.h

JANITORIAL: Reduce header dependencies in shared code

2011-04-28 15:08:58 +03:00

engine.cpp

COMMON: Forbid use of getcwd&getwd; add macro to enable unistd.h compatibility

2011-05-03 14:30:25 +02:00

engine.h

JANITORIAL: Reduce header dependencies in shared code

2011-04-28 15:08:58 +03:00

engines.mk

Merge remote branch 'remotes/dreammaster/tsage'

2011-04-13 21:08:05 +10:00

game.cpp

JANITORIAL: Reduce header dependencies in shared code

2011-04-28 15:08:58 +03:00

game.h

JANITORIAL: Reduce header dependencies in shared code

2011-04-28 15:08:58 +03:00

metaengine.h

JANITORIAL: Format forward declarations to follow convention

2011-04-28 12:20:34 +03:00

module.mk

…

savestate.cpp

JANITORIAL: Reduce header dependencies in shared code

2011-04-28 15:08:58 +03:00

savestate.h

JANITORIAL: Format more forward declarations to follow convention

2011-04-28 12:32:01 +03:00

util.h

…