strangerke
|
fd1ad6b5a6
|
Merge branch 'tsage' of http://github.com/dreammaster/scummvm
Conflicts:
engines/tsage/ringworld_logic.cpp
engines/tsage/ringworld_logic.h
|
2011-03-31 20:19:57 +02:00 |
|
Paul Gilbert
|
8c02f87e55
|
TSAGE: Implemented Scene 4301 - Village - Slaver Ship Keypad
|
2011-03-31 22:10:32 +11:00 |
|
strangerke
|
05df97214e
|
TSAGE: Add scene 9150
|
2011-03-31 01:18:50 +02:00 |
|
strangerke
|
9a0693d168
|
TSAGE: Implement scene 9100
|
2011-03-30 21:59:20 +02:00 |
|
Paul Gilbert
|
bf8d5f3d28
|
TSAGE: Implemented Scene 4300 - Slaver Ship
|
2011-03-31 00:38:09 +11:00 |
|
strangerke
|
f208c33593
|
TSAGE: Implement scene 7700.
Also move doAction() to core when related to sceneHostpot_3.
|
2011-03-29 12:10:00 +02:00 |
|
Paul Gilbert
|
519057fbf7
|
TSAGE: Implemented Scene #4250 - Village - Near Slaver Ship
|
2011-03-28 22:30:54 +11:00 |
|
strangerke
|
e18230f042
|
TSAGE: Implement scene 9350
|
2011-03-28 08:28:08 +02:00 |
|
strangerke
|
1b0d5e8877
|
Merge branch 'tsage' of http://github.com/dreammaster/scummvm
Conflicts:
engines/tsage/module.mk
engines/tsage/ringworld_logic.cpp
engines/tsage/ringworld_logic.h
engines/tsage/ringworld_scenes1.cpp
engines/tsage/staticres.cpp
engines/tsage/staticres.h
|
2011-03-27 15:23:48 +02:00 |
|
strangerke
|
6a9991a027
|
TSAGE: Fix compilation after merge
|
2011-03-27 14:37:50 +02:00 |
|
strangerke
|
2caaf045f6
|
Merge remote branch 'dreammaster/tsage'
Conflicts:
engines/tsage/module.mk
engines/tsage/ringworld_logic.cpp
engines/tsage/ringworld_logic.h
|
2011-03-27 14:29:21 +02:00 |
|
strangerke
|
ea744d0b2e
|
TSAGE: Implement Scene 9750
|
2011-03-27 14:25:04 +02:00 |
|
Paul Gilbert
|
4c804b9d93
|
TSAGE: Implemented Scene #4150 - Village - Bedroom
|
2011-03-27 22:43:34 +11:00 |
|
strangerke
|
2a911701bc
|
TSAGE: Implement Scene 9999
|
2011-03-27 01:19:44 +01:00 |
|
strangerke
|
1827c7e742
|
TSAGE: Implement Scene 7700
|
2011-03-25 23:28:19 +01:00 |
|
Paul Gilbert
|
0b9d36cb6b
|
TSAGE: In progress implementation of Scene #4100
|
2011-03-24 22:49:20 +11:00 |
|
Paul Gilbert
|
44b466512f
|
TSAGE: Initial implementation of Scene #4050
|
2011-03-24 00:27:41 +11:00 |
|
Paul Gilbert
|
f612695a33
|
TSAGE: Implemented Scene #4045 - Temple Antechamber
|
2011-03-23 22:56:51 +11:00 |
|
Paul Gilbert
|
71354fdf13
|
TSAGE: Initial implementation of Scene #4025
|
2011-03-23 00:31:29 +11:00 |
|
Paul Gilbert
|
0e35331302
|
TSAGE: Implemented Scene #4010 - Village - By Lander
|
2011-03-22 20:45:27 +11:00 |
|
Paul Gilbert
|
66ad86397e
|
TSAGE: Bugfixes for animations in Scene #4000
|
2011-03-21 23:42:16 +11:00 |
|
strangerke
|
b2ce645c1e
|
TSAGE: Cleanup after git merge epic failure
|
2011-03-21 08:33:55 +01:00 |
|
strangerke
|
efaa811d42
|
TSAGE: Add some comments about Scenes in group #8
|
2011-03-21 08:23:47 +01:00 |
|
strangerke
|
2b22b9e8fb
|
TSAGE: Scene 7000 (imperfect)
|
2011-03-21 08:23:45 +01:00 |
|
strangerke
|
09fc6d6ee4
|
TSAGE: Implement scene7600
|
2011-03-21 08:18:27 +01:00 |
|
Paul Gilbert
|
1c6d46ce83
|
TSAGE: Added new speaker classes
|
2011-03-21 08:15:46 +01:00 |
|
Paul Gilbert
|
08918b512e
|
TSAGE: Initial implementation of Scene #3700 - Remote Viewer
|
2011-03-21 08:08:34 +01:00 |
|
Paul Gilbert
|
51602483a4
|
TSAGE: Implemented Scene #3500 - Ringworld Scan
|
2011-03-21 08:08:33 +01:00 |
|
Paul Gilbert
|
b1af590298
|
TSAGE: Corrected bugs in Scene #1400 - Ringworld Wall
|
2011-03-21 08:07:17 +01:00 |
|
Paul Gilbert
|
dd29c4695f
|
TSAGE: Implemented Scene 2400 - Descending in Lander
|
2011-03-21 08:07:16 +01:00 |
|
strangerke
|
3ed9e9f575
|
TSAGE: Implement scene 7100.
There's a problem with _object1 and _action11: a NPC doesn't start
|
2011-03-20 23:48:22 +01:00 |
|
strangerke
|
bdafdbd485
|
TSAGE: Implement scene 7300
|
2011-03-20 14:30:26 +01:00 |
|
Paul Gilbert
|
e2af308ad2
|
TSAGE: Added new speaker classes
|
2011-03-20 20:26:09 +11:00 |
|
Paul Gilbert
|
ae29b57edb
|
TSAGE: Initial implementation of Scene #3700 - Remote Viewer
|
2011-03-20 11:12:11 +11:00 |
|
strangerke
|
c1abad7a79
|
TSAGE: Implement scene 7200, fix some bugs in scene 7000
|
2011-03-19 20:11:37 +01:00 |
|
Paul Gilbert
|
eb1c1e7e6a
|
TSAGE: Implemented Scene #3500 - Ringworld Scan
|
2011-03-19 22:46:19 +11:00 |
|
Paul Gilbert
|
88b909b26d
|
TSAGE: Corrected bugs in Scene #1400 - Ringworld Wall
|
2011-03-19 22:16:29 +11:00 |
|
Paul Gilbert
|
ec7e751911
|
TSAGE: Implemented Scene 2400 - Descending in Lander
|
2011-03-19 21:07:04 +11:00 |
|
strangerke
|
03f9f0e740
|
TSAGE: Scene 7000 (imperfect)
|
2011-03-19 00:05:38 +01:00 |
|
strangerke
|
6ddfd24c26
|
TSAGE: Implement scene7600
|
2011-03-16 21:28:13 +01:00 |
|
Paul Gilbert
|
aec1aa0b52
|
TSAGE: In progress implementation of Scene #2320 - Starcraft - Hanger Bay
|
2011-03-12 22:01:41 +11:00 |
|
Paul Gilbert
|
7e0d120ce1
|
TSAGE: Separated out detection tables into the standard detection_tables.h
|
2011-03-12 17:21:55 +11:00 |
|
Paul Gilbert
|
56db3c17a5
|
TSAGE: Implemented Scene 2300 - Starcraft - Hanger Bay
|
2011-03-12 10:56:20 +11:00 |
|
Paul Gilbert
|
e725a69a60
|
TSAGE: Completed Scene 2280 - Spaceship - Store-room
|
2011-03-09 22:41:57 +11:00 |
|
Paul Gilbert
|
4d41b13890
|
TSAGE: Implemented Scene 2230 - Quinn's Room
|
2011-03-09 19:03:10 +11:00 |
|
Paul Gilbert
|
e5888ff6de
|
TSAGE: Renamed the core engine Action2 class to ActionExt to avoid naming clashes with scenes
|
2011-03-08 22:19:30 +11:00 |
|
Paul Gilbert
|
0c5fdebbd2
|
TSAGE: Completed Implementation of Scene 2200 - Spaceship - AutoDoc
|
2011-03-08 21:24:30 +11:00 |
|
Paul Gilbert
|
b0dfe962e6
|
TSAGE: In progress implementation of Scene 2200
|
2011-03-08 00:05:10 +11:00 |
|
Paul Gilbert
|
3cb933fcc9
|
TSAGE: Implemented Scene 2150 - SpaceShip Level 2
|
2011-03-07 22:04:39 +11:00 |
|
Paul Gilbert
|
9df6d50813
|
TSAGE: Implemented Scene #2120 - Encyclopedia
|
2011-03-06 16:34:55 +11:00 |
|