Commit Graph

420 Commits

Author SHA1 Message Date
Michael Steenbeek 4ac3fd4b49
Merge pull request #14307 from adam-bloom/xcode_v28_dependencies
Xcode v28 dependencies
2021-03-15 14:10:21 +01:00
Duncan 5474194905
Implement train view and remove linked_list_index (#13956)
* Make train manager view

* Remove linked list index field

* Remove merge mistake

* Fix further rebase errors

* Rename and add comments

* Update replays

* Fix Xcode project

* Increment network version

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
2021-03-15 08:13:00 +00:00
adam-bloom d8f9f38576 Dependencies v28 in Xcode build 2021-03-13 11:41:28 -07:00
Sébastien LeBlanc 642fe8e62e Fix #13436: Update MacOS Icon for Big Sur 2021-03-08 05:55:17 -07:00
Ted John 966129dd7c
Remove network traffic window
Now available in the DevTools plugin.
2021-03-06 14:47:06 +01:00
Adam 212a0c1e49
Revert Xcode to v26 dependencies 2021-03-03 22:56:03 +01:00
adam-bloom 174297b6fc OpenRCT2/Dependencies v28 2021-02-28 15:48:30 -07:00
adam-bloom f51fea47df Point Xcode and cmake at new dependencies
Update Xcode project to handle new library file names

Remove static discord-rpc library from Xcode build,
use dylib instead
2021-02-28 15:48:30 -07:00
Michael Steenbeek f2b8a13087 Update Xcode project 2021-02-21 03:14:19 +00:00
majchrzamemil 903bde7299
Fixed xcode configuration for TileBaseElement (#36)
Signed-off-by: Emil Majchrzak <majchrzakemil@gitlab.com>

Co-authored-by: Emil Majchrzak <majchrzakemil@gitlab.com>
2021-02-15 12:44:37 +01:00
Michael Steenbeek 2aa2a94a7e Update Xcode project 2021-01-27 18:45:27 +00:00
Aaron van Geffen a3312547ae Add BenchUpdate.cpp to Xcode project. 2021-01-10 13:34:14 +01:00
X123M3-256 deca5a3881
Add "Single Rail Roller Coaster" ride type 2021-01-06 21:10:15 +01:00
Adam f09b14ef2b
Split actions hpp files into separate h and cpp files (#13548)
* Split up SmallSceneryPlace/Remove

Added undo function for Remove Scenery

* Refactor: Balloon and Banner actions hpp=>h/cpp

* Refactor: rename all action *.hpp files to *.cpp

This is preparation for separation in later commits. Note that without
the complete set of commits in this branch, the code will not build.

* Refactor Clear, Climate, Custom, and Footpath actions hpp=>h/cpp

* VSCode: add src subdirectories to includePath

* Refactor Guest actions hpp=>h/cpp

* Refactor Land actions hpp=>h/cpp

* Refactor LargeScenery actions hpp=>h/cpp

* Refactor Load, Maze, Network actions hpp=>h/cpp

* Refactor Park actions hpp=>h/cpp

* Refactor/style: move private function declarations in actions *.h

Previous action .h files included private function declarations with
private member variables, before public function declarations. This
commit re-orders the header files to the following order:
- public member variables
- private member variables
- public functions
- private functions

* Refactor Pause action hpp=>h/cpp

* Refactor Peep, Place, Player actions hpp=>h/cpp

* Refactor Ride actions hpp=>h/cpp

* Refactor Scenario, Set*, Sign* actions hpp=>h/cpp

* Refactor SmallScenerySetColourAction hpp=>h/cpp

* Refactor Staff actions hpp=>h/cpp

* Refactor Surface, Tile, Track* actions hpp=>h/cpp

* Refactor Wall and Water actions hpp=>h/cpp

* Fix various includes and other compile errors

Update includes for tests.
Move static function declarations to .h files
Add explicit includes to various files that were previously implicit
(the required header was a nested include in an action hpp file, and the
action .h file does not include that header)
Move RideSetStatus string enum to the cpp file to avoid unused imports

* Xcode: modify project file for actions refactor

* Cleanup whitespace and end-of-file newlines

Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
2020-12-10 06:39:10 +00:00
Adam 22063ec8b9
Fix #6677: Add discord RPC to macOS builds 2020-12-09 22:16:51 +01:00
Adam a71a0ccd0c
Fix MacOS CI: Explicitly set macOS builds to x86_64 only (#13525) 2020-12-05 17:10:31 +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
Gymnasiast a7ac82a060
Update objects to v1.0.20 2020-12-02 17:17:32 +01:00
Aaron van Geffen 0dd980e5fd Add Formatting.{cpp,h} to Xcode project 2020-11-27 18:54:57 +00:00
Hielke Morsink f0c1ea1d37
Split declarations and definitions to improve compile times when editing (#13332)
* Split FileStream declarations and definitions

* Split JobPool declarations and definitions

* Split StringBuilder declarations and definitions

* Split StringReader declarations and definitions

* Split ZoomLevel declarations and definitions

* Fix missing include in FileClassifier.cpp

* Remove pragma once from source files

* Fix missing include in StringBuilder.h

* Update Xcode project

* Fix compilation of tests

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
2020-11-07 12:42:04 +00:00
Michael Steenbeek add8c3546f
Update objects to v1.0.18 (#13326) 2020-10-31 16:16:49 +01: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
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