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
1475 Commits
Author SHA1 Message Date
Matthew Hoops dceb1391cb SCI: Cache all icon bar images from the start 2011-02-20 12:44:59 -05:00
md5 ae88f41596 SCI: Slight cleanup 2011-02-20 12:20:40 +02:00
Matthew Hoops 5091f846a7 GRAPHICS: Switch PICT's palette from RGBA to RGB 2011-02-20 00:45:59 -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 7b5792d6d2 SCI: Fix window height for some Mac SCI1/1.1 games 
Some games have removed the menu bar from the screen. This also fixes King's Quest V's icon bar.
 2011-02-18 15:58:23 -05:00
Matthew Hoops d3e3eca6a3 SCI: Fix Mac icon bar vertical positioning 2011-02-17 13:38:24 -05: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
Johannes Schickel a02454644a Merge branch 'master' into osystem-palette 
Conflicts:
	backends/platform/wii/osystem_gfx.cpp
 2011-02-15 23:42:50 +01:00
Matthew Hoops ee09af6a12 SCI: Fix loading SCI32 games 
The frames/items in GfxFrameout need to be cleared upon loading
 2011-02-14 22:38:12 -05:00
md5 0da6b15539 SCI2+: Point out that there is a hack in the text splitting code 
This particular hack causes issues in GK1, when talking with Grace, because the
width of the associated plane isn't set correctly.
 2011-02-14 18:16:35 +02:00
Johannes Schickel bba430eebc SCI: Adapt to setPalette/grabPalette RGBA->RGB change. 2011-02-14 17:08:33 +01: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
Matthew Hoops 80347e9630 SCI: Don't fallback to views in SCI1.1+ Mac games 
svn-id: r55871
 2011-02-10 15:56:35 +00:00
Matthew Hoops 631d2de745 SCI: Fix Mac SCI1 view transparency 
This was a regression from r55825.

svn-id: r55868
 2011-02-10 15:12:06 +00:00
Matthew Hoops 85f8dc5dee SCI: Add detection for Freddy Pharkas Mac 
svn-id: r55828
 2011-02-08 15:03:23 +00:00
Walter van Niftrik 8f3324f6ba SCI: Do not flip clearKey for Mac SCI1.1+ views. 
svn-id: r55825
 2011-02-08 14:26:39 +00:00
Matthew Hoops 8b19704771 SCI: Fix Mac SCI1.1+ view white/black/transparency 
Since Mac OS required black to be at 0xff and white to be at 0x00, the original Sierra programs had to hack around that in various sections of the code to keep things in line with the PC versions. We're changing the view pixels instead so we only have to change in one location.

svn-id: r55823
 2011-02-08 05:01:42 +00:00
Max Horn 2d1c8a3533 ALL: Fix whitespaces / indention 
svn-id: r55818
 2011-02-07 23:01:06 +00:00
Filippos Karapetis 04748b1744 SCI: Fixed compilation 
svn-id: r55813
 2011-02-07 18:32:42 +00:00
Max Horn ab039812e7 COMMON: OSystem now has a PaletteManager 
svn-id: r55806
 2011-02-07 17:52:38 +00:00
Filippos Karapetis 6f9ac84f77 SCI: Converted the robot decoder into a regular video decoder, and decoupled it from the 
SciEngine class

- Robot videos are now shown in frameOut(), like they should, and kRobot(sync) is only
used for syncing with the game scripts
- Hooked video playing into the "play_video" console command

svn-id: r55801
 2011-02-07 12:24:09 +00:00
Filippos Karapetis d7fb5239e7 SCI: v4 robots are only used in the PQ:SWAT demo, the full version uses v5. Some cleanup 
svn-id: r55800
 2011-02-07 09:03:58 +00:00
Matthew Hoops cd599216a5 SCI: Add support for v4 robots 
svn-id: r55799
 2011-02-07 05:53:30 +00:00
Matthew Hoops cf918d72e5 SCI: Add support for Mac robot files 
svn-id: r55797
 2011-02-07 01:56:30 +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
Filippos Karapetis 9149100629 SCI: Several changes related to robot files 
- Added WIP robot sound support (which has pops between each frame for some reason)
- Now handling a lot of previously ignored fields
- Now handling the chunk before the palette chunk properly. Fixes some v6 videos
- Added known robot related TODOs

svn-id: r55793
 2011-02-06 11:51:21 +00:00
Matthew Hoops 46404940b5 SCI: Improve Mac SCI1.1+ cursor support 
The scripts can pass a list of view id's from the DOS version that get remapped to CURS/crsr id's. GK1 cursors now work and Phantasmagoria uses the correct ones.

