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

21886 Commits

Author SHA1 Message Date
seanmajorpayne 2ba515fb37
Improve #15322: Circus Music Not Playing 
Alleviates the issue, though the circus in European Extravaganza still does not work correctly.
 2021-09-25 19:21:38 +00:00
Michael Steenbeek 1feac16bed
Merge pull request #15414 from frutiemax/develop 
#15367: Encode RideType in TrackElement
 2021-09-25 12:02:08 +02:00
Hielke Morsink a8b84989eb
Check for nullptr explicitly in operct2-ui (#15460) 2021-09-25 08:45:06 +02:00
Hielke Morsink 53c22c9b4b
Check for nullptr explicitly (#15458) 2021-09-24 20:05:50 +02:00
ζeh Matt e5de2adc4f
Merge pull request #15429 from ZehMatt/backport/ticks 
Remove scenario ticks and adjust export/import
 2021-09-23 12:08:16 -07:00
ζeh Matt 7302cb806a
Update replays 2021-09-23 21:49:09 +03:00
ζeh Matt c61f141cdc
Bump up network version 2021-09-23 21:49:09 +03:00
ζeh Matt 74e8988dd8
Remove scenario ticks and adjust export/import 
Co-authored-by: Ted John <ted@brambles.org>
 2021-09-23 21:49:09 +03:00
ζeh Matt 719a5a9d8e
Merge pull request #15369 from ZehMatt/refactor/tile-coords 
Refactor overload map_get_first_element_at
 2021-09-21 14:36:03 -07:00
Hielke Morsink 9060a0d228
Add missing headers to VS project file (#15457) 2021-09-21 23:34:33 +02:00
Duncan a268350615
Fix #15439: Ride viewport is partially grey 
The ride viewport does not work the same as other viewports due to the selection of views that it has. After refactoring the focus system to use a more streamlined approach the ride viewport lost its invalidation on resizing. If the ride window was to use the same viewport update code as say the guest window then the viewport focus still ends up incorrect due to it no longer centring the focus. Therefore the best approach was to lose the focus on resize and force a recalculation of it.

Also renamed Focus2 to Focus as Focus2 was meant to just be fill in whilst removing the original focus structs.
 2021-09-21 11:06:04 +02:00
Gymnasiast 8fb8b2a4c1
Do not overwrite ride type when extending station 2021-09-21 10:50:38 +02:00
Gymnasiast 11607f525d
const auto& 2021-09-21 10:49:29 +02:00
Gymnasiast 1e17304e76
Show the appropriate ride type in the TI 2021-09-21 10:49:29 +02:00
Gymnasiast f21b941b46
Introduce ride_type_t 2021-09-21 10:49:29 +02:00
frutiemax 355019f97f
#15367: Encode RideType in TrackElement 2021-09-21 10:49:28 +02:00
ζeh Matt c56810e6a5
Fix #15442: Use after free in object manager 2021-09-21 10:34:58 +02:00
OpenRCT2 git bot fddf009afc Merge Localisation/master into OpenRCT2/develop 2021-09-21 04:08:19 +00:00
Hielke Morsink 30b8f2e5a9
Merge pull request #15441 from OpenRCT2/janisozaur-patch-1 2021-09-19 23:03:40 +02:00
Michał Janiszewski a37c8539e7
Fix bounds check in Litter::GetName 2021-09-19 22:38:25 +02:00
ζeh Matt 6a1dbb9268
Merge pull request #15438 from Broxzier/feature/nsf-issue 
Add 'new save format' as option for issue area
 2021-09-19 12:01:35 -07:00
Hielke Morsink 3eaf1d4300
Add 'new save format' as option for issue area 2021-09-19 20:41:10 +02:00
Hielke Morsink d3f7660a46
Use min/max water height defines in mapgen 2021-09-19 17:18:23 +02: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