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 /gui/credits.h | |
| 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 'gui/credits.h')
| -rw-r--r-- | gui/credits.h | 37 |
1 files changed, 35 insertions, 2 deletions
diff --git a/gui/credits.h b/gui/credits.h index aca3745631..d5c12515d3 100644 --- a/gui/credits.h +++ b/gui/credits.h @@ -77,7 +77,7 @@ static const char *credits[] = { "C0""Ludvig Strigeus", "C2""(retired)", "", -"C1""AVALANCHE", +"C1""Avalanche", "A0""Peter Bozso", "C0""Peter Bozs\363", "A0""Arnaud Boutonne", @@ -168,6 +168,12 @@ static const char *credits[] = { "C0""Benjamin Haisch", "C0""Filippos Karapetis", "", +"C1""MADS", +"A0""Arnaud Boutonne", +"C0""Arnaud Boutonn\351", +"C0""Paul Gilbert", +"C0""Filippos Karapetis", +"", "C1""Mohawk", "C0""Bastien Bouclet", "C0""Matthew Hoops", @@ -299,6 +305,11 @@ static const char *credits[] = { "C0""Gregory Montoir", "C2""(retired)", "", +"C1""Voyeur", +"A0""Arnaud Boutonne", +"C0""Arnaud Boutonn\351", +"C0""Paul Gilbert", +"", "C1""Wintermute", "A0""Einar Johan T. Somaaen", "C0""Einar Johan T. S\370m\345en", @@ -522,7 +533,7 @@ static const char *credits[] = { "C0""Johannes Schickel", "", "", -"C1""Translations", +"C1""GUI Translations", "C0""Thierry Crozat", "C2""Translation Lead", "C1""Basque", @@ -592,6 +603,28 @@ static const char *credits[] = { "C0""Lubomyr Lisen", "", "", +"C1""Game Translations", +"C1""CGE", +"C0""Dan Serban", +"C2""Soltys English translation", +"A0""Victor Gonzalez", +"C0""V\355ctor Gonz\341lez", +"C2""Soltys Spanish translation", +"A0""Alejandro Gomez de la Munoza", +"C0""Alejandro G\363mez de la Mu\361oza", +"C2""Soltys Spanish translation", +"", +"C1""Drascula", +"C0""Thierry Crozat", +"C2""Improve French translation", +"", +"C1""Mortevielle", +"C0""Hugo Labrande", +"C2""Improve English translation", +"C0""Thierry Crozat", +"C2""Improve English translation", +"", +"", "C1""Websites (design)", "A0""Dobo Balazs", "C0""Dob\363 Bal\341zs", |