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

1739 Commits

Author SHA1 Message Date
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