From 88add32e3b2e82e1316dd107556dbe12b8d0a449 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Wed, 2 Jan 2013 18:32:15 +0100 Subject: JANITORIAL: Update copyright year --- dists/debian/copyright | 2 +- dists/macosx/Info.plist | 4 ++-- dists/macosx/Info.plist.in | 4 ++-- dists/scummvm.rc | 2 +- dists/scummvm.rc.in | 2 +- dists/win32/ScummVM.iss | 2 +- dists/win32/migration.bat | 2 +- dists/win32/scummvm.nsi | 2 +- dists/win32/scummvm.nsi.in | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) (limited to 'dists') diff --git a/dists/debian/copyright b/dists/debian/copyright index 318c06f62b..1cccd01a07 100644 --- a/dists/debian/copyright +++ b/dists/debian/copyright @@ -7,7 +7,7 @@ It was downloaded from . Upstream Authors: see `/usr/share/doc/scummvm/AUTHORS'. -Scummvm is Copyright © 2002-2012 The ScummVM Project +Scummvm is Copyright © 2002-2013 The ScummVM Project This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/dists/macosx/Info.plist b/dists/macosx/Info.plist index d8c28f6a08..43d7c37bc5 100644 --- a/dists/macosx/Info.plist +++ b/dists/macosx/Info.plist @@ -28,7 +28,7 @@ CFBundleExecutable scummvm CFBundleGetInfoString - 1.6.0git, Copyright 2001-2012 The ScummVM team + 1.6.0git, Copyright 2001-2013 The ScummVM team CFBundleIconFile scummvm.icns CFBundleIdentifier @@ -46,7 +46,7 @@ NSPrincipalClass NSApplication NSHumanReadableCopyright - Copyright 2001-2012 The ScummVM team + Copyright 2001-2013 The ScummVM team SUFeedURL http://www.scummvm.org/appcasts/macosx/release.xml SUPublicDSAKeyFile diff --git a/dists/macosx/Info.plist.in b/dists/macosx/Info.plist.in index ff010bee07..b810b7ea5a 100644 --- a/dists/macosx/Info.plist.in +++ b/dists/macosx/Info.plist.in @@ -28,7 +28,7 @@ CFBundleExecutable scummvm CFBundleGetInfoString - @VERSION@, Copyright 2001-2012 The ScummVM team + @VERSION@, Copyright 2001-2013 The ScummVM team CFBundleIconFile scummvm.icns CFBundleIdentifier @@ -46,7 +46,7 @@ NSPrincipalClass NSApplication NSHumanReadableCopyright - Copyright 2001-2012 The ScummVM team + Copyright 2001-2013 The ScummVM team SUFeedURL http://www.scummvm.org/appcasts/macosx/release.xml SUPublicDSAKeyFile diff --git a/dists/scummvm.rc b/dists/scummvm.rc index 8527c668c8..45924f724d 100644 --- a/dists/scummvm.rc +++ b/dists/scummvm.rc @@ -72,7 +72,7 @@ BEGIN VALUE "FileDescription", "http://www.scummvm.org/\0" VALUE "FileVersion", "1.6.0git\0" VALUE "InternalName", "scummvm\0" - VALUE "LegalCopyright", "Copyright © 2001-2012 The ScummVM Team\0" + VALUE "LegalCopyright", "Copyright © 2001-2013 The ScummVM Team\0" VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0" VALUE "OriginalFilename", "scummvm.exe\0" VALUE "ProductName", "ScummVM\0" diff --git a/dists/scummvm.rc.in b/dists/scummvm.rc.in index a874b98514..3be699f84b 100644 --- a/dists/scummvm.rc.in +++ b/dists/scummvm.rc.in @@ -69,7 +69,7 @@ BEGIN VALUE "FileDescription", "http://www.scummvm.org/\0" VALUE "FileVersion", "@VERSION@\0" VALUE "InternalName", "scummvm\0" - VALUE "LegalCopyright", "Copyright © 2001-2012 The ScummVM Team\0" + VALUE "LegalCopyright", "Copyright © 2001-2013 The ScummVM Team\0" VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0" VALUE "OriginalFilename", "scummvm.exe\0" VALUE "ProductName", "ScummVM\0" diff --git a/dists/win32/ScummVM.iss b/dists/win32/ScummVM.iss index adea759110..fa0f760f59 100644 --- a/dists/win32/ScummVM.iss +++ b/dists/win32/ScummVM.iss @@ -1,5 +1,5 @@ [Setup] -AppCopyright=2012 +AppCopyright=2013 AppName=ScummVM AppVerName=ScummVM Git AppPublisher=The ScummVM Team diff --git a/dists/win32/migration.bat b/dists/win32/migration.bat index 2bba7baef4..b4b00c02cc 100644 --- a/dists/win32/migration.bat +++ b/dists/win32/migration.bat @@ -4,7 +4,7 @@ :: This script will copy any saved games located in the :: old default location, to the new default location. :: -:: (c) 2012 ScummVM Team +:: (c) 2012-2013 ScummVM Team :: @echo off diff --git a/dists/win32/scummvm.nsi b/dists/win32/scummvm.nsi index 795eb660b6..fb4787a172 100644 --- a/dists/win32/scummvm.nsi +++ b/dists/win32/scummvm.nsi @@ -76,7 +76,7 @@ Name ScummVM !define COMPANY "ScummVM Team" !define URL "http://scummvm.org/" !define DESCRIPTION "ScummVM Installer. Look! A three headed monkey (TM)!" -!define COPYRIGHT "Copyright © 2001-2012 The ScummVM Team" +!define COPYRIGHT "Copyright © 2001-2013 The ScummVM Team" ######################################################################################### # Installer configuration diff --git a/dists/win32/scummvm.nsi.in b/dists/win32/scummvm.nsi.in index 340024e6a1..9f8bd1dad2 100644 --- a/dists/win32/scummvm.nsi.in +++ b/dists/win32/scummvm.nsi.in @@ -76,7 +76,7 @@ Name ScummVM !define COMPANY "ScummVM Team" !define URL "http://scummvm.org/" !define DESCRIPTION "ScummVM Installer. Look! A three headed monkey (TM)!" -!define COPYRIGHT "Copyright © 2001-2012 The ScummVM Team" +!define COPYRIGHT "Copyright © 2001-2013 The ScummVM Team" ######################################################################################### # Installer configuration -- cgit v1.2.3 From cc465076eef6194eb32320704a0855a21438bd95 Mon Sep 17 00:00:00 2001 From: athrxx Date: Fri, 28 Dec 2012 14:29:41 +0100 Subject: KYRA: (LOL/FM-TOWNS) - adapt static resources --- dists/engine-data/kyra.dat | Bin 471460 -> 486382 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'dists') diff --git a/dists/engine-data/kyra.dat b/dists/engine-data/kyra.dat index 339b85664a..305c7e665c 100644 Binary files a/dists/engine-data/kyra.dat and b/dists/engine-data/kyra.dat differ -- cgit v1.2.3 From bc33b5c0f13a09638525259385ebe92154ab8c33 Mon Sep 17 00:00:00 2001 From: Torbjörn Andersson Date: Thu, 27 Dec 2012 15:14:42 +0100 Subject: BADA: Add completely untested layout changes to Bada theme I've simply copied this from classic_layout.stx. It probably needs a bit of tweaking. --- dists/bada/Res/scummmobile/scummmobile_layout.stx | 152 ++++++++++++++++++++++ 1 file changed, 152 insertions(+) (limited to 'dists') diff --git a/dists/bada/Res/scummmobile/scummmobile_layout.stx b/dists/bada/Res/scummmobile/scummmobile_layout.stx index efb8ebc6b5..c402009e9a 100644 --- a/dists/bada/Res/scummmobile/scummmobile_layout.stx +++ b/dists/bada/Res/scummmobile/scummmobile_layout.stx @@ -371,6 +371,10 @@ height = 'Globals.Line.Height' /> + @@ -786,6 +790,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From e4a77aff06645a76b575aaf4b8253760e0cd3710 Mon Sep 17 00:00:00 2001 From: Torbjörn Andersson Date: Fri, 25 Jan 2013 05:30:42 +0100 Subject: GUI: Move the FluidSynth reset button from Misc tab to bottom This should make it clearer that Reset applies to all of the FluidSynth settings, not just the Misc tab. --- dists/bada/Res/scummmobile/scummmobile_layout.stx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'dists') diff --git a/dists/bada/Res/scummmobile/scummmobile_layout.stx b/dists/bada/Res/scummmobile/scummmobile_layout.stx index abac4e28a5..5da293a131 100644 --- a/dists/bada/Res/scummmobile/scummmobile_layout.stx +++ b/dists/bada/Res/scummmobile/scummmobile_layout.stx @@ -795,6 +795,9 @@ + @@ -935,9 +938,6 @@ type = 'PopUp' /> - -- cgit v1.2.3 From 9eff1e514fbcd9e48d6cc7a590661a2fbba3534d Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan SømaÌŠen Date: Mon, 28 Jan 2013 09:19:57 +0100 Subject: WINTERMUTE: Move Resources out of binary and into wintermute.zip --- dists/engine-data/wintermute.zip | Bin 0 -> 4057 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dists/engine-data/wintermute.zip (limited to 'dists') diff --git a/dists/engine-data/wintermute.zip b/dists/engine-data/wintermute.zip new file mode 100644 index 0000000000..924429972b Binary files /dev/null and b/dists/engine-data/wintermute.zip differ -- cgit v1.2.3 From 44f58f4031e1b85f6131aa3e6807819b279718b1 Mon Sep 17 00:00:00 2001 From: Kirben Date: Mon, 28 Jan 2013 22:35:54 +1100 Subject: BUILD: Add wintermute.zip to resource file for Windows builds. --- dists/scummvm.rc | 23 +++++++++++++---------- dists/scummvm.rc.in | 21 ++++++++++++--------- 2 files changed, 25 insertions(+), 19 deletions(-) (limited to 'dists') diff --git a/dists/scummvm.rc b/dists/scummvm.rc index 45924f724d..b9c001c1f1 100644 --- a/dists/scummvm.rc +++ b/dists/scummvm.rc @@ -20,34 +20,37 @@ scummmodern.zip FILE "gui/themes/scummmodern.zip" translations.dat FILE "gui/themes/translations.dat" #endif -#if ENABLE_DRASCULA == STATIC_PLUGIN +#if ENABLE_DRASCULA == STATIC_PLUGIN drascula.dat FILE "dists/engine-data/drascula.dat" #endif -#if ENABLE_HUGO == STATIC_PLUGIN +#if ENABLE_HUGO == STATIC_PLUGIN hugo.dat FILE "dists/engine-data/hugo.dat" #endif -#if ENABLE_KYRA == STATIC_PLUGIN +#if ENABLE_KYRA == STATIC_PLUGIN kyra.dat FILE "dists/engine-data/kyra.dat" #endif -#if ENABLE_LURE == STATIC_PLUGIN +#if ENABLE_LURE == STATIC_PLUGIN lure.dat FILE "dists/engine-data/lure.dat" #endif -#if ENABLE_QUEEN == STATIC_PLUGIN +#if ENABLE_QUEEN == STATIC_PLUGIN queen.tbl FILE "dists/engine-data/queen.tbl" #endif -#if ENABLE_SKY == STATIC_PLUGIN +#if ENABLE_SKY == STATIC_PLUGIN sky.cpt FILE "dists/engine-data/sky.cpt" #endif -#if ENABLE_TEENAGENT == STATIC_PLUGIN +#if ENABLE_TEENAGENT == STATIC_PLUGIN teenagent.dat FILE "dists/engine-data/teenagent.dat" #endif -#if ENABLE_TOON == STATIC_PLUGIN +#if ENABLE_TOON == STATIC_PLUGIN toon.dat FILE "dists/engine-data/toon.dat" #endif -#if ENABLE_TONY == STATIC_PLUGIN +#if ENABLE_TONY == STATIC_PLUGIN tony.dat FILE "dists/engine-data/tony.dat" #endif -#if ENABLE_AGI == STATIC_PLUGIN +#if ENABLE_WINTERMUTE == STATIC_PLUGIN +wintermute.zip FILE "dists/engine-data/wintermute.zip" +#endif +#if ENABLE_AGI == STATIC_PLUGIN pred.dic FILE "dists/pred.dic" #endif diff --git a/dists/scummvm.rc.in b/dists/scummvm.rc.in index 3be699f84b..f986cc52e8 100644 --- a/dists/scummvm.rc.in +++ b/dists/scummvm.rc.in @@ -20,31 +20,34 @@ scummmodern.zip FILE "gui/themes/scummmodern.zip" translations.dat FILE "gui/themes/translations.dat" #endif -#if ENABLE_DRASCULA == STATIC_PLUGIN +#if ENABLE_DRASCULA == STATIC_PLUGIN drascula.dat FILE "dists/engine-data/drascula.dat" #endif -#if ENABLE_HUGO == STATIC_PLUGIN +#if ENABLE_HUGO == STATIC_PLUGIN hugo.dat FILE "dists/engine-data/hugo.dat" #endif -#if ENABLE_KYRA == STATIC_PLUGIN +#if ENABLE_KYRA == STATIC_PLUGIN kyra.dat FILE "dists/engine-data/kyra.dat" #endif -#if ENABLE_LURE == STATIC_PLUGIN +#if ENABLE_LURE == STATIC_PLUGIN lure.dat FILE "dists/engine-data/lure.dat" #endif -#if ENABLE_QUEEN == STATIC_PLUGIN +#if ENABLE_QUEEN == STATIC_PLUGIN queen.tbl FILE "dists/engine-data/queen.tbl" #endif -#if ENABLE_SKY == STATIC_PLUGIN +#if ENABLE_SKY == STATIC_PLUGIN sky.cpt FILE "dists/engine-data/sky.cpt" #endif -#if ENABLE_TEENAGENT == STATIC_PLUGIN +#if ENABLE_TEENAGENT == STATIC_PLUGIN teenagent.dat FILE "dists/engine-data/teenagent.dat" #endif -#if ENABLE_TOON == STATIC_PLUGIN +#if ENABLE_TOON == STATIC_PLUGIN toon.dat FILE "dists/engine-data/toon.dat" #endif -#if ENABLE_AGI == STATIC_PLUGIN +#if ENABLE_WINTERMUTE == STATIC_PLUGIN +wintermute.zip FILE "dists/engine-data/wintermute.zip" +#endif +#if ENABLE_AGI == STATIC_PLUGIN pred.dic FILE "dists/pred.dic" #endif -- cgit v1.2.3