Commit Graph

2718 Commits

Author SHA1 Message Date
Johannes Schickel
89abab97e3 JANITORIAL: Remove trailing whitespaces.
Powered by:
git ls-files "*.cpp" "*.h" "*.m" "*.mm" | xargs sed -i -e 's/[ \t]*$//'
2012-09-26 04:17:55 +02:00
Johannes Schickel
01a458f8f2 SCUMM: Add check for resource fork for ".iMUSE Setups".
This should help identify incorrect dumps/file naming like what (probably)
happened in bug #3570973
"FOA: Doesn't start anymore after adding Mac sound support".
2012-09-23 21:12:06 +02:00
clone2727
2e4ee0b2d0 Merge pull request #275 from clone2727/pegasus
Pegasus engine (The Journeyman Project: Pegasus Prime)
2012-09-20 13:17:39 -07:00
Matthew Hoops
b105104534 SCUMM: Update comments 2012-09-20 12:00:13 -04:00
Matthew Hoops
2a9d98003e SCUMM: Restrict the Mac m68k v5 driver to MI2/Indy4
Shouldn't be used with MI1
2012-09-20 11:58:04 -04:00
Matthew Hoops
fc6ab89b50 SCUMM: Add support for Indy4 Mac 68k sound 2012-09-20 11:48:00 -04:00
Johannes Schickel
c3f37fb187 SCUMM: Always use the Mac sound output for MI2 Mac.
Formerly it wasn't used when the user selected a MIDI output in the options.
Thanks to clone2727 for noticing.
2012-09-20 04:07:18 +02:00
Johannes Schickel
6ea51e8c45 SCUMM: Implement support for special sfx in MI2 Mac.
This also increases the savegame version, since it introduces a new
Instrument subclass.
2012-09-20 02:13:03 +02:00
Johannes Schickel
58f542d434 SCUMM: Implement support for Monkey Island 2 Mac music.
This is a initial RE of the audio output Monkey Island 2 Mac uses. Support
for special sound effects is not in there yet.
2012-09-20 02:12:41 +02:00
Johannes Schickel
6c9f9f8356 SCUMM: Extend comment about SysEx manufacturer 0x97. 2012-09-20 01:59:51 +02:00
Johannes Schickel
b5aaa1d7bc SCUMM: Don't play SBL effects in MI2 mac.
The original does not do this either.
2012-09-20 01:59:50 +02:00
Matthew Hoops
974c7f1530 SCUMM: Enable CMS for the MI1 demo 2012-09-19 12:58:19 -04:00
Matthew Hoops
d5ed8b1901 Merge remote branch 'upstream/master' into pegasus
Conflicts:
	AUTHORS
2012-09-12 20:18:13 -04:00
Alyssa Milburn
f08978a075 JANITORIAL: Remove underscores from MidiParser variable names. 2012-09-07 23:04:34 +02:00
Matthew Hoops
f35e820e9f Merge remote branch 'upstream/master' into pegasus 2012-09-05 11:45:25 -04:00
Bertrand Augereau
09f193352a SCUMM: PCESetCostumeData should have static linking 2012-09-01 14:14:23 +02:00
Matthew Hoops
790a74ab9d Merge remote branch 'upstream/master' into pegasus 2012-08-31 21:58:58 -04:00
Bertrand Augereau
bf882b77c4 SCUMM: Nicer constants in _ClassicProc3RendererShadowARM that allow refactoring stack space more easily 2012-08-31 23:18:02 +02:00
Bertrand Augereau
da0f274411 SCUMM: Fix of spaces/tabs mismatch (Cosmetic) 2012-08-31 18:26:20 +02:00
Matthew Hoops
bb1e60e8b2 Merge remote branch 'upstream/master' into pegasus
Conflicts:
	AUTHORS
	devtools/credits.pl
	gui/credits.h
