Commit Graph

34 Commits

Author SHA1 Message Date
Willem Jan Palenstijn
6ec9c81b57 Merge branch 'master' into mm
Conflicts:
	engines/access/access.cpp
	engines/access/asurface.h
	engines/access/bubble_box.cpp
	engines/access/bubble_box.h
	engines/access/martian/martian_game.cpp
	engines/access/player.cpp
	engines/access/player.h
	engines/access/resources.cpp
	engines/access/screen.cpp
	engines/access/screen.h
	engines/access/sound.cpp
	engines/access/sound.h
2015-07-22 22:43:42 +02:00
Torbjörn Andersson
5de5a7afaa ACCESS: Use looping audio stream for Amazon intro's projector sound
This is less prone to glitches than playing manually triggering the
playing of the short non-looping version of the sound.
2015-07-09 23:45:12 +02:00
Strangerke
e83e55e7be ACCESS: MM - Implement the display of notes at the beginning of chapters (WIP) 2015-01-01 15:35:20 +01:00
Strangerke
576bab349c ACCESS: Use loadSoundTable instead of push_back in several places 2014-12-27 17:21:04 +01:00
Strangerke
6a7834a05e ACCESS: Rename loadSoundTable 2014-12-27 16:55:07 +01:00
Strangerke
3c3ff0a3aa ACCESS: Remove two useless variables 2014-12-27 16:46:33 +01:00
Strangerke
6fe9bdf6c6 ACCESS: Fix speech 2014-12-27 16:06:32 +01:00
Strangerke
39eab59388 ACCESS: Rewrite sound queueing (WIP) 2014-12-27 15:31:43 +01:00
Strangerke
492d974550 ACCESS: Some more polishing in the file headers 2014-12-17 18:27:47 +01:00
Strangerke
712a18d050 ACCESS: Fix compilation errors reported by Criezy 2014-12-12 23:08:18 -05:00
Strangerke
8d97dc9891 ACCESS: stops the SFX sounds in the intro at the end of the countdown 2014-12-12 23:04:44 -05:00
Strangerke
11870c4144 ACCESS: Implement music player (WIP) 2014-12-12 22:54:52 -05:00
Strangerke
f364782d05 ACCESS: Some rework in MusicManager 2014-12-12 22:54:42 -05:00
Strangerke
11e920f427 ACCESS: Split SoundManager and MusicManager 2014-12-12 22:53:43 -05:00
Strangerke
43f7fe9182 ACCESS: Implement doCast 2014-12-12 22:35:51 -05:00
Paul Gilbert
dc218d53ef ACCESS: Merge the sound resource and priority lists 2014-12-12 22:24:34 -05:00
Strangerke
2805dcaa7b ACCESS: Implement freeSounds 2014-12-12 22:20:32 -05:00
Strangerke
335acfac89 ACCESS: Implement newMusic() 2014-12-12 22:20:16 -05:00
Paul Gilbert
5a6a44f1c6 ACCESS: Wait for keypress in speakText if voice is turned off 2014-10-19 14:49:20 -04:00
Paul Gilbert
78bf011a8b ACCESS: Fix playSound stub 2014-08-30 20:50:25 -04:00
Paul Gilbert
f869019d30 ACCESS: Implemented cmdDead 2014-08-30 17:17:19 -04:00
Paul Gilbert
d2cb9d4c43 ACCESS: Implemented cmdFreeSound 2014-08-28 22:15:39 -04:00
Paul Gilbert
1d8f23985a ACCESS: Implement loadSounds 2014-08-28 20:24:25 -04:00
Paul Gilbert
e57d7e8782 ACCESS: Implemented playVideo 2014-08-28 20:02:35 -04:00
Paul Gilbert
c0a7852662 ACCESS: Refactor the file manager to return resource structures 2014-08-27 22:13:43 -04:00
Strangerke
6774dd4246 ACCESS: Implement speakText() 2014-08-24 18:49:34 +02:00
Paul Gilbert
1e2d79eb59 ACCESS: Implement more opcodes, stubbed beginning of video player 2014-08-23 14:13:26 -04:00
Paul Gilbert
0183007d0b ACCESS: Fixes for loading room data 2014-08-07 20:31:42 -04:00
Paul Gilbert
031cc32c84 ACCESS: Implemented room data loading 2014-08-06 22:43:40 -04:00
Paul Gilbert
c4d6dc3763 ACCESS: Added room clearing 2014-08-06 08:28:20 -04:00
Paul Gilbert
7d605ce573 ACCESS: Implement outer room handler 2014-08-05 22:17:30 -04:00
Paul Gilbert
04d42638cd ACCESS: Fleshed out beginning of title sequence, added Screen::clip 2014-08-04 09:21:39 -04:00
Paul Gilbert
7a63e12edb ACCESS: Added screen loading and file index load fixes 2014-08-02 17:09:28 -04:00
Paul Gilbert
a35ba4caf9 ACCESS: Adding file loading 2014-08-02 15:14:42 -04:00