1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 08:12:53 +01:00
Commit Graph

1779 Commits

Author SHA1 Message Date
OpenRCT2 git bot
d246e4a9c9 Merge Localisation/master into OpenRCT2/develop 2020-12-14 04:05:58 +00:00
OpenRCT2 git bot
9cefafd117 Merge Localisation/master into OpenRCT2/develop 2020-12-08 04:06:02 +00:00
OpenRCT2 git bot
80f442c706 Merge Localisation/master into OpenRCT2/develop 2020-12-07 04:06:01 +00:00
OpenRCT2 git bot
e8611169a5 Merge Localisation/master into OpenRCT2/develop 2020-12-05 04:05:30 +00:00
Ted John
d58d834925 Merge pull request #13212 from IntelOrca/new-format-string
Eradicate all coded format tokens. All internal strings now contain raw tokens such as `{STRINGID}` and `{RED}`. New iterators have been created to iterate the tokens and the UTF-8 codepoints.

Formatting strings has been re-written and a new template version is available.
2020-12-04 13:56:54 +00:00
OpenRCT2 git bot
6db4a4531e Merge Localisation/master into OpenRCT2/develop 2020-12-03 04:05:29 +00:00
OpenRCT2 git bot
aa8a08987f Merge Localisation/master into OpenRCT2/develop 2020-12-02 04:05:38 +00:00
Ted John
4187106303 Fix #13482: STR_6308 incorrect for en-GB 2020-12-01 22:03:30 +00:00
OpenRCT2 git bot
a7481b40b4 Merge Localisation/master into OpenRCT2/develop 2020-11-29 04:05:34 +00:00
OpenRCT2 git bot
9c27e3a9ce Merge Localisation/master into OpenRCT2/develop 2020-11-28 04:05:47 +00:00
OpenRCT2 git bot
79c6b22600 Merge Localisation/master into OpenRCT2/develop 2020-11-27 04:05:17 +00:00
OpenRCT2 git bot
8328f7bd64 Merge Localisation/master into OpenRCT2/develop 2020-11-24 04:05:54 +00:00
OpenRCT2 git bot
499631bf72 Merge Localisation/master into OpenRCT2/develop 2020-11-21 04:04:38 +00:00
OpenRCT2 git bot
10b7143d53 Merge Localisation/master into OpenRCT2/develop 2020-11-17 04:04:31 +00:00
Michael Steenbeek
23871de19f Remove built-in explode guests cheat 2020-11-16 22:07:52 +01:00
OpenRCT2 git bot
cf7ce2d921 Merge Localisation/master into OpenRCT2/develop 2020-11-10 04:04:08 +00:00
OpenRCT2 git bot
d61e81bded Merge Localisation/master into OpenRCT2/develop 2020-11-09 04:05:34 +00:00
Michael Steenbeek
1785be9b09 STR_6399: Fix quotes 2020-11-08 18:06:56 +01:00
Gymnasiast
75de0790bc Improve message when asking for a game_path with no filepicker available 2020-11-08 14:32:58 +01:00
OpenRCT2 git bot
135245d744 Merge Localisation/master into OpenRCT2/develop 2020-11-08 04:05:23 +00:00
OpenRCT2 git bot
7897fb1829 Merge Localisation/master into OpenRCT2/develop 2020-11-04 04:04:58 +00:00
OpenRCT2 git bot
7346321f58 Merge Localisation/master into OpenRCT2/develop 2020-11-01 19:47:17 +01:00
Duncan
dcabc8451e Fix #13250: Crash when opening parks with new ride types (#13256)
This only happens when a new ride type is added and the park is opened in the older version of the game where the ride type does not exist.

