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
86814 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Gilbert 4c420a70be XEEN: Fix drawing buttons in Spells dialog when switching character 2015-02-18 22:11:59 -05:00
Paul Gilbert cd5bc0ec7e XEEN: Simplify use of addButton when setting up button lists 2015-02-18 22:05:25 -05:00
Paul Gilbert aa89e602a2 XEEN: Spell dialogs fixes for non-casters 2015-02-18 21:42:57 -05:00
Paul Gilbert da368f5e00 XEEN: Add special case spell handling during combat 2015-02-18 21:17:55 -05:00
Paul Gilbert 0f78fb9373 XEEN: Implement extra code for passing active character to castSpell 2015-02-18 20:35:32 -05:00
Paul Gilbert 6a7fd1952d XEEN: Fixes for display of Spells dialog 2015-02-18 08:11:57 -05:00
Willem Jan Palenstijn 4f6f0fb148 SCI: Fix digital audio 
Regression from 5028487038, where I assumed all songs were MIDI.
 2015-02-18 09:33:03 +01:00
Johannes Schickel 71cc9e41e8 WINCE: Fix compilation. 2015-02-18 05:24:45 +01:00
Paul Gilbert 1d5d98e898 XEEN: Fix display of buttons in Cast Spell window 2015-02-17 21:57:50 -05:00
Paul Gilbert 7b3c10b09c XEEN: Implemented Cast Spell dialog 2015-02-17 21:47:01 -05:00
Willem Jan Palenstijn fdc09c2cb7 SCI: Add alternative version of QfG3 "Woo" dialog patch 
The GOG version of QfG3 is shipped with a patch to script 440 that broke
our existing internal script patch for this script bug.

See bug #6806.
 2015-02-17 19:58:24 +01:00
Paul Gilbert c045adae76 XEEN: Implementing more combat logic 2015-02-16 19:58:53 -05:00
Filippos Karapetis b45e706012 ZVISION: Fix script bug #6803 (tuning fork box state) 2015-02-17 01:49:59 +02:00
Paul Gilbert 30d94950be XEEN: Starting of combat UI, moved _combatParty into Combat class 2015-02-16 14:35:23 -05:00
Paul Gilbert e7ffed76b4 XEEN: Implemented giveCharDamage 2015-02-16 11:42:29 -05:00
Filippos Karapetis f04ef8b728 ZVISION: Fix script bug #6793 in Zork Nemesis 2015-02-16 12:11:50 +02:00
Paul Gilbert 75a070de17 XEEN: Implementing combat methods 2015-02-15 20:47:56 -05:00
Johannes Schickel 6ed60538c6 CONFIGURE: Make SDL_CONFIG override work with a MinGW host. 2015-02-16 02:32:27 +01:00
Johannes Schickel 3745ddbefd WIN32: Add experimental SDL2 support. 
Based on changes by aquadran.
 2015-02-16 02:13:11 +01:00
Johannes Schickel 3f22c12c56 SDL: Handle icon setup in SdlWindow. 2015-02-16 01:25:22 +01:00
Johannes Schickel 627d766325 SDL: Add basic abstraction class for the SDL window. 2015-02-16 01:03:29 +01:00
Paul Gilbert ef2a4595c2 XEEN: Moved _openDoor into InterfaceMap 2015-02-15 15:01:22 -05:00
Paul Gilbert bdc8e73c1b XEEN: Fix walking through walls 2015-02-15 14:55:59 -05:00
Paul Gilbert 93e5fd7c20 XEEN: Moved more variables out of InterfaceMap that belong in Interface 2015-02-15 14:43:04 -05:00
Paul Gilbert adde24a338 XEEN: Move more code from InterfaceMap that should be in Interface class 2015-02-15 14:20:35 -05:00
Paul Gilbert 74b4d91f4a XEEN: Implemented startFalling 2015-02-15 14:10:37 -05:00
Filippos Karapetis 60e83c2d9c PEGASUS: Silence two MSVC warnings 2015-02-15 20:49:16 +02:00
Willem Jan Palenstijn f477de2009 SCI: Add more audio debugging output 2015-02-15 18:28:57 +01:00
Willem Jan Palenstijn 165a8c26b9 SCI: Fix version check for MIDI controller 4E 
This is only supported since SCI1 middle, as verified with xmas1990, SCI1 mgoose, SQ4 floppy, LSL1, Jones floppy.

