mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
20,469 Commits 7 Branches 39 Tags 353 MiB
Commit Graph

1788 Commits

Author SHA1 Message Date
Gymnasiast 17fe4bd7ea
en-GB: Replace typewriter quotes with typographical ones 2020-12-23 21:03:12 +01:00
OpenRCT2 git bot baf1924b25 Merge Localisation/master into OpenRCT2/develop 2020-12-21 04:09:34 +00:00
OpenRCT2 git bot 150f243a9f Merge Localisation/master into OpenRCT2/develop 2020-12-20 04:06:03 +00:00
Łukasz Pękalski 9ec61fa5d2
Close #12993: Remove hardcoded {SMALLFONT}{BLACK} from tooltips 2020-12-19 20:53:57 +01:00
OpenRCT2 git bot 4ee47b18a0 Merge Localisation/master into OpenRCT2/develop 2020-12-19 04:07:36 +00:00
OpenRCT2 git bot 24f2a12e53 Merge Localisation/master into OpenRCT2/develop 2020-12-18 04:08:07 +00:00
OpenRCT2 git bot dea4792509 Merge Localisation/master into OpenRCT2/develop 2020-12-17 04:06:09 +00:00
OpenRCT2 git bot f1e19edb78 Merge Localisation/master into OpenRCT2/develop 2020-12-16 04:06:07 +00:00
OpenRCT2 git bot b60d418601 Merge Localisation/master into OpenRCT2/develop 2020-12-15 04:05:46 +00:00
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