Reworked so that invalid rides are not loadable. Force reload of title if current scenario is corrupted.
2020-11-01 14:49:43 +01:00
OpenRCT2 git bot
267de7cd2a Merge Localisation/master into OpenRCT2/develop 2020-11-01 04:04:17 +00:00
OpenRCT2 git bot
4471bd8354 Merge Localisation/master into OpenRCT2/develop 2020-10-31 04:03:58 +00:00
OpenRCT2 git bot
d1bf532af5 Merge Localisation/master into OpenRCT2/develop 2020-10-30 04:03:52 +00:00
OpenRCT2 git bot
bbf91d9613 Merge Localisation/master into OpenRCT2/develop 2020-10-29 04:06:47 +00:00
OpenRCT2 git bot
2e55b680c5 Merge Localisation/master into OpenRCT2/develop 2020-10-28 04:06:40 +00:00
OpenRCT2 git bot
6df7958e54 Merge Localisation/master into OpenRCT2/develop 2020-10-27 04:06:35 +00:00
OpenRCT2 git bot
dedb244cee Merge Localisation/master into OpenRCT2/develop 2020-10-26 04:06:30 +00:00
OpenRCT2 git bot
7053413da5 Merge Localisation/master into OpenRCT2/develop 2020-10-25 04:06:17 +00:00
Michał Janiszewski
0aaac728b5 Change GL_TEXTURE_RECTANGLE to NPOT GL_TEXTURE_2D
This improves GLES compatiblity due to missing rectangle textures, but
NPOT 2D ones being universally available.
2020-10-24 17:28:05 +02:00
OpenRCT2 git bot
fe5ee422a2 Merge Localisation/master into OpenRCT2/develop 2020-10-24 04:05:55 +00:00
Michael Steenbeek
14512e72a3 en-GB: Remove overrides for JSON objects; add Panda World 2020-10-23 22:14:28 +02:00
OpenRCT2 git bot
dd7c27f4e6 Merge Localisation/master into OpenRCT2/develop 2020-10-22 04:05:53 +00:00
Łukasz Pękalski
9dcbf6d4e6 Close #4865: Offer an option to disable inhibiting the monitor power (#13243)
Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
2020-10-20 22:02:44 +02:00
OpenRCT2 git bot
e2d3b1d3bc Merge Localisation/master into OpenRCT2/develop 2020-10-18 04:05:30 +00:00
OpenRCT2 git bot
803bbfeeb0 Merge Localisation/master into OpenRCT2/develop 2020-10-17 04:05:49 +00:00
Aaron van Geffen
af26a2cef0 Improve park cheats tab layout (#13186)
* Remove 'Park parameters…' button
  The scenario options are already accessible through the cheats menu

* Split off Objective group from General group
* Split off new Maintenance group from Staff group

* Shrink 'Force park rating' spinner to make room for label
* Change label 'Force weather' to 'Change weather to'
* Change label "Plants don't age" to 'Disable plants withering'
* Change some strings for consistent capitalisation
2020-10-16 21:52:27 +02:00
OpenRCT2 git bot
cbfbaddb92 Merge Localisation/master into OpenRCT2/develop 2020-10-16 04:05:55 +00:00
OpenRCT2 git bot
01d57872fe Merge Localisation/master into OpenRCT2/develop 2020-10-14 04:05:25 +00:00
OpenRCT2 git bot
bd96d312a7 Merge Localisation/master into OpenRCT2/develop 2020-10-13 04:05:23 +00:00
OpenRCT2 git bot
9e84fda814 Merge Localisation/master into OpenRCT2/develop 2020-10-12 04:05:30 +00:00
Gymnasiast
16ca892449 Add Objective Options to Cheats menu 2020-10-11 19:28:25 +02:00
OpenRCT2 git bot
ec2eae75e2 Merge Localisation/master into OpenRCT2/develop 2020-10-11 04:05:16 +00:00
X123M3-256
9681ea4cea Add "Hybrid Coaster" ride type (#12110)
* Add "Hybrid coaster" ride type

* Add turns

* Add diagonal slopes

* Add bank transitions

* Add diagonal bank transitions

* Add banked turns

* Add sloped turns

* Add sloped bank transitions

* Add sloped banked turns

* Add s bends

* Add helices

* Add barrel rolls

* Add half loops

* Start changing supports to wooden

* Switch diagonals and banked turns to wooden supports

* Finish switching supports to wooden

* Alter default supports for small turns and steep turns

* Split track sprites that were glitching

* Fix incorrect sprite indices on small helices

* Add supports for large flat to steep pieces

* Fix bug with b supports

* Add supports for quarter loops

* Finalize set of track elements

* Fix strange colors when track piece is highlighted

* Update sprites.json

* Add support for corkscrews

* Fix incorrect remap colors and default supports

* Add slope to banked turn transitions

* Add support for preview image in color selection window

* Fix static glitches

* Correct Z offset

* Set segment heights (and fix more static glitches)

* Improve sloped curve supports

* Fix slope to banked turn transitions

* Fix dynamic glitches

* Fix boosters

* Remove corkscrews

* Set ride data and implement ride rating function

* Fix glitches on steep turns and gentle to steep

* Format code

* Add sprites

* Add track color preview image

* Fix formatting

* Add files to MSVC project

* Fix Testpaint

* Revert removal of RIDE_TYPE_50 from GetClassification

* Introduce constant instead of hard coded number

* Fix stray change

* Improve legibility of ride_ratings_calculate_hybrid_coaster()

* Fix comments on byte_97B23C

* Fix two other stray changes

* Fix Xcode project

* Adjust bounding boxes to make clipping behaviour more consistent

* Fix two glitches on medium and large turns

* Address comments from DuncansPumpkin

* Fix incorrect ride ID

* Fix steep turn sprites

* Run PNG images through OptiPNG

* Update changelog

* Fix namespace error

* Use arrays for supports to handle additional elements

* Rename functions to TitleCase and add namespace

* Increment network version

Co-authored-by: Edward Calver <hx010973@reading.ac.uk>
Co-authored-by: tylerleamon <59478575+tylerleamon@users.noreply.github.com>
Co-authored-by: Gymnasiast <m.o.steenbeek@gmail.com>
Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
2020-10-10 20:27:12 +01:00
OpenRCT2 git bot
63d536a10e Merge Localisation/master into OpenRCT2/develop 2020-10-10 04:05:24 +00:00
Keith Stellyes
3468d1fc6b Close #13125: Selecting the RCT2 files now uses localised dialogs 2020-10-09 21:13:14 +02:00
OpenRCT2 git bot
6ce60498c7 Merge Localisation/master into OpenRCT2/develop 2020-10-08 04:04:42 +00:00
Tulio Leao
2dfef7f476 Close #13107: Use ellipsis over three consecutive dots 2020-10-07 10:21:05 +02:00