2012-08-26 16:12:25 -04:00
Matthew Hoops
857b92f8ff Merge pull request #268 from clone2727/video-rewrite
VideoDecoder upgrade & partial rewrite
2012-08-26 15:41:56 -04:00
Matthew Hoops
18823198ad VIDEO: Merge AdvancedVideoDecoder into VideoDecoder 2012-08-16 14:00:14 -04:00
Alyssa Milburn
92bcb1801a SCUMM: Replace detector printf usage with logMessage. 2012-08-15 09:48:50 +02:00
Matthew Hoops
57a06e383b VIDEO: Convert Bink to the new AdvancedVideoDecoder API 2012-07-25 11:22:28 -04:00
Matthew Hoops
a652f6669e VIDEO: Rewrite SmackerDecoder to use the new API 2012-07-23 21:04:51 -04:00
Travis Howell
4f9b9ce3cc SCUMM: Correct HE version for another English Windows version of Freddi Fish and Luther's Maze Madness. 2012-07-08 09:41:25 +10:00
Travis Howell
10ba526812 SCUMM: Add another English Windows version of Freddi Fish and Luther's Maze Madness. 2012-07-07 20:13:02 +10:00
Johannes Schickel
e242b91db0 SCUMM: Slight cleanup in querySaveMetaInfos. 2012-07-03 18:39:49 +02:00
Matthew Hoops
91efe792d5 Merge remote branch 'upstream/master' into pegasus 2012-06-24 09:37:53 -04:00
Torbjörn Andersson
a6b65b84b0 SCUMM - Fix bug #3536645, FT Missing Dialogue Line
The condition for setting up the scene when encountering Father
Torque had been accidentally inverted, so the function was called
over and over (presumably causing the scene to stall), insead of
just once. I don't know much about INSANE, but sev has confirmed
that this is the correct fix.
2012-06-23 19:30:10 +02:00
Johannes Schickel
4fb9bceabc Merge pull request #246 from lordhoto/osystem-void-buffers
OSYSTEM: Use void buffers for screen/overlay/mouse buffers and proper pitch values for overlay code
2012-06-20 08:02:26 -07:00
Johannes Schickel
1b1b1d6615 Merge pull request #244 from clone2727/football2002-wday
COMMON: Add tm_wday to our TimeDate struct
2012-06-17 17:17:06 -07:00
Matthew Hoops
625f6cc716 Merge remote branch 'upstream/master' into pegasus 2012-06-16 01:43:32 -04:00
Johannes Schickel
64790aabc8 SCUMM: Get rid of casts on OSystem::copyRectToScreen calls. 2012-06-16 02:39:00 +02:00
Travis Howell
85e0a90f4a SCUMM: The target and Wii releases of a few HE games are HE101, since they have differce in debugInput opcode too. 2012-06-15 19:20:03 +10:00
Matthew Hoops
83e014f2bd SCUMM: Fix rect bounds in getPolygonOverlap() 2012-06-15 01:24:39 -04:00
Matthew Hoops
a529d96091 SCUMM: Adjust some wiz image ops and flood fill rects
Fixes black lines appearing on the field in football/football2002 and some soccer2004 menus.
2012-06-15 00:41:10 -04:00
Matthew Hoops
734a361f2e SCUMM: Fix basketball ini name 2012-06-11 10:16:07 -04:00
Matthew Hoops
6d4f2753cf SCUMM: Implement football2002's getDayOfWeek() u32 function 2012-06-09 20:22:14 -04:00
Matthew Hoops
0e5ae35e34 SCUMM: Create proper engine for heversion 101
Regression from 3968f31948
2012-06-09 20:00:45 -04:00
Eugene Sandulenko
ec92a867da Merge pull request #243 from lordhoto/cursor-no-scale
ALL: Replace cursorTargetScale in OSystem API with a simple "do not scale" logic.
2012-06-08 23:20:28 -07:00
Travis Howell
3968f31948 SCUMM: Add HE101 version, for debugInput opcode difference in some HE100 games. 2012-06-09 15:36:47 +10:00
Matthew Hoops
e8ab1f5088 SCUMM: Implement listing playbook files in football2002 2012-06-08 22:22:38 -04:00
Matthew Hoops
f22661e4b9 SCUMM: Stub off other football2002 u32 opcodes 2012-06-08 19:45:31 -04:00
Matthew Hoops
c735b2acda SCUMM: Give football u32 opcodes proper names 2012-06-08 14:32:13 -04:00
Matthew Hoops
f3fba31846 SCUMM: Implement football2002 u32 opcode 1028
Scoreboard transitions now play
2012-06-06 21:47:36 -04:00
Matthew Hoops
2aeb883123 SCUMM: Show an error dialog when trying to run puttzoo ios lite
The lite version contains the full game and we will not support it due to potential piracy.
2012-06-05 13:17:04 -04:00
Johannes Schickel
a401f0a19e ALL: Replace cursorTargetScale in OSystem API with a simple "do not scale" logic.
All uses of the old target scale API actually wanted to disallow scaling of
the mouse cursor. This commit adapts our API to this and thus simplifies
backend implementations.

Some backends, most notable the Wii and Android, did some implementation of
the cursor target scale, which I didn't adapt yet. I added a TODO for the
porters there.
2012-06-03 02:02:57 +02:00
Travis Howell
79f6f63daf SCUMM: Add debugInput opcode difference in Backyard Basketball. 2012-06-01 14:30:47 +10:00
Travis Howell
dfa5405db8 SCUMM: Change the nest.number default to zero in stopScript and stopObjectScript too. 2012-05-31 19:01:07 +10:00