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

399 Commits

Author SHA1 Message Date
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
Duncan 84c9ff833a
Move formatter to separate file. Rework GetMeasurement (#13131) 
* Move formatter to seperate file. Rework GetMeasurement

* Add Formatter source files to Xcode project

Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
 2020-10-09 08:02:07 -03:00
Aaron van Geffen 0ad7e9787e Add JsonFwd.hpp to the Xcode project 2020-10-06 00:16:21 +02:00
Aaron van Geffen 3ad1df7bab
Fix #12756: Define NDEBUG for Xcode release targets (#13012) 
* Define NDEBUG for Xcode release builds

* Remove redundant GCC_PREPROCESSOR_DEFINITIONS for targets
 2020-09-27 16:44:26 +02:00
Michael Steenbeek a3c9a84ae1
Upgrade objects to v1.0.17 2020-09-24 22:42:42 +02:00
Michael Steenbeek 6b9f83a5a4
Fix compilation on Linux and macOS 2020-09-18 19:46:12 +02:00
Michael Steenbeek a4bd49186e
Update Xcode project 2020-09-18 19:46:12 +02:00
Tulio Leao c72f547606
Merge pull request #12916 from richard-fine/pathfinding 
Pathfinding cleanup
 2020-09-17 17:58:31 -03:00
Michael Steenbeek 1982e8491b
Merge pull request #12667 from mwnciau/json-refactor 
Migrate JSON library to JSON for Modern C++
 2020-09-17 21:11:06 +02:00
Simon Jarrett f3aba68e46 Update project build files 2020-09-16 20:18:54 +01:00
Matt 3eff713765
Remove unused Registration.hpp 2020-09-16 20:23:39 +03:00
Michael Steenbeek cf5b48a9dd
Rename Rain.{cpp,h} to Weather.{cpp,h} (#12914) 2020-09-12 19:32:26 -03:00
Richard Fine 542eb873fc Consolidate pathfinding code 
Consolidate all the guest pathfinding code from Peep.cpp into GuestPathfinding.cpp, and make a dedicated header for GuestPathfinding to help make it easier to see what the actual public interface is to the pathfinding system.
 2020-09-12 14:59:40 -04:00
Aaron van Geffen 5825dedd81
Rename TitleScenarioSelect to ScenarioSelect (#12822) 
The scenario select window is not only available through the title screen.
 2020-08-30 20:22:20 +02:00
awiebe b53c4b3625
Downgrade Mac build requirements of OpenRCT2 to macOS 10.13 (#12749) 
Keep targeting macOS 10.14 for libopenrct2 target. Replace deployment target with macOS 10.13 for other targets, including the OpenRCT2 bundle.

Explicitly type std::arrays, since Xcode refuses to use C++17 array deduction.

Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
 2020-08-28 22:27:25 +02:00
Michael Steenbeek 2bd8f21b2c
Upgrade objects to v1.0.16 
This fixes the descriptions for the sand surfaces and also fixes a few Dutch WW/TT translations.
 2020-08-10 15:40:22 +02:00
Aaron van Geffen 73bb5db99a Update Xcode project for network changes. 2020-07-30 20:29:15 +02:00
Gymnasiast bc3ad044f8
Consistently use 'Circus' 2020-07-21 13:55:48 +02:00
Gymnasiast c2153ae797
Consistenly use 'Swinging Ship' 2020-07-21 13:55:48 +02:00
Gymnasiast cf664c8340
Close #11971: Replace ride groups with new ride types 2020-07-17 00:19:49 +02:00
Aaron van Geffen d2bd9afe76 Update Xcode project. 2020-07-11 11:40:34 +01:00
Gymnasiast d28d4f4ffd
Update objects release to v1.0.15 2020-06-17 21:46:37 +02:00
Aaron van Geffen d993ec7ecf Remove Twitch source files from Xcode project. 2020-06-11 15:22:39 +02:00
Gymnasiast 9a9ab47856
Remove Twitch from the rest of the code 2020-05-28 09:28:32 +02:00
Michael Steenbeek 2770668752 Fix Xcode project 2020-05-09 20:24:48 +02:00
Michael Steenbeek 948c393bc1
Fix #8110: Use a single name for the title sequences directory (#11545) 2020-04-30 18:50:26 +02:00
Ted John c67962577a Rename __ENABLE_SCRIPTING__ to ENABLE_SCRIPTING 2020-04-26 14:35:08 +01:00
Aaron van Geffen 161985259a Xcode: change deployment target to 10.14. 
This is really unfortunate, but appears to be unavoidable.
 2020-04-26 14:35:08 +01:00
Aaron van Geffen 3c28861122 Xcode: add FileWatcher, scripting/ 2020-04-26 14:35:08 +01:00
Aaron van Geffen c17f898931 Xcode: add __ENABLE_SCRIPTING__ preprocessor macro. 2020-04-26 14:35:07 +01:00
Aaron van Geffen aefc49440a Xcode: add new thirdparty location to header search paths. 2020-04-26 14:35:07 +01:00
Aaron van Geffen 9ea056a83f Change Xcode dependencies bundle to download to v23. 2020-04-26 14:35:06 +01:00
Aaron van Geffen 4a21c7df92 Add duktape library to the Xcode project. 2020-04-26 14:35:06 +01:00
Michael Steenbeek a8bb0e59ec Update Xcode project 2020-04-26 14:35:06 +01:00
Michael Steenbeek 03785b4b24
Update objects to v1.0.14 (#11314) 2020-04-17 14:29:45 +02:00
Aaron van Geffen 302fe1cb2b
Merge pull request #10926 from IntelOrca/zoom-refactor 
Zoom refactor
 2020-03-24 23:28:32 +01:00
Michael Steenbeek 82e5ceb30d
Update objects to v1.0.13 (#11011) 2020-03-24 15:37:54 +01:00
pizza2004 7672847a3d Update Xcode project (#53) 2020-03-23 15:54:04 +00:00
Michael Steenbeek c31ef8e635
Extract vehicle subposition data to its own file (#10912) 2020-03-15 11:27:45 +01:00
Aaron van Geffen 7a67ebdf17 Xcode: update ICU from version 61.1 to 64.2. 
This drops the version number from library filenames to make future updates easier.
 2020-03-10 22:32:16 +01:00
Aaron van Geffen 003df314c6 Change Xcode dependencies bundle to download. 2020-03-10 22:24:14 +01:00
Michael Steenbeek 3b8a8e4931
Consistently order references in the Xcode project alphabetically. (#10870) 2020-03-05 10:30:19 +01:00
Gymnasiast 63430412be
Move TrackDataOld.cpp to Testpaint project 2020-02-22 20:29:35 +01:00
Anton Scharnowski 205ff401ab Added SceneryScatter.cpp to xcode project. 2020-02-22 16:18:20 +01:00
Michael Steenbeek 1e64bbedf5 Update Xcode project 2020-02-08 17:47:03 +00:00
Michael Steenbeek 77d18a664b
Implement #10358: Clean up leftover references to openrct2.website 2020-01-13 20:20:49 +01:00
duncanspumpkin d9db7a05c9 Xcode patch from 
@Gymnasiast
 2019-12-15 08:23:21 +00:00
Michael Steenbeek a11762b11a
Remove old C functions that only call their equivalent 
* Remove old C functions that only call their equivalent

* fix formatting
 2019-09-22 14:12:49 +02:00
Gymnasiast 7919e91716
Update objects to v1.0.12 2019-08-18 11:59:56 +02:00
Ted John 056ebc23d6
Update title sequences to v0.1.2c (#9854) 2019-08-11 19:03:29 +01:00