ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
86,814 Commits 45 Branches 139 Tags
578a6794de9ba7679966fee9aec02c6b2bdbce94
Commit Graph
132 Commits
Author SHA1 Message Date
Matthew Hoops 266806d892 SCI: Fix Mac icon bar palettes 
The Mac icon bar uses a palette from the executable and keeps those entries in the palette constantly.

In addition, we're now performing gamma correction on the Mac-based colors so that they are in the same gamma as SCI. The color matching now works with this and using the same color finding as the Mac Palette Manager.
 2011-02-17 13:38:23 -05:00
Matthew Hoops dbc6910eae SCI: Add support for Phantasmagoria 2 CLUT resources 
My test of ising the clut associated with the intro video produced a decent quality color conversion. This is not yet hooked up to the video player.
 2011-02-13 17:29:15 -05:00
Max Horn 2d1c8a3533 ALL: Fix whitespaces / indention 
svn-id: r55818
 2011-02-07 23:01:06 +00:00
Matthew Hoops aa64cf1d62 SCI: Fix SCI1.1 Mac picture palettes further 
The palette color start is actually a byte, not a uint16.

svn-id: r55796
 2011-02-07 01:51:09 +00:00
Matthew Hoops 24e983610d SCI: Fix GK1 Mac views, the game now starts 
svn-id: r55721
 2011-02-02 15:33:33 +00:00
Filippos Karapetis 32d7e687ee SCI: debugC calls no longer require a debug level of 2 to show output 
svn-id: r55086
 2011-01-01 12:48:12 +00:00
Max Horn 5a554e3dbe SCI: Change 'colour' to 'color' 
All other instances already were spelled 'color' in the SCI
engine (and also most other parts of ScummVM)

svn-id: r54285
 2010-11-17 12:13:03 +00:00
Willem Jan Palenstijn e065a8a797 SCI: Fix blend rounding, style 
svn-id: r54093
 2010-11-05 12:33:07 +00:00
Willem Jan Palenstijn 51f7c4c525 SCI: Fix precedence error in comment 
svn-id: r54071
 2010-11-04 19:45:38 +00:00
Willem Jan Palenstijn 7e6aa1b4a9 SCI: Use gamma 2.2 for blending undithered colours 
svn-id: r54069
 2010-11-04 19:17:44 +00:00
Martin Kiewitz 85c35f41ca SCI: fixing comment of r52351 
svn-id: r52353
 2010-08-24 17:33:35 +00:00
