115 Commits

Author SHA1 Message Date
Johannes Schickel
8fc7d60feb SCI: Make GPL headers consistent in themselves. 2014-02-18 02:39:37 +01:00
Filippos Karapetis
46ebf37ec9 SCI: Change wording for bug/further info references 2013-04-27 14:04:27 +03:00
Filippos Karapetis
cf3890b79a SCI: Remove obsolete comment and code 2013-01-11 02:24:18 +02:00
D G Turner
77a9f01454 SCI: Amended fix for palette related compiler warnings. 2012-11-26 21:08:39 +00:00
Filippos Karapetis
9c510c1b52 SCI: Fix warnings 2012-11-26 11:27:02 +02:00
Filippos Karapetis
7d436622a8 SCI: More work on kRemapColors
This implements some more color remap-based palette effects, found in QFG4
2012-08-21 03:32:23 +03:00
Filippos Karapetis
797dbfe506 SCI: Set the RemapByPercent palette initially
This needs to be performed because the screen palette might not change
after the call. Fixes the display of the bat in the character selection
screen in the full version of QFG4
2012-07-25 01:16:13 +03:00
Filippos Karapetis
537b1969bf SCI: Rewrite the color remapping code to support simultaneous effects
Fixes the torch in the full version of QFG4
2012-07-25 00:58:16 +03:00
Filippos Karapetis
37b209dac1 SCI: Refresh remapping by percent whenever the screen palette changes 2012-07-24 22:55:34 +03:00
Filippos Karapetis
fe3fb1873c SCI: Cleanup of the palette remapping code 2012-07-24 22:54:37 +03:00
Filippos Karapetis
6f35130204 SCI: More work on color remapping
More transparency/color mapping effects are now working (e.g. the
flashlight at the Gedde tomb in GK1, the rays of light at Schloss Ritter
in GK1, the torch in the QFG4 demo and the shadows in QFG4, PQ4 and KQ7)
2012-07-24 22:34:46 +03:00
Filippos Karapetis
bd281928cb SCI: Initial implementation of kRemapColors(kRemapByPercent)
Fixes some graphics glitches in the QFG4 demo and the menus of QFG4, by
implementing one of the transparency effects used mainly in SCI32.
Many thanks to fuzzie for her debugging info on QFG4 demo and to wjp for
his great help on the dissassembly
2012-07-24 03:53:44 +03:00
Filippos Karapetis
a643981a38 SCI: Handle resource ID -1 when setting the palVary resource
Fixes several wrong colors in SQ6
2012-06-08 11:57:43 +03:00
Filippos Karapetis
ae54885379 SCI: Updated information regarding bug #3439240 2011-11-17 11:16:10 +02:00
Filippos Karapetis
5fc9831577 SCI: Fixed bug #3439240 - "QFG1VGA: Game Crashes While Sleeping at Erana's Peace" 2011-11-17 11:00:09 +02:00
Filippos Karapetis
747bc75bc7 SCI: Fixed typo in colorIsFromMacClut() 2011-11-03 22:40:28 +02:00
Filippos Karapetis
935eaa175b SCI: Move the palette merging checking code inside the GfxPalette class 2011-10-19 23:52:51 +03:00
Filippos Karapetis
722ce77675 SCI: Wrapped some very long lines 2011-10-19 20:29:01 +03:00
Filippos Karapetis
4717d11862 SCI: Added support for the halfbrite palette used in Longbow Amiga
This fixes the remaining palette problems in the game (bug #3309036)
2011-09-27 16:54:14 +03:00
Filippos Karapetis
300cec119c SCI: Bugfix for the palette of Longbow Amiga (still not right) 2011-09-25 04:10:20 +03:00
Eugene Sandulenko
78f1ea7690 OSYSTEM: extended installTimerProc() with timer ID parameter 2011-08-06 11:28:35 +01:00
Max Horn
88913c0139 ALL: Remove trailing whitespaces
This tries to make our code a bit more compliant with our code formatting
conventions. For future use, this is the command I used:
  git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//'
2011-06-20 00:59:48 +02:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Ori Avtalion
9414d7a6e2 JANITORIAL: Reduce header dependencies in shared code
Some backends may break as I only compiled SDL
2011-04-28 15:08:58 +03:00
Max Horn
0ce2ca4e00 COMMON: Replace MKID_BE by MKTAG
MKID_BE relied on unspecified behavior of the C++ compiler,
and as such was always a bit unsafe. The new MKTAG macro
is slightly less elegant, but does no longer depend on the
behavior of the compiler.
Inspired by FFmpeg, which has an almost identical macro.
2011-04-12 16:53:15 +02:00
md5
4ddc66d68e SCI: Initial handling of the views in Longbow Amiga. Still not right 2011-03-07 13:23:52 +02:00
md5
dbd3f440d2 SCI: Added some support code for Longbow Amiga 2011-03-05 18:47:13 +02:00
Matthew Hoops
dbaad1a896 SCI: Fix Mac icon bar palette match order 2011-03-04 19:48:14 -05:00
md5
d95b5331fb SCI: Some palette related changes
- Moved palette color count inside the GfxPalette class
- Enabled all of the kPalette subops for 16 color SCI1 games, apart from
the ones for intensity palette animation, and palette resource loading
- Removed isVGA() and isAmiga32color() methods from the resource manager -
they ended up in having inconsistent code
2011-03-04 22:04:13 +02:00
md5
e286b1b5f1 SCI: Removed a hack for SCI1 Amiga games in setOnScreen() 2011-03-04 00:25:21 +02:00
Matthew Hoops
6db22dde64 SCI: Fixed freddy's Mac icon bar palettes
(hopefully for good now)
2011-02-21 20:32:30 -05:00
Johannes Schickel
e21d6e0d11 Merge branch 'osystem-palette' of https://github.com/lordhoto/scummvm into master
Conflicts:
	backends/platform/android/android.cpp
	engines/sci/graphics/screen.cpp
	engines/sci/graphics/transitions.cpp
2011-02-19 21:46:45 +01:00
strangerke
1055c8a8d0 SCI: Fix compilation using MSVC 9 2011-02-18 22:56:34 +01:00
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