svn-id: r55791
 2011-02-06 00:05:27 +00:00
Matthew Hoops c1a9857837 SCI: Fix SCI32 Mac picture palettes 
The palette offset should be 32-bit, not 16. The GK1 Mac intro now plays properly.

svn-id: r55784
 2011-02-05 08:52:52 +00:00
Matthew Hoops ad9486e1a8 SCI: Throw a warning when trying to play a Mac robot file (big endian) 
svn-id: r55778
 2011-02-05 07:49:21 +00:00
Matthew Hoops 4a4a6cd585 SCI: Properly initialize a Robot variable so we don't segfault on quitting 
svn-id: r55776
 2011-02-04 23:03:05 +00:00
Filippos Karapetis 512bcf8b90 SCI: Rewrote the robot playing code in a way similar to other video decoders 
- The code now streams videos instead of loading them in memory, without utilizing seeking
- Removed the sound-related robot code from the graphics classes
- Started implementing the code for the sound in robot videos (still not finished)

svn-id: r55772
 2011-02-04 17:51:59 +00:00
Lars Skovlund 11e2f2226c SCI: Robot v6 support. I _think_ this is complete. 
svn-id: r55759
 2011-02-03 19:47:36 +00:00
Filippos Karapetis 38444a3712 SCI: updated comments concerning robot videos 
svn-id: r55757
 2011-02-03 18:24:55 +00:00
Filippos Karapetis e1cea3b879 SCI: Robot related changes 
- Reverted accidental changes in r55752, and moved all the deletion code in freeData()
again
- Now skipping v6 videos (in SCI3), instead of throwing an error

svn-id: r55756
 2011-02-03 18:18:36 +00:00
Matthew Hoops 4d088332a2 SCI: Add support for GK1 Mac high-res fonts 
svn-id: r55754
 2011-02-03 15:51:51 +00:00
Filippos Karapetis c4861605df SCI: Fix a typo, the interpreter can handle robot video versions 3 - 5 
svn-id: r55753
 2011-02-03 14:44:58 +00:00
Filippos Karapetis 74caf6cd71 SCI21: Some robot related changes 
- Don't reallocate the frame buffer on each update if its dimensions haven't changed
- Don't attempt to display the currently unsupported v4 robot files (used in PQ:SWAT)
- Signed/unsigned fixes
- Disabled the unused getFrameRect() function
- Some cleanup and reordering

svn-id: r55752
 2011-02-03 14:37:50 +00:00
Matthew Hoops 4c0af01d6a SCI: Disable the special QFG1 Mac icon bar 
The original interpreter completely ignores it in favor of the regular one.

svn-id: r55748
 2011-02-03 02:26:57 +00:00
Matthew Hoops c62e507890 SCI: Fix GK1 Mac scaling 
svn-id: r55744
 2011-02-02 22:29:14 +00:00
Lars Skovlund 441c5e0211 SCI: Fix memory leaks in GfxRobot 
svn-id: r55740
 2011-02-02 21:05:38 +00:00
Matthew Hoops d3e30f3038 SCI: Fix SCI32 Mac fonts 
svn-id: r55725
 2011-02-02 16:22:58 +00:00
Matthew Hoops f1f86646de SCI: Fix SCI32 Mac pictures 
svn-id: r55724
 2011-02-02 16:15:49 +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
Matthew Hoops 1ac0680a77 SCI: Fix SCI1.1+ Mac views with uint16 rle lengths (thanks, Walter) 
svn-id: r55705
 2011-02-01 03:50:29 +00:00
Sven Hesse 250f5a97fa SCI: Add missing initializations 
_resourceData, _imageStart, _audioStart and _audioLen

svn-id: r55689
 2011-01-31 18:18:39 +00:00
Lars Skovlund aa5e8e6c2b SCI/Robot: Simplify ::setPalette() 
svn-id: r55498
 2011-01-24 11:17:47 +00:00
Lars Skovlund 3b61cb57d4 SCI/Robot: Fix typo 
svn-id: r55497
 2011-01-24 10:57:19 +00:00
Lars Skovlund bcf62fa8b9 SCI/Robot:Don't ifdef out ::playAudio, since it is only used for debugging 
svn-id: r55449
 2011-01-22 21:58:33 +00:00
Filippos Karapetis 7dd28c024a SCI: Moved the robot audio playing test code inside GfxRobot::playAudio() 
svn-id: r55428
 2011-01-22 14:58:17 +00:00