Martin Kiewitz 3e6fb233ac SCI: fix race condition in sierra kPalVary code 
we are loading pictures very fast, this results in a kPalVary race condition, because sierra set timer to 1 tick, when it was getting called with 0 ticks and required the timer to occur before the transition. Fixes freddy pharkas nighttime being daytime during transitions (bug #3051905)

svn-id: r52351
 2010-08-24 17:22:05 +00:00
Martin Kiewitz 347accf2d7 SCI: dont load target palette when gameIsRestarting != 0 
fixes sepia palette getting applied when loading in pharkas (part of bug #3051905)

svn-id: r52326
 2010-08-24 11:21:32 +00:00
Martin Kiewitz c422e39bf8 SCI: implemented kPalette(save/restore) 
svn-id: r51381
 2010-07-27 17:51:44 +00:00
Martin Kiewitz 114f4dfb0a SCI: adding scaling code in kBaseSetter 
and fixing palVary timer crash when exiting engine during palVary processing

svn-id: r51361
 2010-07-27 11:11:47 +00:00
Filippos Karapetis b587bf35c8 SCI: changed the comment about the palette merging (it's not a workaround anymore). Also, changed the warning when a picture has a broken palette into debug output - these pictures (which can be found in other games too) are usually meant to be blank, thus don't have a palette 
svn-id: r51148
 2010-07-22 16:01:32 +00:00
Filippos Karapetis 093800dc1c Silenced a known warning in SQ5, after the intro 
svn-id: r51131
 2010-07-22 08:57:25 +00:00
Martin Kiewitz 8171093614 SCI: adding comment about palette formats 
svn-id: r50847
 2010-07-13 15:49:13 +00:00
Martin Kiewitz c77c84f5c5 SCI: also sync palette after playing movies, fixes kq6 intro 
svn-id: r50798
 2010-07-11 10:11:31 +00:00
Martin Kiewitz df6ead5f93 SCI: calling speed throttler as well from kPalette(setIntensity) if needed - fixes kq6 intro 
svn-id: r50794
 2010-07-10 22:27:28 +00:00
Martin Kiewitz f38348b82e SCI: adding kPalette signatures, fixing 3 kPalVary calls, fixing kAssertPalette (we used the wrong parameter number before, maybe the issues were caused by this) 
svn-id: r50780
 2010-07-10 12:19:32 +00:00
Martin Kiewitz c6b0a5e896 SCI: detect, if SCI1.1 game is merging or copying palette instead of using gameIds. Also prints method used, when using debug command "version" 
svn-id: r50261
 2010-06-25 10:04:31 +00:00
Martin Kiewitz e7634ee147 SCI: it seems that all cnick games are using the inbetween interpreter 
svn-id: r50186
 2010-06-23 16:58:42 +00:00
Martin Kiewitz e39f2ae1c1 SCI: adding cnick-longbow to inbetween sci1.1 in GfxPalette 
svn-id: r50185
 2010-06-23 16:53:56 +00:00
Martin Kiewitz f0145e6dcd SCI: implementing boundary checking for GfxPalette::createFromData(), sq5 has a broken picture 0 resource, which would result in either crash or at least bad read from memory depending on whats read there 
svn-id: r50178
 2010-06-23 11:47:14 +00:00
Martin Kiewitz b68180efe5 SCI: added nicks picks sq to the sci1.1 interpreter games, the other ones may also use the same interpreter, but we currently can not verify 
svn-id: r50172
 2010-06-22 21:58:55 +00:00
Martin Kiewitz 04c04ff01e SCI: eco quest 1 demo also uses inbetween sci1.1 interpreter, fixing graphics 
svn-id: r50170
 2010-06-22 21:24:52 +00:00
Martin Kiewitz 38cf6aa3e4 SCI: implemented kAssertPalette and a palvary fix for ::set, fixes erana's place in qfg1vga nighttime 
svn-id: r50162
 2010-06-22 19:01:43 +00:00
Martin Kiewitz 9ca43423b4 SCI: kPalVary(SetTarget) implemented 
svn-id: r50153
 2010-06-22 17:05:00 +00:00
Martin Kiewitz 8fce660090 SCI: also set throttle trigger on kPalette(animate) 
svn-id: r50109
 2010-06-21 10:40:48 +00:00
Martin Kiewitz 98196b8af6 SCI: GfxPalette::kernelSetIntensity() now also triggers throttler - somewhat "fixes" lb2cd when selecting play game 
svn-id: r50108
 2010-06-21 10:14:04 +00:00
Martin Kiewitz 6f195ae5a4 SCI: implemented kPalVary(changeTicks) 
svn-id: r50100
 2010-06-20 21:12:15 +00:00
Martin Kiewitz 4a83b2c5f6 SCI: properly implement kPalVary functionality within kDrawPic and transitions, so pharkas finally works w/o palette corruption 
svn-id: r50099
 2010-06-20 20:52:31 +00:00
Martin Kiewitz 3a9217dd5a SCI: disable palvary when reverse is fully done - fixes palette getting stuck in pharkas (the broken palette in there is actually not caused by palvary, it was just overwritten before by view palette updates and those dont occur when palvary is active) 
svn-id: r50093
 2010-06-20 20:05:00 +00:00
Martin Kiewitz d37a25cfee SCI: cleanup of SciPalette 
svn-id: r50091
 2010-06-20 19:18:33 +00:00
Martin Kiewitz 3c6639eb86 SCI: implemented kPalVary(reverse) for pharkas, although there is a bug somewhere, not working 100% 
svn-id: r50089
 2010-06-20 18:20:05 +00:00
Martin Kiewitz 7ecff0a300 SCI: implementing kPalVary(2) 
svn-id: r50085
 2010-06-20 17:08:39 +00:00
Martin Kiewitz e8262d989e SCI: adding code for kPalVary ticks == 0 case, fixes pharkas 
svn-id: r50084
 2010-06-20 16:48:52 +00:00
Martin Kiewitz b016c16300 SCI: some kPalVary support - intro of island dr. brain works fine now 
svn-id: r50082
 2010-06-20 16:31:24 +00:00
Martin Kiewitz 7ce739f51b SCI: kPalVary - cleanup and some more code 
svn-id: r50081
 2010-06-20 15:01:31 +00:00
Martin Kiewitz 15ae4d8f59 SCI: fix r50078, we need to update timestamp for inbetween SCI1.1 games, but not on kPortrait palette changes 
svn-id: r50079
 2010-06-20 13:38:24 +00:00
Martin Kiewitz d2a3f59bfb SCI: update timestamp like before for inbetween SCI1.1 games 
svn-id: r50078
 2010-06-20 13:30:40 +00:00
Martin Kiewitz 30f6e7824b SCI: update sys palette timestamp only on kDrawPic in SCI1.1, fixes intro of island of dr. brain 
svn-id: r50077
 2010-06-20 13:25:08 +00:00
Martin Kiewitz 871c9bddde SCI: removing unneeded parameters inside SciPalette, cleanup of SciPalette 
svn-id: r50076
 2010-06-20 13:15:45 +00:00
Martin Kiewitz 36ca2ce421 SCI: some cleanup for kPalVary 
svn-id: r50074
 2010-06-20 12:21:57 +00:00
Martin Kiewitz 636ef64c68 SCI: making vga views work in ega games :P 
svn-id: r50025
 2010-06-18 17:40:13 +00:00
Martin Kiewitz 8a8480c0ca SCI: fix typo when setting EGA palette 
svn-id: r50023
 2010-06-18 17:20:09 +00:00
Max Horn 359be0c066 SCI: Change SciEngine's 'char *getGameID()' to 'Common::String getGameId()' 
svn-id: r49968
 2010-06-17 23:14:34 +00:00
Martin Kiewitz 5daa17473b SCI: applying forceRealMerge change to pq1 and qfg3 demo as well (see r49936) for now 
svn-id: r49938
 2010-06-17 16:36:01 +00:00
Martin Kiewitz 7bb48adda7 SCI: slightly change comment from r49936 
svn-id: r49937
 2010-06-17 16:09:06 +00:00