mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-21 14:53:02 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Michał Janiszewski
2018-03-18 21:31:23 +01:00
parent 9e95488d63 0e7c0f76d5
commit ec0688ac0e
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE.md vendored
View File

@@ -2,7 +2,7 @@
Fill in the placeholders below. Delete any headings and placeholders that you do not fill in. Fill in the placeholders below. Delete any headings and placeholders that you do not fill in.
--> -->
**OS:** [e.g. Windows 10] **OS:** [e.g. Windows 10]
**Version:** [e.g. 0.1.1] **Version:** [e.g. 0.1.2]
**Commit/Build:** [e.g. 426e106] **Commit/Build:** [e.g. 426e106]
<!-- Explanation of the issue --> <!-- Explanation of the issue -->

2
distribution/changelog.txt
View File

@@ -1,4 +1,4 @@
0.1.2 (in development) 0.1.2 (2018-03-18)
------------------------------------------------------------------------ ------------------------------------------------------------------------
- Feature: [#2893] Object selection filters for items from RCT1, Added Attractions and Loopy Landscapes. - Feature: [#2893] Object selection filters for items from RCT1, Added Attractions and Loopy Landscapes.
- Feature: [#3505] Allow up to 1024 items per scenery tab. - Feature: [#3505] Allow up to 1024 items per scenery tab.

2
distribution/readme.txt
View File

@@ -1,4 +1,4 @@
Last updated: 2017-11-28 Last updated: 2018-03-18
Release version: 0.1.2 Release version: 0.1.2
------------------------------------------------------------------------ ------------------------------------------------------------------------

4
readme.md
View File

@@ -10,8 +10,8 @@ An open-source re-implementation of RollerCoaster Tycoon 2. A construction and m
### Build Status ### Build Status
| | Windows | Linux / Mac | Download | | | Windows | Linux / Mac | Download |
|-------------|---------|-------------|----------| |-------------|---------|-------------|----------|
| **master** | [![AppVeyor](https://ci.appveyor.com/api/projects/status/7efnemxhon6i5n34/branch/master?svg=true)](https://ci.appveyor.com/project/IntelOrca/openrct2-ject9) | [![Travis CI](https://travis-ci.org/OpenRCT2/OpenRCT2.svg?branch=master)](https://travis-ci.org/OpenRCT2/OpenRCT2) | [![OpenRCT2.org](https://img.shields.io/badge/master-v0.1.1-green.svg)](https://openrct2.org/downloads/master/latest) | | **master** | [![AppVeyor](https://ci.appveyor.com/api/projects/status/7efnemxhon6i5n34/branch/master?svg=true)](https://ci.appveyor.com/project/IntelOrca/openrct2-ject9) | [![Travis CI](https://travis-ci.org/OpenRCT2/OpenRCT2.svg?branch=master)](https://travis-ci.org/OpenRCT2/OpenRCT2) | [![OpenRCT2.org](https://img.shields.io/badge/master-v0.1.2-green.svg)](https://openrct2.org/downloads/master/latest) |
| **develop** | [![AppVeyor](https://ci.appveyor.com/api/projects/status/7efnemxhon6i5n34/branch/develop?svg=true)](https://ci.appveyor.com/project/IntelOrca/openrct2-ject9) | [![Travis CI](https://travis-ci.org/OpenRCT2/OpenRCT2.svg?branch=develop)](https://travis-ci.org/OpenRCT2/OpenRCT2) | [![OpenRCT2.org](https://img.shields.io/badge/develop-v0.1.2-blue.svg)](https://openrct2.org/downloads/develop/latest) | | **develop** | [![AppVeyor](https://ci.appveyor.com/api/projects/status/7efnemxhon6i5n34/branch/develop?svg=true)](https://ci.appveyor.com/project/IntelOrca/openrct2-ject9) | [![Travis CI](https://travis-ci.org/OpenRCT2/OpenRCT2.svg?branch=develop)](https://travis-ci.org/OpenRCT2/OpenRCT2) | [![OpenRCT2.org](https://img.shields.io/badge/develop-v0.1.3-blue.svg)](https://openrct2.org/downloads/develop/latest) |
--- ---