Commit Graph

11 Commits

Author SHA1 Message Date
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
cd6ee0589d JANITORIAL: Format forward declarations to follow convention 2011-04-28 12:20:34 +03:00
Scott Thomas
8e9dbe5c3d GROOVIE: Use uint32 when searching for a video id by name
This brings ResMan::getRef into line with the rest of the engine.
2011-04-15 21:46:06 +09:30
Scott Thomas
5c4d7baa06 GROOVIE: Determine correct MPEG4 resource to load for based on fileref 2011-04-08 21:08:47 +09:30
Scott Thomas
c44b509b05 GROOVIE: Store resource name in ResInfo struct 2011-04-08 21:00:59 +09:30
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
92c896d883 Patch #2973290: Semicolon cleanup
svn-id: r48359
2010-03-22 20:28:08 +00:00
Scott Thomas
2f61d7d77b - Convert some file references from uint16 to uint32 to suit 11H
- Add some 11H opcodes

svn-id: r39313
2009-03-10 21:54:45 +00:00
Max Horn
bb87d39424 Patch #2271425: Groovie engine
svn-id: r35060
2008-11-14 21:32:20 +00:00