Commit Graph

53 Commits

Author SHA1 Message Date
Eugene Sandulenko
0dafa7f80f ALL: Reduce audio/ header dependency 2011-08-06 11:30:42 +01:00
D G Turner
938415aca1 GROOVIE: Remove Unecessary debugger errorString() function. 2011-06-03 13:58:06 +01:00
Matthew Hoops
5bb4ef13c5 GROOVIE: Rename MusicPlayerMPEG4 to MusicPlayerIOS
More fitting now that other music formats can be used now
2011-05-31 14:25:20 -04:00
Matthew Hoops
aa49b38c5a Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
	engines/groovie/script.cpp
2011-05-31 14:16:29 -04:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Matthew Hoops
a1d41da096 Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
	audio/decoders/qdm2.h
	common/util.cpp
	engines/groovie/music.cpp
	engines/groovie/resource.h
	video/qt_decoder.cpp
	video/qt_decoder.h
2011-05-11 00:30:28 -04: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
Scott Thomas
2e59957471 GROOVIE: T7G iOS isn't a CD game - don't check or prompt user 2011-04-11 19:33:01 +09:30
Matthew Hoops
af59f33b7b GROOVIE: Add a stub MPEG4 music player 2011-04-07 10:52:58 -04:00
Scott Thomas
d5ff478100 GROOVIE: Fix brace formatting. 2011-04-08 00:17:59 +09:30
Scott Thomas
7c39b844b8 GROOVIE: Add additional play-speed modes to T7G.
These two speed modes enable faster movement throughout the mansion.
iOS mode matches the behavior of the official iOS release while
tweaked mode additionally uses original framerate for 'teeth'
animations.
2011-04-07 23:38:35 +09:30
dhewg
79ba16a89d GROOVIE: Set global volume levels 2011-03-19 16:04:52 +01:00
Max Horn
42ab839dd6 AUDIO: Rename sound/ dir to audio/
svn-id: r55850
2011-02-09 01:09:01 +00:00
Max Horn
059944e59c COMMON: Push #include audiocd.h in system.h out to .cpp files
svn-id: r54148
2010-11-08 23:07:42 +00:00
Johannes Schickel
75e8452b6e OPENGL: Merged from trunk, from rev 52105 to 53396.
This includes an rather hacky attempt to merge all the recent gp2x backend
changes into the branch. I suppose the gp2x backend and probably all new
backends, i.e. gph, dingux etc., might not compile anymore.

Since I have no way of testing those it would be nice if porters could look
into getting those up to speed in this branch.

svn-id: r53399
2010-10-13 03:57:44 +00:00
Jordi Vilalta Prat
806ee79a7b GROOVIE: Improve sound handling.
- Obey the mute setting.
- Report the supported music types.

svn-id: r52633
2010-09-08 09:37:33 +00:00
Alejandro Marzini
fb4086cadb Merged from trunk, from Rev 50841 to HEAD
svn-id: r51495
2010-07-30 05:28:09 +00:00
Max Horn
1d4c82885d DEBUGGER: Simplify how our console debugger works / is used
* Remove _isAttached member var and isAttached method
* Engines now always call the onFrame method; whether it does
  something is decided by the debugger class resp. its subclasses
* Make detach() protected instead of private, so that subclasses
  can invoke it
* Remove _detach_now member var (call detach() instead).
* Rename _frame_countdown to _frameCountdown and properly
  document it.
* Add more doxygen comments
* Cleanup

svn-id: r50963
2010-07-17 18:38:42 +00:00
Alejandro Marzini
609e08d5db Merged from trunk, from Rev 49499 to HEAD
svn-id: r50840
2010-07-13 04:31:15 +00:00
Matthew Hoops
1a675dcd86 Add support for the 'fallback' MIDI in T7G's intro when the CD track cannot be found. The intro music in the Mac version now plays.
svn-id: r50564
2010-07-01 18:47:27 +00:00
Alejandro Marzini
e1ef3cd9fc Renamed getAudioCD to getAudioCDManager.
svn-id: r49678
2010-06-15 04:13:12 +00:00
Alejandro Marzini
e991cd8c53 - Revised abstract AudioCDManager.
- Removed AudioCDManager Singleton, and changed code for using AudioCDManager in OSystem.
- Added initialization code for new AudioCDManager in BaseBackend and OSystem_SDL.

svn-id: r49548
2010-06-09 20:09:57 +00:00
Jordi Vilalta Prat
0e95d8a5fa Groovie:
- Rewritten T7G's font code to subclass Graphics::Font and make it cleaner.
- Use theme fonts for the Mac version of T7G (which used ugly system fonts
  originally). With this the Mac version should be completable.
- Cleanup include interdependencies.

