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

1901 Commits

Author SHA1 Message Date
OpenRCT2 git bot e2021fcbce Merge Localisation/master into OpenRCT2/develop 2021-01-11 04:29:22 +00:00
OpenRCT2 git bot ef6a80982a Merge Localisation/master into OpenRCT2/develop 2021-01-10 04:29:24 +00:00
OpenRCT2 git bot 005bc3c360 Merge Localisation/master into OpenRCT2/develop 2021-01-07 04:23:49 +00:00
X123M3-256 deca5a3881
Add "Single Rail Roller Coaster" ride type 2021-01-06 21:10:15 +01:00
OpenRCT2 git bot 017f7ef9e4 Merge Localisation/master into OpenRCT2/develop 2021-01-06 04:21:33 +00:00
OpenRCT2 git bot fd37700433 Merge Localisation/master into OpenRCT2/develop 2021-01-05 04:20:44 +00:00
OpenRCT2 git bot f8c0aea9e2 Merge Localisation/master into OpenRCT2/develop 2021-01-04 04:20:10 +00:00
Gymnasiast 52bc650abf
Improve feedback when selecting the wrong file 2021-01-03 18:40:02 +01:00
Gymnasiast 07c3a930e4
Apply review requests 2021-01-03 17:53:38 +01:00
Keith Stellyes 268e39d12a
GOG installer extraction for POSIX 2021-01-03 17:53:14 +01:00
Michael Steenbeek 44d595835a
Fix #13653: Incorrect colours in Inventions List 2021-01-03 14:06:52 +01:00
OpenRCT2 git bot 920dd756f3 Merge Localisation/master into OpenRCT2/develop 2021-01-03 04:18:46 +00:00
OpenRCT2 git bot b5aaab58fc Merge Localisation/master into OpenRCT2/develop 2020-12-24 04:16:47 +00:00
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
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
OpenRCT2 git bot 74d4182c95 Merge Localisation/master into OpenRCT2/develop 2020-10-06 04:05:15 +00:00
OpenRCT2 git bot f461b42ee6 Merge Localisation/master into OpenRCT2/develop 2020-10-05 04:05:40 +00:00
OpenRCT2 git bot a284119990 Merge Localisation/master into OpenRCT2/develop 2020-10-04 04:05:10 +00:00
Michael Steenbeek 01146123ca
en-GB: Fix strings introduced in #13066 2020-10-03 22:11:11 +02:00
Tulio Leao f4b588256d
Merge pull request #13066 from tupaschoal/fix-5904 
Light Tile Inspector Improvements
 2020-10-03 15:16:10 -03:00
Tulio Leao e4d72cefaa Fix #5904: Empty errors on tile inspector base height change 2020-10-02 01:06:54 -03:00
OpenRCT2 git bot d33ddaba2c Merge Localisation/master into OpenRCT2/develop 2020-10-02 04:05:11 +00:00
OpenRCT2 git bot e9483ad6f0 Merge Localisation/master into OpenRCT2/develop 2020-09-29 04:05:04 +00:00
OpenRCT2 git bot 0297d0bef3 Merge Localisation/master into OpenRCT2/develop 2020-09-28 04:07:02 +00:00
OpenRCT2 git bot e882e9003c Merge Localisation/master into OpenRCT2/develop 2020-09-24 04:04:44 +00:00
OpenRCT2 git bot 1a815584ab Merge Localisation/master into OpenRCT2/develop 2020-09-20 04:04:43 +00:00
OpenRCT2 git bot 27a7ca778f Merge Localisation/master into OpenRCT2/develop 2020-09-17 04:04:39 +00:00
OpenRCT2 git bot 564cc7b635 Merge Localisation/master into OpenRCT2/develop 2020-09-16 04:04:36 +00:00
Brett c9de4f49fe
Add snow as a weather type 
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
 2020-09-14 21:58:00 +02:00
