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

571 Commits

Author SHA1 Message Date
Gymnasiast 14275f3be4
Read hasShelter property from station object 2021-10-27 11:46:07 +02:00
Michael Steenbeek 977833cf8f
Remove resolved TODO 2021-10-20 21:37:01 +02:00
ζeh Matt 7bb8a7b838
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-10-20 19:22:12 +03:00
ζeh Matt 6f28f3e516
Backport ImageTable changes 
Co-authored-by: Ted John <ted@brambles.org>
 2021-10-20 16:50:38 +03:00
Hielke Morsink 7e2e6e2b2f
Merge branch 'develop' into new-save-format 2021-10-19 22:26:08 +02:00
Hielke Morsink 9dd20ec619
Improve array formatting 
For most of these cases, adding a trailing comma to the array block makes clang-format put each item on a new line, and clang-format exception blocks could be reduced where clang-format does not handle them properly.
 2021-10-17 18:21:45 +02:00
Gymnasiast f03de84116
Add support for “no queue banner” flag 2021-10-17 12:34:54 +02:00
duncanspumpkin 1ff0929c91 Merge branch 'develop' into HEAD 2021-10-14 16:56:50 +01:00
Silent daef940bc8
Fix LargeSceneryObject and WaterObject not tearing down the image ID 2021-10-10 00:09:36 +02:00
ζeh Matt b96565266c
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-10-06 19:47:09 +03:00
Hielke Morsink 1d62a902e7
Make scenery_small_entry_has_flag a member function (#15509) 2021-10-01 16:50:05 -03:00
ζeh Matt 8ae8a26a0f
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-09-28 01:53:18 +03:00
Duncan 50118ae039
Move function for NSF use 2021-09-27 22:54:41 +02:00
Gymnasiast ea4c9681b5
Revert stray changes 2021-09-26 20:00:42 +02:00
Hielke Morsink d93309d065
Merge branch 'develop' into new-save-format 2021-09-17 23:41:58 +02:00
Ted John 80e0f990ab Fix remaining merge conflicts 2021-09-17 22:16:47 +01:00
Ted John 7f6b2525a7 Fix more merge conflicts 2021-09-17 21:17:23 +01: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
Gymnasiast c390e9f521
Merge remote-tracking branch 'upstream/develop' into new-save-format 
Some conflicts intentionally unresolved
 2021-09-17 10:15:09 +02: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
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
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 59a6c34db4
Make use of std::optional strict 2021-09-13 20:02:32 +03:00
IntelOrca 4f319d6ed4
Prepare footpath handling for surfaces and railings 2021-09-12 17:52:01 +02: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 2daa356fbf
Move ZipStream into new header 2021-09-11 19:06:17 +03:00
ζeh Matt 50d7b8bb1c
Remove unused function get_loaded_object_entry 2021-09-11 16:50:30 +03:00
ζeh Matt 38ec042a52
Refactor object_entry_get_chunk wrapper 2021-09-11 16:50:30 +03:00
ζeh Matt c416c7ca27
Remove unused function get_loaded_object_chunk 2021-09-11 16:50:30 +03:00
Gymnasiast 4cc717ccdb
Rework path surface and railings descriptor handling 2021-09-05 19:09:09 +02:00
Gymnasiast 2282f24404
Rename path surface and railings descriptors 2021-09-05 19:09:09 +02:00
Michael Steenbeek 7b2554cdae
Addendum to #15340: guard size of object_entry_group_counts 2021-09-05 16:06:34 +02:00
ζeh Matt 5868071fbc
Merge pull request #15335 from ZehMatt/refactor/object-load 
Fix ownership of loaded object data
 2021-09-04 09:13:45 -07:00
Hielke Morsink fd2a572f9a
Fix #15319: Clicking on Object Selection Cheat Freezes the Game 
This fixes it by adding limits for the missing path types.

Co-authored-by: ζeh Matt <5415177+ZehMatt@users.noreply.github.com>
 2021-09-04 01:09:09 +02:00
ζeh Matt 6186b29675
Apply review suggestion 2021-09-03 18:03:19 +03:00
ζeh Matt cf0425d953
Fix building 2021-09-03 14:45:48 +03:00
ζeh Matt a118b16912
Remove unused functions 2021-09-03 14:45:47 +03:00
ζeh Matt 976c614881
Reduce duplicate code 2021-09-03 14:45:47 +03:00
ζeh Matt a44f3017dc
Move the log print and remove optional parameter 2021-09-03 14:45:47 +03:00
ζeh Matt 1f4f0c015c
Fix ownership of loaded object data 2021-09-03 14:45:47 +03:00
Ted John 3c451a4af4
Use music objects instead of IDs 2021-09-01 10:26:23 +02:00
Gymnasiast 612724e8f8
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-08-31 00:42:44 +02:00
Gymnasiast bcba227430
Add footpath surface and railings objects from NSF 2021-08-29 17:07:38 +02:00