Paul Gilbert 9dddf76aa7 Merge remote branch 'remotes/dreammaster/tsage_sound' ...

Conflicts:
	engines/tsage/ringworld_scenes1.cpp
	engines/tsage/ringworld_scenes5.cpp
	engines/tsage/tsage.h

2011-06-19 21:14:49 +10:00

..

blueforce_logic.cpp

TSAGE: Add the skeletton of createScene()

2011-05-15 09:10:01 +02:00

blueforce_logic.h

TSAGE: Added skeleton game class for Blue Force

2011-05-14 18:19:35 +10:00

converse.cpp

TSAGE: Created stub classes for ASound and Sound, and reworked engine to use proper named methods

2011-05-24 21:22:21 +10:00

converse.h

TSAGE: Created stub classes for ASound and Sound, and reworked engine to use proper named methods

2011-05-24 21:22:21 +10:00

core.cpp

Merge remote branch 'remotes/dreammaster/tsage_sound'

2011-06-19 21:14:49 +10:00

core.h

Merge remote branch 'remotes/dreammaster/tsage_sound'

2011-06-19 21:14:49 +10:00

debugger.cpp

TSAGE: Cosmetic modification, for consistency

2011-05-25 23:39:03 +02:00

debugger.h

GIT: Clean up: Suppress SVN tags, now useless

2011-05-12 01:16:22 +02:00

detection_tables.h

TSAGE: flag all WIP games with ADGF_UNSTABLE

2011-06-16 13:37:58 -05:00

detection.cpp

DETECTOR: Merge ADParams into AdvancedMetaEngine

2011-06-14 18:17:01 +02:00

dialogs.cpp

TSAGE: Bugfix for assert when quitting whilst inventory dialog active

2011-06-04 17:31:08 +10:00

dialogs.h

GIT: Clean up: Suppress SVN tags, now useless

2011-05-12 01:16:22 +02:00

events.cpp

Merge remote branch 'remotes/dreammaster/tsage_sound'

2011-06-19 21:14:49 +10:00

events.h

TSAGE: Add extra event manager fields to savegames

2011-06-04 22:40:51 +10:00

globals.cpp

Merge remote branch 'remotes/dreammaster/tsage_sound'

2011-06-19 21:14:49 +10:00

globals.h

Merge remote branch 'remotes/dreammaster/tsage_sound'

2011-06-19 21:14:49 +10:00

graphics.cpp

TSAGE: Add support for saving in scene #6100

2011-06-04 20:40:09 +10:00

graphics.h

TSAGE: Add support for saving in scene #6100

2011-06-04 20:40:09 +10:00

module.mk

TSAGE: Moved scene creation into the Game class, and separated out the Ringworld demo scene creation to it's own game class

2011-05-14 18:20:56 +10:00

resources.cpp

TSAGE: Updated the separation of fields from the Sound class to the trackInfoStruct structure

2011-05-26 20:30:30 +10:00

resources.h

GIT: Clean up: Suppress SVN tags, now useless

2011-05-12 01:16:22 +02:00

ringworld_demo.cpp

Merge remote branch 'remotes/dreammaster/tsage_sound'

2011-06-19 21:14:49 +10:00

ringworld_demo.h

TSAGE: Created stub classes for ASound and Sound, and reworked engine to use proper named methods

2011-05-24 21:22:21 +10:00

ringworld_logic.cpp

Merge remote branch 'remotes/dreammaster/tsage_sound'

2011-06-19 21:14:49 +10:00

ringworld_logic.h

TSAGE: Added support for handling keypresses in the Game classes. Separated logic for full game versus demo into the respective Game classes.

2011-05-16 21:09:05 +10:00

ringworld_scenes1.cpp

Merge remote branch 'remotes/dreammaster/tsage_sound'

2011-06-19 21:14:49 +10:00

ringworld_scenes1.h

Merge remote branch 'remotes/dreammaster/tsage_sound'

2011-06-19 21:14:49 +10:00

ringworld_scenes2.cpp

TSAGE: Created stub classes for ASound and Sound, and reworked engine to use proper named methods

2011-05-24 21:22:21 +10:00

ringworld_scenes2.h

TSAGE: Created stub classes for ASound and Sound, and reworked engine to use proper named methods

2011-05-24 21:22:21 +10:00

ringworld_scenes3.cpp

Merge remote branch 'remotes/dreammaster/tsage_sound'

2011-06-19 21:14:49 +10:00

ringworld_scenes3.h

Merge remote branch 'remotes/dreammaster/tsage_sound'

2011-06-19 21:14:49 +10:00

ringworld_scenes4.cpp

TSAGE: Created stub classes for ASound and Sound, and reworked engine to use proper named methods

2011-05-24 21:22:21 +10:00

ringworld_scenes4.h

TSAGE: Created stub classes for ASound and Sound, and reworked engine to use proper named methods

2011-05-24 21:22:21 +10:00

ringworld_scenes5.cpp

Merge remote branch 'remotes/dreammaster/tsage_sound'

2011-06-19 21:14:49 +10:00

ringworld_scenes5.h

TSAGE: Created stub classes for ASound and Sound, and reworked engine to use proper named methods

2011-05-24 21:22:21 +10:00

ringworld_scenes6.cpp

Merge remote branch 'remotes/dreammaster/tsage_sound'

2011-06-19 21:14:49 +10:00

ringworld_scenes6.h

TSAGE: Created stub classes for ASound and Sound, and reworked engine to use proper named methods

2011-05-24 21:22:21 +10:00

ringworld_scenes8.cpp

Merge remote branch 'remotes/dreammaster/tsage_sound'

2011-06-19 21:14:49 +10:00

ringworld_scenes8.h

TSAGE: Created stub classes for ASound and Sound, and reworked engine to use proper named methods

2011-05-24 21:22:21 +10:00

ringworld_scenes10.cpp

Merge remote branch 'remotes/dreammaster/tsage_sound'

2011-06-19 21:14:49 +10:00

ringworld_scenes10.h

TSAGE: Created stub classes for ASound and Sound, and reworked engine to use proper named methods

2011-05-24 21:22:21 +10:00

saveload.cpp

TSAGE: Add extra event manager fields to savegames

2011-06-04 22:40:51 +10:00

saveload.h

TSAGE: Add support for saving in scene #6100

2011-06-04 20:40:09 +10:00

scenes.cpp

TSAGE: Cosmetic tweaks to Scene::setZoomPercents.

2011-05-27 21:44:41 +02:00

scenes.h

TSAGE: Added support for handling keypresses in the Game classes. Separated logic for full game versus demo into the respective Game classes.

2011-05-16 21:09:05 +10:00

sound.cpp

TSAGE: Cleaned up the write() method

2011-06-19 20:17:47 +10:00

sound.h

TSAGE: Bugfix for correctly persisting patch data

2011-06-15 00:08:40 +10:00

staticres.cpp

TSAGE: Added support for handling keypresses in the Game classes. Separated logic for full game versus demo into the respective Game classes.

2011-05-16 21:09:05 +10:00

staticres.h

TSAGE: Added support for handling keypresses in the Game classes. Separated logic for full game versus demo into the respective Game classes.

2011-05-16 21:09:05 +10:00

tsage.cpp

Merge remote branch 'remotes/dreammaster/tsage_sound'

2011-06-19 21:14:49 +10:00

tsage.h

Merge remote branch 'remotes/dreammaster/tsage_sound'

2011-06-19 21:14:49 +10:00