OpenRCT2 git bot 5fb6c57a5d Merge Localisation/master into OpenRCT2/develop 2020-09-01 04:04:29 +00:00
OpenRCT2 git bot 26def87167 Merge Localisation/master into OpenRCT2/develop 2020-08-30 04:06:57 +00:00
OpenRCT2 git bot 76e7cd2c92 Merge Localisation/master into OpenRCT2/develop 2020-08-25 04:04:18 +00:00
OpenRCT2 git bot d5626f7f12 Merge Localisation/master into OpenRCT2/develop 2020-08-20 04:04:13 +00:00
OpenRCT2 git bot 8d141faac2 Merge Localisation/master into OpenRCT2/develop 2020-08-19 04:06:03 +00:00
OpenRCT2 git bot 40814c46d9 Merge Localisation/master into OpenRCT2/develop 2020-08-17 04:04:03 +00:00
OpenRCT2 git bot c53efa6ae4 Merge Localisation/master into OpenRCT2/develop 2020-08-16 04:03:50 +00:00
OpenRCT2 git bot d857a5e6cf Merge Localisation/master into OpenRCT2/develop 2020-08-15 21:00:46 +02:00
OpenRCT2 git bot e7eac33c82 Merge Localisation/master into OpenRCT2/develop. 2020-08-15 04:03:43 +00:00
Michał Janiszewski 55835456a0 Pester users to update to latest release 2020-08-14 10:18:17 +02:00
OpenRCT2 git bot 6d5a4a7f7d Merge Localisation/master into OpenRCT2/develop. 2020-08-13 04:03:57 +00:00
OpenRCT2 git bot 75397c72a1 Merge Localisation/master into OpenRCT2/develop. 2020-08-11 04:04:02 +00:00
ζeh Matt cb38d28b62
Fix #12621: Missing argument for localisation 2020-08-10 14:58:39 +02:00
OpenRCT2 git bot 1f3ea50915 Merge Localisation/master into OpenRCT2/develop. 2020-07-29 04:03:25 +00:00
Michael Steenbeek f8ab48176a
Tile Inspector: remove hardcoded surface/edge style names 2020-07-28 22:37:52 +02:00
OpenRCT2 git bot 59c2e01314 Merge Localisation/master into OpenRCT2/develop. 2020-07-28 04:03:24 +00:00
OpenRCT2 git bot c0a1370df9 Merge Localisation/master into OpenRCT2/develop. 2020-07-27 04:03:39 +00:00
Matt 241ff111dd Address reviews 2020-07-25 14:10:01 +02:00
Matt 1eedaf32dd Refactor sending the object list including status reporting 2020-07-24 23:11:28 +02:00
OpenRCT2 git bot 6b5f51b3c0 Merge Localisation/master into OpenRCT2/develop. 2020-07-24 04:03:30 +00:00
OpenRCT2 git bot ee39bff1b4 Merge Localisation/master into OpenRCT2/develop. 2020-07-19 04:03:11 +00:00
Gymnasiast cf664c8340
Close #11971: Replace ride groups with new ride types 2020-07-17 00:19:49 +02:00
OpenRCT2 git bot 60ff09fce6 Merge Localisation/master into OpenRCT2/develop. 2020-07-15 04:03:20 +00:00
OpenRCT2 git bot 37446e07de Merge Localisation/master into OpenRCT2/develop. 2020-07-14 04:03:20 +00:00
Michael Steenbeek 9b8896d35b
Fix #12250: Message shownafter adding RCT1 path is ambiguous (#12254) 2020-07-13 21:24:39 -03:00
OpenRCT2 git bot a47ca9d619 Merge Localisation/master into OpenRCT2/develop. 2020-07-11 04:03:25 +00:00
OpenRCT2 git bot 36c9259a5f Merge Localisation/master into OpenRCT2/develop. 2020-07-10 04:03:33 +00:00
OpenRCT2 git bot d33af08a22 Merge Localisation/master into OpenRCT2/develop. 2020-07-01 04:03:23 +00:00
OpenRCT2 git bot 972c28619e Merge Localisation/master into OpenRCT2/develop. 2020-06-29 04:02:44 +00:00
OpenRCT2 git bot 62593dd5d2 Merge Localisation/master into OpenRCT2/develop. 2020-06-22 04:02:49 +00:00
Gymnasiast 5029f754ed
Fix #7324: Research window shows vehicle name instead of ride name 2020-06-19 22:50:53 +02:00
Gymnasiast 96678a14eb
Move ride naming to RTD 
This also means that all unused ride types will now have the same name. I have made an exception for the 'arbitrary ride type change' dropdown only.
 2020-06-16 22:52:48 +02:00
