Commit Graph
3264 Commits
Author SHA1 Message Date
Max Horn c25c406c00 cleanup (and test for Marwan's branch.... ;)
svn-id: r33061
2008-07-14 19:14:26 +00:00
Christopher Page d2e8d4831e Merged revisions 32744-32745,32747,32750-32759,32762-32764,32769,32777,32783,32785-32786,32789-32791,32798-32799,32801-32807,32809-32812,32816-32817,32819-32821,32823-32830,32832-32836,32838-32844,32846-32850,32852-32854,32858-32859,32865-32868,32873-32874,32879,32883,32895,32899,32902-32904,32910-32912,32923-32924,32930-32931,32938,32940,32948-32949,32951,32960-32964,32966-32970,32972-32974,32976,32978,32983,32986-32990,32992,32994,33002-33004,33006-33007,33009-33010,33014,33017,33021-33023,33030,33033 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33051
2008-07-14 00:10:09 +00:00
Max Horn 7ddd961bf2 cleanup
svn-id: r33010
2008-07-11 20:28:50 +00:00
Christopher Page e9c6b03fc7 SCUMM works with new GMM implementation
svn-id: r33001
2008-07-11 01:22:37 +00:00
Bertrand Augereau f41ab55021 Fixed a few warnings
svn-id: r32994
2008-07-10 18:01:54 +00:00
Max Horn dadb771cdc Remove reference to kPlainSoundType
svn-id: r32960
2008-07-08 10:29:35 +00:00
Christopher Page b50df858eb Changed the name of the Scumm menu dialog class MainMenuDialog to ScummMenuDialog, to avoid confusion and conflict with the Global Main Menu class
svn-id: r32937
2008-07-07 06:05:48 +00:00
Christopher Page 8957971162 SCUMM: syncSoundSettings() now updates kPlainSoundType
svn-id: r32935
2008-07-07 05:27:35 +00:00
Christopher Page 30c52e215c Scumm sound settings can now be changed from the gmm
svn-id: r32851
2008-06-30 17:44:21 +00:00
Lars Persson fafda89d0c Fixed Symbian buildsystem for new defines. Fixed ARM asm syntax for Symbian build.
svn-id: r32803
2008-06-26 16:51:02 +00:00
Christopher Page 27c427add2 Scumm and sky now use the new _quit flag
svn-id: r32775
2008-06-25 03:17:01 +00:00
Christopher Page 45525e7d18 SCUMM: Fixed a memory leak in the SCUMM engine
svn-id: r32680
2008-06-12 19:43:54 +00:00
Travis Howell 0fc34681c8 Add Macintosh version of Blue's 123 Time Activities.
svn-id: r32492
2008-06-02 08:39:19 +00:00
Travis Howell 0f17e60101 GID_WATER is no longer required.
svn-id: r32486
2008-06-02 05:01:40 +00:00
Travis Howell cf27ab1a00 Correct HE version for Blue's 123 Time Activities.
svn-id: r32457
2008-06-01 10:57:23 +00:00
Travis Howell 3b5b37c3e1 Fix bug #1973247 - DIG: Subtitle glitch (Regression).
svn-id: r32456
2008-06-01 10:37:14 +00:00
Travis Howell 0b46595bf1 Add Blue's 123 Time Activities.
svn-id: r32454
2008-06-01 10:16:56 +00:00
Travis Howell d05600d228 Fix display of original load/save screen in the FM-TOWNS version of Loom.
svn-id: r32413
2008-05-31 06:31:21 +00:00
Travis Howell 0c6ffa1882 Add Blue's Clues demos.
svn-id: r32411
2008-05-31 01:10:17 +00:00
Travis Howell dcbbd33dc8 Detect the full version of Blue's Reading Time Activities, based on old forum post.
svn-id: r32397
2008-05-30 13:10:52 +00:00
Travis Howell 16b0905bb0 Remove debug left over.
svn-id: r32338
2008-05-28 13:02:33 +00:00
Travis Howell edc731e04f The hard coded string translations for The Dig only apply to subtitles, and not speech.
svn-id: r32337
2008-05-28 13:00:41 +00:00
Travis Howell 292bc04389 Update the hard coded string translations in The Dig.
svn-id: r32334
2008-05-28 02:55:42 +00:00
Travis Howell 9c5014f6b9 Update HE version of another English Windows version of Putt Putt Saves The Zoo.
svn-id: r32240
2008-05-24 01:06:19 +00:00
Chris Apers 1b69c18b56 Fixed PalmOS compilation
svn-id: r32223
2008-05-23 11:13:15 +00:00
Travis Howell e2d799ad43 Add another English Windows version of Putt Putt Saves The Zoo.
svn-id: r32220
2008-05-23 06:26:11 +00:00
Johannes Schickel cc08a4953d Cleaned up engine debug level code.
svn-id: r32195
2008-05-20 16:37:32 +00:00
Max Horn 460296f360 Restrict the remaining changes made in rev 28166 to chinese COMI
svn-id: r32181
2008-05-19 17:34:29 +00:00
Max Horn 91b22e5886 Fix for bug #1940063 (MONKEY: Crash during the marriage lechuck/marley) -- regression was introduced by rev 28167 -- rule of thumb, if you add game specific code, make it game specifc ... ;)
svn-id: r32177
2008-05-18 22:33:41 +00:00
Travis Howell 721b1ecc9a Update HE version of another release of Pajama Sam 1 and SPY Fox 1.
svn-id: r32165
2008-05-18 02:51:54 +00:00
Travis Howell 7effbb5be4 Add another English version of Pajama Sam 1 and SPY Fox 1.
svn-id: r32162
2008-05-17 23:58:40 +00:00
Travis Howell e4c11fa635 Add patch #1964159 - PUTTPUTT: Add Japanese 3DO Version.
svn-id: r32133
2008-05-15 00:39:19 +00:00
Travis Howell 4c5226002f Update HE version for that English Windows version of Freddi Fish 1.
svn-id: r32048
2008-05-12 04:29:41 +00:00
Travis Howell 33b50cff65 Update HE version for that English Windows version of Freddi Fish 1.
svn-id: r31997
2008-05-11 03:57:09 +00:00
Travis Howell 04ba12b145 Add another English Windows version of Freddi Fish 1.
svn-id: r31996
2008-05-11 03:46:39 +00:00
Johannes Schickel 311e9165ed Proper delete[] formatting (this time all occurences should've been changed...)
svn-id: r31929
2008-05-07 15:09:10 +00:00
Johannes Schickel 600ab40bca Changed all delete [] usages to delete[].
svn-id: r31927
2008-05-07 14:31:45 +00:00
Jordi Vilalta Prat 38a8aa516e Allow static and dynamic plugins to be used at the same time
svn-id: r31888
2008-05-06 03:00:26 +00:00
Travis Howell f09f10bea5 Fix bug #1957165 - MM: render_mode is broken.
svn-id: r31862
2008-05-04 13:36:41 +00:00
Travis Howell d8bbcd9211 Fix subtitle regressions in The Dig.
svn-id: r31788
2008-04-30 12:54:07 +00:00
Travis Howell 5e52a8e533 Fix cycling of speech and subtitle options via Ctrl t.
svn-id: r31787
2008-04-30 12:53:05 +00:00
Travis Howell 21dc872873 Ooops, missed one difference.
svn-id: r31786
2008-04-30 04:42:53 +00:00
Travis Howell acc232718f Revert string clipping changes, as they only applied to The Dig (Second release) and COMI.
svn-id: r31785
2008-04-30 04:39:58 +00:00
Travis Howell bad36eaa61 The Dig (Second release) used similar charset code to COMI. This could cause regressions, if there are differences between the two releases of The Dig.
svn-id: r31784
2008-04-30 04:38:29 +00:00
Travis Howell 97d2d16757 Add language.bnd size, for the Japanese version of The Dig.
svn-id: r31783
2008-04-30 01:31:41 +00:00
Travis Howell 125d0a138d Add extra hard coded strings translations, from second release of The Dig.
svn-id: r31782
2008-04-30 01:29:17 +00:00
Eugene Sandulenko e95a4b42ac Narrow corrections to clipping code introduced with commit r31757 to
SCUMM 6+ as pointed out by Fingolfin

svn-id: r31759
2008-04-28 18:57:17 +00:00
Eugene Sandulenko 0ca949db2a Fix Kanji text positioning in DIG. Constants based on disassembly, but
it can bring some regressions to subtitles.

svn-id: r31757
2008-04-28 15:21:36 +00:00
Eugene Sandulenko 8c9311280f Fix Kanji rendering
svn-id: r31734
2008-04-26 20:33:59 +00:00
Eugene Sandulenko c376414771 Comment patch #1949695
svn-id: r31700
2008-04-24 20:04:32 +00:00