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

21915 Commits

Author SHA1 Message Date
duncanspumpkin 73f5c48c94 Port over getPatrolAreaOffset and revert hasPatrol 
HasPatrol shouldn't perform the expensive loop check as it was only used in StaffSetPatrolAreaAction and used incorrectly.
 2021-09-19 08:39:08 +01:00
duncanspumpkin ca689c3948 Introduce methods from NSF 
These methods still call the same legacy functionality for now
 2021-09-19 08:28:25 +01:00
Duncan 938792e6be
Use CoordsXYZ for ride view (#15434) 
* Use CoordsXYZ for ride view

Part of the NSF but also took the time to refactor slightly to use the more appropriate types. Annoyingly there isn't a operator/ for CoordsXYZ otherwise this could have been further simplified.

* Fix missed minx/maxx occurrence

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
 2021-09-19 07:19:32 +01:00
OpenRCT2 git bot 99e3883b6e Merge Localisation/master into OpenRCT2/develop 2021-09-19 04:07:58 +00:00
Duncan 81051f2d21
Add crypt files from NSF 2021-09-18 20:31:23 +00:00
Duncan fa57b6aea0
Remove focus union and replace with typed focus (#15426) 
* Remove focus union and replace with typed focus

This if for the NSF to allow for CoordsXYZ

* Remove legacy structures

* Rework viewport_create to deduplicate logic

* Simplify yet further

* Apply review comments

* Remove intermediate
 2021-09-18 20:34:38 +01:00
Duncan c05068e8d1
Replace sprite_left,t,r,b with SpriteRect (#15408) 
* Replace sprite_left,t,r,b with SpriteRect

This is required for the NSF. I had to add a silly constructor to rct_sprite for now. Will eventually be removed one day...

* Fix compilation and memory leak

* Add some UB to prevent some other UB

* Make review change
 2021-09-18 19:07:35 +01:00
ζeh Matt 911204411f
Merge pull request #15428 from ZehMatt/backport/string-view-network 
Use std::string_view where appropriate in network code
 2021-09-17 15:50:18 -07:00
ζeh Matt 2529568bfc
Use std::string_view where appropriate in network code 
Co-authored-by: Ted John <ted@brambles.org>
 2021-09-18 00:14:28 +03:00
Hielke Morsink 77141f57b0
Merge pull request #15416 from Broxzier/refactor/unnecessary-else 
Remove unnecessary else blocks
 2021-09-17 14:56:30 +02:00
ζeh Matt de85a1788b
Merge pull request #15412 from ZehMatt/refactor/ga-results 
Allow game actions to store custom data instead of using inheritance
 2021-09-16 14:35:03 -07:00
Hielke Morsink fc8e0cf9d7
A couple more nullopt returns (#15422) 2021-09-16 23:05:50 +02:00
Hielke Morsink 4b4b3333d6
Remove unnecessary else blocks 2021-09-16 18:31:12 +02:00
ζeh Matt 427bb7b330
Fix sv6 export not adding all objects (#15419) 2021-09-16 14:28:02 +01:00
Michael Steenbeek 2f2e8b4c48
Merge pull request #15403 from Gymnasiast/refactor/object-nsf 
Modify object loading for JSON-only objects
 2021-09-16 09:08:43 +02:00
OpenRCT2 git bot 16472a400f Merge Localisation/master into OpenRCT2/develop 2021-09-16 04:07:59 +00:00
Gymnasiast 51a7c2ad44
Fix log_warning spam for OBJECT_ENTRY_INDEX_NULL 2021-09-15 22:42:32 +02:00
Gymnasiast ecaf361743
Revert porting errors 2021-09-15 18:27:15 +02:00
Gymnasiast adce8c998e
Return early in RepositoryItemToObject() 2021-09-15 17:58:42 +02:00
Gymnasiast 6a7084aa4d
Fix formatting and TODO note 2021-09-15 17:54:39 +02:00
Ted John 8cdece0252
Fix incorrect objects in S6 import 2021-09-15 11:28:40 +02:00
Gymnasiast bdab3219cb
Modify object loading for JSON-only objects 2021-09-15 11:28:39 +02:00
Michael Steenbeek 37821ce25e
Merge pull request #15336 from Gymnasiast/refactor/more-paths 
Prepare footpath handling for surfaces and railings (from NSF)
 2021-09-15 10:58:01 +02:00
Michał Janiszewski 1a35cdafb3
Add limits include to Object.h (#15415) 
PPA builds seem to complain about this
 2021-09-15 08:25:55 +02:00
ζeh Matt 42254d774d
Allow game actions to store custom data instead of using inheritance 2021-09-14 20:25:37 +03:00
Hielke Morsink 28681eebc0
Merge pull request #15407 from ZehMatt/refactor/optional-use 
Make use of std::optional strict
 2021-09-14 17:45:18 +02:00
ζeh Matt 687b6c000e
Apply review suggestion 
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
 2021-09-14 16:30:38 +03:00
Hielke Morsink 0b0354b113
Merge pull request #15410 from Broxzier/refactor/use-nullopt 2021-09-14 13:15:30 +02:00
OpenRCT2 git bot 3f8f78ac8f Merge Localisation/master into OpenRCT2/develop 2021-09-14 04:11:10 +00:00
Hielke Morsink 2ed7c217bf
Remove local instances of std::optional 2021-09-13 23:26:14 +02:00
Hielke Morsink 2af5e0dc82
Remove unnecessary else block 2021-09-13 23:25:33 +02:00
Hielke Morsink cf78d6841d
return nullopt instead of {} 2021-09-13 23:24:57 +02:00
Hielke Morsink 7dd90b99d6
Merge pull request #15162 from seifer7/feature-7682 2021-09-13 21:00:27 +02:00
Kane b35fd28c55
Feature #7682: Lock camera to vehicle in main window 
Pressing the "Locate" button in the Ride window when selected on a "Vehicle/Train" will now have the main viewport track the vehicle.
 2021-09-13 20:44:52 +02:00
Gymnasiast 1dde081468
Bump Xcode deployment target to macOS 10.14 2021-09-13 21:38:31 +03:00
ζeh Matt 59a6c34db4
Make use of std::optional strict 2021-09-13 20:02:32 +03:00
duncanspumpkin b5eec55a05 Update replays 2021-09-13 14:50:58 +01:00
Michael Steenbeek 6ffb03dde0
Add icon for path railings tab 2021-09-13 09:29:46 +02:00
Michael Steenbeek 36b0837318
Merge pull request #15400 from Gymnasiast/refactor/free-entity-from-nsf 
Small cherry-picks from NSF
 2021-09-12 19:05:13 +02:00
Michael Steenbeek 5d039a5f55
Use std::string_view instead of C string 
Co-authored-by: ζeh Matt <5415177+ZehMatt@users.noreply.github.com>
 2021-09-12 18:45:53 +02:00
Gymnasiast 6202ecb281
Make util_zlib_inflate() take const 2021-09-12 18:36:50 +02:00
Gymnasiast 1426010652
Plugin: use ObjectEntryIndex for music and entrance style 2021-09-12 18:33:27 +02:00
Gymnasiast 3e1544aac8
Add missing object types to ObjectTypeToString() 2021-09-12 18:31:21 +02:00
Gymnasiast 0f183e9ad2
Make FreeEntity take a reference 2021-09-12 18:29:37 +02:00
Gymnasiast c567ca09db
Fix stray changes 2021-09-12 17:52:01 +02:00
Gymnasiast 228c1ac7f5
Fix formatting 2021-09-12 17:52:01 +02:00
Gymnasiast 6715250d54
Remove now-unused enum 2021-09-12 17:52:01 +02:00
Gymnasiast 024f836960
Create FootpathCreateConstructFlags 2021-09-12 17:52:01 +02:00
Gymnasiast 866c66bc58
Use title case, scope slope variable 2021-09-12 17:52:01 +02:00
IntelOrca 4f319d6ed4
Prepare footpath handling for surfaces and railings 2021-09-12 17:52:01 +02:00