mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 12:33:17 +01:00
Code Issues Releases Wiki Activity
21,855 Commits 8 Branches 59 Tags
c61f141cdc2f775b23bbca4d5497fbf4e52ac812
Commit Graph

21855 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ζ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
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
Michael Steenbeek
002c17cec8 Merge pull request #15399 from ZehMatt/refactor/remove-nullable 
Remove Nullable and use std::optional instead
 2021-09-12 16:19:19 +02:00
ζeh Matt
f999b0acb2 Remove Nullable and use std::optional instead 2021-09-12 16:55:56 +03:00
ζeh Matt
65a484105e Merge pull request #15395 from ZehMatt/refactor/common-numerics 
Remove numerics from common.h and use it as needed
 2021-09-11 14:27:07 -07:00
ζeh Matt
b733e97bfa Remove numerics from common.h and use it as needed 2021-09-11 20:21:08 +03:00
ζeh Matt
603be1c425 Merge pull request #15394 from ZehMatt/refactor/zipstream 
Move ZipStream into new header
 2021-09-11 09:40:12 -07:00
ζeh Matt
2daa356fbf Move ZipStream into new header 2021-09-11 19:06:17 +03:00
ζeh Matt
2e2bda8f70 Merge pull request #15378 from ZehMatt/refactor/object-importexport 
Refactor object storage in s6
 2021-09-11 07:48:36 -07:00