gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-05 22:04:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r22083) -Change: trunk is heading towards 1.2 now

Browse Source
This commit is contained in:
rubidium 2011-02-14 20:20:57 +00:00
parent 1b2ef66416
commit 22afd83964
12 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/ai/compat_1.1.nut
View File

@ -6,3 +6,5 @@
* OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
*/
AILog.Info("1.1 API compatability in effect.");

8
bin/ai/compat_1.2.nut Normal file
View File

@ -0,0 +1,8 @@
/* $Id$ */
/*
* This file is part of OpenTTD.
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
* OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
*/

2
bin/ai/regression/regression_info.nut
View File

@ -6,7 +6,7 @@ class Regression extends AIInfo {
function GetShortName() { return "REGR"; }
function GetDescription() { return "This runs regression-tests on all commands. On the same map the result should always be the same."; }
function GetVersion() { return 1; }
function GetAPIVersion() { return "1.1"; }
function GetAPIVersion() { return "1.2"; }
function GetDate() { return "2007-03-18"; }
function CreateInstance() { return "Regression"; }
}

6
os/debian/changelog
View File

@ -1,3 +1,9 @@
openttd (1.2.0~alpha) unstable; urgency=low
* Alpha releases of trunk leading to 1.2.0-beta1
-- Matthijs Kooijman <matthijs@stdin.nl> Mon, 14 Feb 2011 22:00:00 +0100
openttd (1.1.0~beta5) unstable; urgency=low
* New upstream release 1.1.0-beta5

2
os/os2/installer/make_installer.cmd
View File

@ -1,6 +1,6 @@
@echo off
set OPENTTD_VERSION=1.1.0-beta5
set OPENTTD_VERSION=1.2.0-alpha
set OPENSFX_VERSION=0.8.0
set NOSOUND_VERSION=0.8.0
set OPENGFX_VERSION=0.7.0

2
os/rpm/openttd.spec
View File

@ -13,7 +13,7 @@
#-------------------------------------------------------------------------------
Name: openttd
Version: 1.1.0
Version: 1.2.0
Release: 1%{?dist}
Group: Amusements/Games

6
os/windows/installer/install.nsi
View File

@ -1,9 +1,9 @@
# Version numbers to update
!define APPV_MAJOR 1
!define APPV_MINOR 1
!define APPV_MINOR 2
!define APPV_MAINT 0
!define APPV_BUILD 4
!define APPV_EXTRA "-beta5"
!define APPV_BUILD 0
!define APPV_EXTRA "-alpha"
!define APPNAME "OpenTTD" ; Define application name
!define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}" ; Define application version

2
src/ai/ai_info.cpp
View File

@ -57,7 +57,7 @@ AILibrary::~AILibrary()
*/
static bool CheckAPIVersion(const char *api_version)
{
return strcmp(api_version, "0.7") == 0 || strcmp(api_version, "1.0") == 0 || strcmp(api_version, "1.1") == 0;
return strcmp(api_version, "0.7") == 0 || strcmp(api_version, "1.0") == 0 || strcmp(api_version, "1.1") == 0 || strcmp(api_version, "1.2") == 0;
}
/* static */ SQInteger AIInfo::Constructor(HSQUIRRELVM vm)

4
src/ai/api/ai_changelog.hpp
View File

@ -15,6 +15,10 @@
* functions may still be available if you return an older API version
* in GetAPIVersion() in info.nut.
*
* \b 1.2.0
*
* 1.2.0 is not yet released. The following changes are not set in stone yet.
*
* \b 1.1.0
*
* 1.1.0 is not yet released. The following changes are not set in stone yet.

1
src/ai/api/ai_info_docs.hpp
View File

@ -150,6 +150,7 @@ public:
* - "0.7"
* - "1.0"
* - "1.1"
* - "1.2"
*
* @return The version this AI is compatible with.
* @note This function is optional.

4
src/os/windows/ottdres.rc.in
View File

@ -79,8 +79,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,1,0,!!REVISION!!
PRODUCTVERSION 1,1,0,!!REVISION!!
FILEVERSION 1,2,0,!!REVISION!!
PRODUCTVERSION 1,2,0,!!REVISION!!
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L

2
src/rev.cpp.in
View File

@ -60,7 +60,7 @@ const byte _openttd_revision_modified = !!MODIFIED!!;
* final release will always have a lower version number than the released
* version, thus making comparisions on specific revisions easy.
*/
const uint32 _openttd_newgrf_version = 1 << 28 | 1 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1));
const uint32 _openttd_newgrf_version = 1 << 28 | 2 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1));
#ifdef __MORPHOS__
/**