diff options
| author | Marisa-Chan | 2014-06-13 21:43:04 +0700 |
|---|---|---|
| committer | Marisa-Chan | 2014-06-13 21:43:04 +0700 |
| commit | 45589950c0fb1a449351e6a00ef10d42290d8bae (patch) | |
| tree | 44e4eedcb7e69d5fc386155b000ed038af07251d /dists/engine-data | |
| parent | 48360645dcd5f8fddb135b6e31ae5cae4be8d77f (diff) | |
| parent | 5c005ad3a3f1df0bc968c85c1cf0fc48e36ab0b2 (diff) | |
| download | scummvm-rg350-45589950c0fb1a449351e6a00ef10d42290d8bae.tar.gz scummvm-rg350-45589950c0fb1a449351e6a00ef10d42290d8bae.tar.bz2 scummvm-rg350-45589950c0fb1a449351e6a00ef10d42290d8bae.zip | |
Merge remote-tracking branch 'upstream/master' into zvision
Conflicts:
engines/zvision/animation/rlf_animation.cpp
engines/zvision/animation_control.h
engines/zvision/core/console.cpp
engines/zvision/core/events.cpp
engines/zvision/cursors/cursor.cpp
engines/zvision/cursors/cursor_manager.cpp
engines/zvision/cursors/cursor_manager.h
engines/zvision/fonts/truetype_font.cpp
engines/zvision/graphics/render_manager.cpp
engines/zvision/graphics/render_manager.h
engines/zvision/inventory/inventory_manager.h
engines/zvision/inventory_manager.h
engines/zvision/meta_animation.h
engines/zvision/module.mk
engines/zvision/scripting/actions.cpp
engines/zvision/scripting/control.h
engines/zvision/scripting/controls/animation_control.cpp
engines/zvision/scripting/controls/animation_control.h
engines/zvision/scripting/controls/input_control.cpp
engines/zvision/scripting/controls/lever_control.cpp
engines/zvision/scripting/controls/timer_node.cpp
engines/zvision/scripting/controls/timer_node.h
engines/zvision/scripting/puzzle.h
engines/zvision/scripting/scr_file_handling.cpp
engines/zvision/scripting/script_manager.cpp
engines/zvision/scripting/script_manager.h
engines/zvision/sidefx.cpp
engines/zvision/sound/zork_raw.cpp
engines/zvision/sound/zork_raw.h
engines/zvision/video/video.cpp
engines/zvision/video/zork_avi_decoder.h
engines/zvision/zvision.cpp
engines/zvision/zvision.h
Diffstat (limited to 'dists/engine-data')
| -rw-r--r-- | dists/engine-data/README | 5 | ||||
| -rw-r--r-- | dists/engine-data/kyra.dat | bin | 486382 -> 485978 bytes | |||
| -rw-r--r-- | dists/engine-data/lure.dat | bin | 637824 -> 637824 bytes | |||
| -rw-r--r-- | dists/engine-data/neverhood.dat | bin | 25416 -> 23804 bytes |
4 files changed, 4 insertions, 1 deletions
diff --git a/dists/engine-data/README b/dists/engine-data/README index 9bbb006d17..e87f04c65b 100644 --- a/dists/engine-data/README +++ b/dists/engine-data/README @@ -21,6 +21,9 @@ File created partially by extracting font data from the French executable. It also contains the French and German translation, as well as a custom-made English translation. +neverhood.dat: +TODO + queen.tbl: 'queen.tbl' contains a list of filenames, filesizes and offsets for the individual files saved in QUEEN.1. This data was originally included in the @@ -38,4 +41,4 @@ tony.dat: This file contains the font table used by the different versions of the game. toon.dat: -'toon.dat' contains all the strings hardcoded in the original executables. +This file contains all the strings hardcoded in the original executables. diff --git a/dists/engine-data/kyra.dat b/dists/engine-data/kyra.dat Binary files differindex 305c7e665c..37b3b0ef0b 100644 --- a/dists/engine-data/kyra.dat +++ b/dists/engine-data/kyra.dat diff --git a/dists/engine-data/lure.dat b/dists/engine-data/lure.dat Binary files differindex 4e0d2894af..8ca69224da 100644 --- a/dists/engine-data/lure.dat +++ b/dists/engine-data/lure.dat diff --git a/dists/engine-data/neverhood.dat b/dists/engine-data/neverhood.dat Binary files differindex dc95c00965..2f1bc4b522 100644 --- a/dists/engine-data/neverhood.dat +++ b/dists/engine-data/neverhood.dat |