From 9a888ed1c8b32a33a8dd91f0ff6c81ea7773e6ff Mon Sep 17 00:00:00 2001
From: Marcus Comstedt
Date: Wed, 7 Aug 2013 17:19:24 +0200
Subject: ANDROID: Add OUYA icon and intent
---
dists/android/AndroidManifest.xml | 1 +
dists/android/AndroidManifest.xml.in | 1 +
dists/android/res/drawable-xhdpi/ouya_icon.png | Bin 0 -> 110822 bytes
3 files changed, 2 insertions(+)
create mode 100644 dists/android/res/drawable-xhdpi/ouya_icon.png
(limited to 'dists')
diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml
index 320ed16a6e..16d1ee578b 100644
--- a/dists/android/AndroidManifest.xml
+++ b/dists/android/AndroidManifest.xml
@@ -36,6 +36,7 @@
+
diff --git a/dists/android/AndroidManifest.xml.in b/dists/android/AndroidManifest.xml.in
index 8f7887eaf5..bf45ffcc0e 100644
--- a/dists/android/AndroidManifest.xml.in
+++ b/dists/android/AndroidManifest.xml.in
@@ -36,6 +36,7 @@
+
diff --git a/dists/android/res/drawable-xhdpi/ouya_icon.png b/dists/android/res/drawable-xhdpi/ouya_icon.png
new file mode 100644
index 0000000000..42f9a2a8ce
Binary files /dev/null and b/dists/android/res/drawable-xhdpi/ouya_icon.png differ
--
cgit v1.2.3
From 7a1ffe8c59964a502c0168264f9b2872afb94122 Mon Sep 17 00:00:00 2001
From: Marcus Comstedt
Date: Sun, 18 Aug 2013 15:21:18 +0200
Subject: ANDROID: Add some margins when screen is a TV
---
dists/android/res/layout/main.xml | 4 ++++
dists/android/res/values-television/margins.xml | 5 +++++
dists/android/res/values/margins.xml | 5 +++++
3 files changed, 14 insertions(+)
create mode 100644 dists/android/res/values-television/margins.xml
create mode 100644 dists/android/res/values/margins.xml
(limited to 'dists')
diff --git a/dists/android/res/layout/main.xml b/dists/android/res/layout/main.xml
index 8b0d515d62..31aa345cc7 100644
--- a/dists/android/res/layout/main.xml
+++ b/dists/android/res/layout/main.xml
@@ -9,4 +9,8 @@
android:keepScreenOn="true"
android:focusable="true"
android:focusableInTouchMode="true"
+ android:layout_marginTop="@dimen/verticalMargin"
+ android:layout_marginLeft="@dimen/horizontalMargin"
+ android:layout_marginBottom="@dimen/verticalMargin"
+ android:layout_marginRight="@dimen/horizontalMargin"
/>
diff --git a/dists/android/res/values-television/margins.xml b/dists/android/res/values-television/margins.xml
new file mode 100644
index 0000000000..df586eea34
--- /dev/null
+++ b/dists/android/res/values-television/margins.xml
@@ -0,0 +1,5 @@
+
+
+ 45px
+ 80px
+
diff --git a/dists/android/res/values/margins.xml b/dists/android/res/values/margins.xml
new file mode 100644
index 0000000000..a865687b3a
--- /dev/null
+++ b/dists/android/res/values/margins.xml
@@ -0,0 +1,5 @@
+
+
+ 0px
+ 0px
+
--
cgit v1.2.3
From 51cb75572667b5a4e6c96fcb8741fedf12bb6056 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Wed, 9 Oct 2013 23:26:58 +0100
Subject: ANDROID: Really fix compilation.
The vanilla android toolchain even is unhappy when unknown folders are
present in the resources directory, so have moved the ouya specific
resources out to another directory.
---
dists/android/res-ouya/values-television/margins.xml | 5 +++++
dists/android/res/values-television/margins.xml | 5 -----
2 files changed, 5 insertions(+), 5 deletions(-)
create mode 100644 dists/android/res-ouya/values-television/margins.xml
delete mode 100644 dists/android/res/values-television/margins.xml
(limited to 'dists')
diff --git a/dists/android/res-ouya/values-television/margins.xml b/dists/android/res-ouya/values-television/margins.xml
new file mode 100644
index 0000000000..df586eea34
--- /dev/null
+++ b/dists/android/res-ouya/values-television/margins.xml
@@ -0,0 +1,5 @@
+
+
+ 45px
+ 80px
+
diff --git a/dists/android/res/values-television/margins.xml b/dists/android/res/values-television/margins.xml
deleted file mode 100644
index df586eea34..0000000000
--- a/dists/android/res/values-television/margins.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- 45px
- 80px
-
--
cgit v1.2.3
From aff3412479aaf081cc4cdd99f0bcca3a894b663f Mon Sep 17 00:00:00 2001
From: Роман Донченко
Date: Sat, 7 Dec 2013 01:39:49 +0400
Subject: DEVTOOLS: Add debug visualization files for Visual Studio 2012+
---
dists/msvc11/readme.txt | 5 ++++-
dists/msvc12/readme.txt | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
(limited to 'dists')
diff --git a/dists/msvc11/readme.txt b/dists/msvc11/readme.txt
index fa91a8cc12..45faac0663 100644
--- a/dists/msvc11/readme.txt
+++ b/dists/msvc11/readme.txt
@@ -3,4 +3,7 @@ files using the create_project tool inside the /devtools/create_project folder.
To create the default project files, build create_project.exe, copy it inside
this folder and run the create_msvc11.bat file for a default build. You can run
-create_project.exe with no parameters to check the possible command-line options
+create_project.exe with no parameters to check the possible command-line options.
+
+To enable debug visualization for common types, see the comment in
+/devtools/create_project/scripts/scummvm.natvis.
diff --git a/dists/msvc12/readme.txt b/dists/msvc12/readme.txt
index 760f9ff601..2d91c72140 100644
--- a/dists/msvc12/readme.txt
+++ b/dists/msvc12/readme.txt
@@ -3,4 +3,7 @@ files using the create_project tool inside the /devtools/create_project folder.
To create the default project files, build create_project.exe, copy it inside
this folder and run the create_msvc12.bat file for a default build. You can run
-create_project.exe with no parameters to check the possible command-line options
+create_project.exe with no parameters to check the possible command-line options.
+
+To enable debug visualization for common types, see the comment in
+/devtools/create_project/scripts/scummvm.natvis.
--
cgit v1.2.3
From ae6efb09b7d11b8f64a5e7d7cc23de645f4c4515 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Wed, 1 Jan 2014 12:44:08 +0200
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 1cccd01a07..1317fc6cee 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-2013 The ScummVM Project
+ScummVM is Copyright © 2002-2014 The ScummVM Team
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 b9a4eff1b8..63813c06de 100644
--- a/dists/macosx/Info.plist
+++ b/dists/macosx/Info.plist
@@ -28,7 +28,7 @@
CFBundleExecutable
scummvm
CFBundleGetInfoString
- 1.7.0git, Copyright 2001-2013 The ScummVM team
+ 1.7.0git, Copyright 2001-2014 The ScummVM Team
CFBundleIconFile
scummvm.icns
CFBundleIdentifier
@@ -46,7 +46,7 @@
NSPrincipalClass
NSApplication
NSHumanReadableCopyright
- Copyright 2001-2013 The ScummVM team
+ Copyright 2001-2014 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 b810b7ea5a..9ef1584440 100644
--- a/dists/macosx/Info.plist.in
+++ b/dists/macosx/Info.plist.in
@@ -28,7 +28,7 @@
CFBundleExecutable
scummvm
CFBundleGetInfoString
- @VERSION@, Copyright 2001-2013 The ScummVM team
+ @VERSION@, Copyright 2001-2014 The ScummVM Team
CFBundleIconFile
scummvm.icns
CFBundleIdentifier
@@ -46,7 +46,7 @@
NSPrincipalClass
NSApplication
NSHumanReadableCopyright
- Copyright 2001-2013 The ScummVM team
+ Copyright 2001-2014 The ScummVM Team
SUFeedURL
http://www.scummvm.org/appcasts/macosx/release.xml
SUPublicDSAKeyFile
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index 037db3ef62..f0609c1a79 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -81,7 +81,7 @@ BEGIN
VALUE "FileDescription", "http://www.scummvm.org/\0"
VALUE "FileVersion", "1.7.0git\0"
VALUE "InternalName", "scummvm\0"
- VALUE "LegalCopyright", "Copyright © 2001-2013 The ScummVM Team\0"
+ VALUE "LegalCopyright", "Copyright © 2001-2014 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 c18c18ef63..401c0abb0d 100644
--- a/dists/scummvm.rc.in
+++ b/dists/scummvm.rc.in
@@ -81,7 +81,7 @@ BEGIN
VALUE "FileDescription", "http://www.scummvm.org/\0"
VALUE "FileVersion", "@VERSION@\0"
VALUE "InternalName", "scummvm\0"
- VALUE "LegalCopyright", "Copyright © 2001-2013 The ScummVM Team\0"
+ VALUE "LegalCopyright", "Copyright © 2001-2014 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 fa0f760f59..5afb407177 100644
--- a/dists/win32/ScummVM.iss
+++ b/dists/win32/ScummVM.iss
@@ -1,5 +1,5 @@
[Setup]
-AppCopyright=2013
+AppCopyright=2014
AppName=ScummVM
AppVerName=ScummVM Git
AppPublisher=The ScummVM Team
diff --git a/dists/win32/migration.bat b/dists/win32/migration.bat
index b4b00c02cc..e1b27a1fb3 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-2013 ScummVM Team
+:: (c) 2012-2014 ScummVM Team
::
@echo off
diff --git a/dists/win32/scummvm.nsi b/dists/win32/scummvm.nsi
index 5357be9fe4..602b9fd6c3 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-2013 The ScummVM Team"
+!define COPYRIGHT "Copyright © 2001-2014 The ScummVM Team"
#########################################################################################
# Installer configuration
diff --git a/dists/win32/scummvm.nsi.in b/dists/win32/scummvm.nsi.in
index 9f8bd1dad2..b8ddc74a86 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-2013 The ScummVM Team"
+!define COPYRIGHT "Copyright © 2001-2014 The ScummVM Team"
#########################################################################################
# Installer configuration
--
cgit v1.2.3
From f5748d16eb55ceca7abc12d8d4ca807106ea3161 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 18 Jan 2014 14:52:25 +0100
Subject: NEVERHOOD: Add a todo in the readme related to engine data
---
dists/engine-data/README | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
(limited to 'dists')
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.
--
cgit v1.2.3