strangerke
|
753dcda503
|
Merge branch 'tsage' of http://github.com/dreammaster/scummvm
Conflicts:
engines/tsage/module.mk
engines/tsage/ringworld_logic.cpp
|
2011-04-02 18:06:53 +02:00 |
|
strangerke
|
80f51e5768
|
TSAGE: Implement Scene 9360, move Scene9350::Object1 to a separated subclass, Fix bug in scene 9350
|
2011-04-02 18:00:58 +02:00 |
|
Paul Gilbert
|
499d1751c7
|
TSAGE: Fixed zoom problems with viewscreen in Scene 3700
|
2011-04-02 20:00:29 +11:00 |
|
Paul Gilbert
|
2103c93afd
|
TSAGE: Bugfixes for Scene 3700 - Remote Viewer
|
2011-04-02 19:47:41 +11:00 |
|
Paul Gilbert
|
a8bed05922
|
TSAGE: Fixed bug with decoding large compressed resources
|
2011-04-02 18:50:02 +11:00 |
|
strangerke
|
65e5a51eaf
|
TSAGE: Add Scene2 class for scene group 10, getting rid of _field30A
|
2011-04-02 09:36:13 +02:00 |
|
strangerke
|
068fb01747
|
TSAGE: Implement Scene 9300
|
2011-04-02 08:23:55 +02:00 |
|
Paul Gilbert
|
cbfe04fc1f
|
TSAGE: Implemented Scene 5000 - Caverns - Entrance
|
2011-04-02 11:30:20 +11:00 |
|
strangerke
|
8d0feb01b9
|
TSAGE: Implement scene 9200
|
2011-04-01 23:47:39 +02:00 |
|
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 |
|
strangerke
|
8bb6b94080
|
TSAGE: Fix Scene9350:Object1::postInit (thanks dreammaster), first real uses of quickInit
|
2011-03-31 20:09:40 +02:00 |
|
Paul Gilbert
|
8c02f87e55
|
TSAGE: Implemented Scene 4301 - Village - Slaver Ship Keypad
|
2011-03-31 22:10:32 +11:00 |
|
strangerke
|
28d62b22ea
|
TSAGE: Add new sceneObject
|
2011-03-31 01:19:44 +02:00 |
|
strangerke
|
05df97214e
|
TSAGE: Add scene 9150
|
2011-03-31 01:18:50 +02:00 |
|
strangerke
|
8d25157923
|
TSAGE: remove useless variable
|
2011-03-31 01:18:32 +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
|
f4e2cda89d
|
TSAGE: Cast fmt into a SceneObject in Scene7700.
This makes the drawers useable, even if there's still a problem with _globals->_parent._field8C
(the animation displayed is always a closing drawer)
|
2011-03-29 21:14:16 +02: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
|
69ee2ff09e
|
TSAGE: Fix compilation
|
2011-03-27 15:25:34 +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 |
|
Paul Gilbert
|
99de6343c0
|
TSAGE: Completed scene #4100 - Village - Chief's Hut
|
2011-03-26 22:41:03 +11:00 |
|
Paul Gilbert
|
c0b376ad9a
|
TSAGE: Implemented objects in Scene #4100
|
2011-03-26 22:12:16 +11:00 |
|
strangerke
|
af80cb99ab
|
TSAGE: Fix some bugs in scene7700, rename some known objects
|
2011-03-26 09:32:55 +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
|
5e6cc67e2e
|
TSAGE: Implemented Scene #4025 - Village - Puzzle Board
|
2011-03-23 19:16:09 +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
|
df80ff2f51
|
TSAGE: Implemented Scene #4000 - Village
|
2011-03-22 19:05:11 +11:00 |
|
Paul Gilbert
|
66ad86397e
|
TSAGE: Bugfixes for animations in Scene #4000
|
2011-03-21 23:42:16 +11:00 |
|
Paul Gilbert
|
4c765a0e64
|
TSAGE: In progress work on Scene #4000
|
2011-03-21 23:04:18 +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 |
|