svn-id: r49487
2010-06-07 17:14:42 +00:00
Matthew Hoops
1c0ffdc42d Add support for loading T7G Mac resources using the MacResManager.
svn-id: r49005
2010-05-11 15:41:31 +00:00
Max Horn
970745e60c Move DebugChannel related code to new header
svn-id: r48935
2010-05-04 11:59:22 +00:00
Max Horn
b3e404109c Move initGraphics and initCommonGFX from to new header.
These functions are only used internally be Engine subclasses, and
by moving them to a separate header we can reduce indirect header
dependencies.

svn-id: r48934
2010-05-04 11:58:12 +00:00
Max Horn
5568a8473b Get rid of Engine::_gameDataDir.
This greatly reduces indirect dependencies on several header files
from common.

svn-id: r48933
2010-05-04 11:56:52 +00:00
Max Horn
460d69e885 COMMON: Move DebugChannel stuff into a new DebugMan singleton
svn-id: r48821
2010-04-27 21:40:52 +00:00
Max Horn
ebcb9b0ff0 GROOVIE: Reduce header interdependency
svn-id: r46116
2009-11-23 23:53:25 +00:00
Filippos Karapetis
2dbd096dd5 Changed _script to be a pointer, in order to control its creation/destruction, like the rest of the groovie engine parts, and resolve a potential issue that Microsoft claims to be severe (warning C4355, read more here: http://msdn.microsoft.com/en-us/library/3c594ae3.aspx)
svn-id: r44303
2009-09-24 10:58:00 +00:00
Johannes Schickel
c50940bbf4 Got rid of Common::File::addDefaultDirectory, instead implemented the solution proposed in "Case agnostic handling for directories (and files)" on -devel.
svn-id: r44266
2009-09-23 00:15:00 +00:00
Scott Thomas
58f8ec5d57 Groovie: Sync changes from 16bpp branch. Hopefully no regressions sneak in here
svn-id: r43598
2009-08-21 13:57:03 +00:00
Jordi Vilalta Prat
6d3b2ec3af - Refactorized Groovie::MusicPlayer to make it extensible
- Added an empty MusicPlayerMac to let the Macintosh version of The 7th Guest start

svn-id: r42116
2009-07-05 09:34:54 +00:00
Jordi Vilalta Prat
d7308e9e3d Fix groovie's GUI game options
svn-id: r41528
2009-06-14 22:10:17 +00:00
Jordi Vilalta Prat
940f19dc23 Groovie: Initial support for different opcode sets
svn-id: r39282
2009-03-10 00:19:44 +00:00
Jordi Vilalta Prat
e5e733781e Groovie: Merged init() and go() into run()
svn-id: r39023
2009-03-01 09:12:32 +00:00
Paul Gilbert
4e66e6db70 Fixed compiler warning about loss of precision
svn-id: r38222
2009-02-15 10:32:06 +00:00
Max Horn
7cb437b56f Renamed SpecialDebugLevel to DebugChannel
svn-id: r36142
2009-01-30 05:10:24 +00:00
Jordi Vilalta Prat
59d41b30ff Show the cursor and update it properly when closing the GMM.
svn-id: r35858
2009-01-14 03:09:19 +00:00
Henry Bush
9446bfa503 T7G: Stage one of move to ScummVM's CursorMan: rename groovie one so it doesn't have same name
svn-id: r35793
2009-01-08 23:06:08 +00:00
Jordi Vilalta Prat
1f63a1dfcd Fix an invalid access when the quit opcode occupies the last byte of the script, due to the quit status being updated by the event loop
svn-id: r35779
2009-01-07 23:05:28 +00:00
Jordi Vilalta Prat
7122248c72 Use the proper samples file name for 11h
svn-id: r35656
2009-01-01 22:49:44 +00:00
Eugene Sandulenko
696897b058 Whoa! Removing trailing spaces.
svn-id: r35648
2009-01-01 15:06:43 +00:00
Scott Thomas
bc378bdb8f Fix for dialogue from Stauf and Ego during puzzles.
svn-id: r35620
2008-12-30 10:19:16 +00:00
Matthew Hoops
a159fc8937 Update detection of the 11th hour demo. The disk.1 wasn't with the other files.
svn-id: r35509
2008-12-23 21:17:39 +00:00
Matthew Hoops
be66a538b4 add detection for The 11th Hour demo
svn-id: r35469
2008-12-21 17:53:38 +00:00
Henry Bush
ffaa47fb44 T7G: Stop errorString from printing script position
svn-id: r35194
2008-11-30 21:16:04 +00:00
Henry Bush
184c15905d T7G: Add a debug level to play movies fast with no pcm sound (unstable)
svn-id: r35165
2008-11-24 21:48:40 +00:00
Henry Bush
ba3edfbd51 T7G: AI in microscope puzzle is "complete" (ie good enough for now)
svn-id: r35164
2008-11-24 21:22:24 +00:00
Henry Bush
e1fdb1f882 T7G: Two leftover commits from t7gre: fix broken palette on intro video, and add scriptvar debug flag
svn-id: r35095
2008-11-16 19:20:30 +00:00