Fixes missing sounds in Jones floppy.
 2015-02-15 18:28:57 +01:00
Paul Gilbert a90ad5b4c1 XEEN: Move drawMiniMap to Interface class 2015-02-15 12:26:23 -05:00
Paul Gilbert 6605a0c505 XEEN: Implemented more code from end of draw3d 2015-02-15 12:20:44 -05:00
Paul Gilbert cc9f62fcb9 XEEN: Split up draw3d between Interface and InterfaceMap, start of fall code 2015-02-15 12:01:04 -05:00
Paul Gilbert db325695f4 MADS: Fix proper cycling of idle animations 2015-02-15 11:07:33 -05:00
Paul Gilbert 7739e12e42 MADS: Stop player disappearing after cutscene of fish being eaten 2015-02-15 09:50:14 -05:00
Willem Jan Palenstijn 6dcc8b03b8 Merge branch 'sci_audio' 
This branch contains a number of improvements to how song priorities are
handled. We are now much closer to how SSCI treats priority.

It also increases the SCI savegame version from 31 to 33.
 2015-02-15 14:16:02 +01:00
Willem Jan Palenstijn 2b49b5f95e SCI: Fix sound object frame selector rate 
Thanks waltervn. Verified against asm (QfG2, KQ6CD)
 2015-02-15 14:14:46 +01:00
Willem Jan Palenstijn d0cb5f51fd SCI: Only allow a single 'playBed' song in SCI1early 2015-02-15 14:14:28 +01:00
Paul Gilbert 7658821afd MADS: Fix left screen clipping for scaled flipped sprites 2015-02-15 08:10:13 -05:00
Willem Jan Palenstijn 1c5722f014 SCI: Allow channel remapping from audio thread too 2015-02-15 14:05:56 +01:00
Willem Jan Palenstijn 5028487038 SCI: Use sound resource priority by default for songs 
SCI1 sound resources can have an embedded priority. We now use that by
default, unless an explicit DoSound/SetPriority call overrides it.
Thanks waltervn.

This fixes relative priority of songs in at least PQ3 room 29.

Also increase savegame version to 33.
 2015-02-15 14:05:36 +01:00
Willem Jan Palenstijn 0018bb0f6f SCI: Give songs that start playing later higher priority 2015-02-15 14:01:44 +01:00
Willem Jan Palenstijn 0aadd20aea SCI: Add debugging output 2015-02-15 14:01:35 +01:00
Willem Jan Palenstijn b80e74af5d SCI: Handle voice limits differently 
For playBed songs, SCI1early remappers didn't unmap the entire song when
there weren't enough voices for a channel. Thanks waltervn.
 2015-02-15 13:57:11 +01:00
Willem Jan Palenstijn e42a512357 SCI: Don't remap channels from playBed songs 2015-02-15 13:57:11 +01:00
Willem Jan Palenstijn 5964cc239b SCI: Always re-sort playlist in soundPlay 
Previously, it would only sort if a song wasn't already in the playlist.
Since initSound already adds it, this effectively prevented the list
from being sorted.
 2015-02-15 13:57:03 +01:00
Paul Gilbert 51561c80c0 MADS: Fix left edge screen clipping for non-scaled flipped sprites 2015-02-15 07:19:42 -05:00
Paul Gilbert 2c9ad1ee9b MADS: Fix death animations for seaweed and underwater mine 2015-02-14 21:34:09 -05:00
Paul Gilbert a505ae941c MADS: Fix picture when picking up timer module 2015-02-14 20:44:59 -05:00
Paul Gilbert be489d88e6 MADS: Fix palette loading for in-game dialogs 2015-02-14 18:03:45 -05:00
Paul Gilbert d31e602add MADS: Allow Escape key to close game options dialog 2015-02-14 16:54:47 -05:00