OpenRCT2 git bot 3530a00998 Merge Localisation/master into OpenRCT2/develop. 2020-06-12 04:02:56 +00:00
OpenRCT2 git bot 20a4e77b24 Merge Localisation/master into OpenRCT2/develop. 2020-06-09 04:02:49 +00:00
OpenRCT2 git bot 22d099d6bd Merge Localisation/master into OpenRCT2/develop. 2020-06-08 04:02:28 +00:00
OpenRCT2 git bot 05c7615c2c Merge Localisation/master into OpenRCT2/develop. 2020-06-07 04:02:27 +00:00
OpenRCT2 git bot d879c2fba4 Merge Localisation/master into OpenRCT2/develop. 2020-06-05 04:02:29 +00:00
Gymnasiast 231b704fa7
en-GB: Fix speed display 2020-06-04 11:45:43 +02:00
OpenRCT2 git bot 1a5b81027f Merge Localisation/master into OpenRCT2/develop. 2020-06-04 04:02:26 +00:00
OpenRCT2 git bot 2a8ab374d3 Merge Localisation/master into OpenRCT2/develop. 2020-06-03 04:02:33 +00:00
Michiel Bos 3fdab8e7d9 Added icon to Cheats button to indicate clearance checks are disabled 2020-05-30 17:10:08 +02:00
Michiel Bos 670b879235 Added a shortcut key for disabling/enabling clearance checks. 2020-05-30 17:10:08 +02:00
OpenRCT2 git bot 28941c6559 Merge Localisation/master into OpenRCT2/develop. 2020-05-29 04:02:33 +00:00
Gymnasiast 9a9ab47856
Remove Twitch from the rest of the code 2020-05-28 09:28:32 +02:00
OpenRCT2 git bot 6e61d392aa Merge Localisation/master into OpenRCT2/develop. 2020-05-12 04:01:53 +00:00
Michael Steenbeek 451af76fb6
Remove nonfunctional "guest is lost" notification (#11722) 2020-05-11 21:31:02 +02:00
OpenRCT2 git bot 0f35fae148 Merge Localisation/master into OpenRCT2/develop. 2020-05-11 04:01:53 +00:00
Michael Steenbeek 142b229bfa
en-GB: Fix another trailing whitespace 2020-05-10 23:16:30 +02:00
Michael Steenbeek ed47bb7414
en-GB: Fix trailing whitespace 2020-05-10 23:14:23 +02:00
OpenRCT2 git bot e369c2290a Merge Localisation/master into OpenRCT2/develop. 2020-05-07 04:01:51 +00:00
Michael Steenbeek 8660bbe9d7
Fix #1013: negative length in Ride window (#11651) 2020-05-06 11:32:10 +02:00
OpenRCT2 git bot 174b32c098 Merge Localisation/master into OpenRCT2/develop. 2020-05-04 04:02:07 +00:00
OpenRCT2 git bot 5ac866c54a Merge Localisation/master into OpenRCT2/develop. 2020-04-28 04:01:45 +00:00
OpenRCT2 git bot e6d5364bf4 Merge Localisation/master into OpenRCT2/develop. 2020-04-27 04:01:46 +00:00
OpenRCT2 git bot 6d0e29543b Merge Localisation/master into OpenRCT2/develop. 2020-04-26 04:01:48 +00:00
Michael Steenbeek c5d877f644
Rephrase STR_6037 2020-04-25 15:39:08 +02:00
Michael Steenbeek 0ecc64f781
Fix #11407: Setting an RCT1 path needs better error messages (#11418) 2020-04-25 15:36:44 +02:00
OpenRCT2 git bot 6ebd918cde Merge Localisation/master into OpenRCT2/develop. 2020-04-25 04:01:46 +00:00
Kevin Strehl 5456899afc
Close #10572: Add cheat to allow building at invalid heights 2020-04-25 01:07:36 +02:00
Umdlye 76c10d1806
en-GB: Fix capitals after hyphens 
Co-authored-by: pizza2004 <pizza2004@users.noreply.github.com>
 2020-04-24 15:32:38 +02:00
OpenRCT2 git bot 2fd8e7a9ff Merge Localisation/master into OpenRCT2/develop. 2020-04-24 04:02:05 +00:00
Michael Steenbeek 619b06254e
en-GB: Change "plug-in objects" to "custom objects" (#11421) 
This change is to avoid confusion with the upcoming plug-in system. Additionally, "custom objects" is what most people would call these anyway.
 2020-04-23 23:38:25 +02:00
ifimfree aaaae16d15
Close #11209: Show a warning when the user is running OpenRCT2 in Wine (#11395) 2020-04-23 19:12:54 +02:00
OpenRCT2 git bot 6992299c1a Merge Localisation/master into OpenRCT2/develop. 2020-04-20 04:02:06 +00:00