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

694 Commits

Author SHA1 Message Date
Gymnasiast aac479d76d
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-10-26 20:14:01 +02:00
Gymnasiast 9b6b86c855
Make convertFlat parameter explicit 2021-10-22 16:16:50 +02:00
Gymnasiast 59e73f9cfb
Add additional explanation + fix for flat ride vehicles on track 2021-10-22 16:15:21 +02:00
Gymnasiast afb49dfe38
Also fix vehicle track refs for good measure 2021-10-22 16:15:21 +02:00
Gymnasiast 815d09a431
Fix #14482: Rides with Crooked House hack sometimes misbehave 2021-10-22 16:15:21 +02:00
Gymnasiast 0d264479de
Split out min/max cars per train 2021-10-17 14:29:11 +02:00
Gymnasiast 4890903241
Fix accidental revert of widget changes 2021-10-17 13:44:10 +02:00
ζeh Matt 6f8e017a32
Backport track design changes 
Co-authored-by: Ted John <ted@brambles.org>
 2021-10-11 20:28:13 +03:00
ζeh Matt b96565266c
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-10-06 19:47:09 +03:00
Silent 445fb747bf
Fix Scenario description missing when loading a park from a save file 
Saved games do not have a valid info chunk,
so scenario names/descriptions did not load.
 2021-10-03 20:57:17 +02:00
Michael Steenbeek bfe7caacd7
Fix #15487: map animations do not work correctly in vanilla RCT2 (#15492) 
Co-authored-by: duncanspumpkin <duncanspumpkin@users.noreply.github.com>

Co-authored-by: duncanspumpkin <duncanspumpkin@users.noreply.github.com>
 2021-09-30 07:40:58 +01:00
ζeh Matt 3a5452f0c9
Update entities xyz to int32_t 2021-09-29 19:49:15 +03:00
Duncan cce3bb1845
Fix #15136: Exported SV6 hangs/crashes vanilla RCT2 2021-09-29 18:48:50 +02:00
Hielke Morsink 5d2a367249
Merge branch 'develop' into new-save-format 2021-09-25 12:28:42 +02: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 53c22c9b4b
Check for nullptr explicitly (#15458) 2021-09-24 20:05:50 +02:00
ζeh Matt f689b4e4c8
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-09-23 22:28:17 +03: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 74e8988dd8
Remove scenario ticks and adjust export/import 
Co-authored-by: Ted John <ted@brambles.org>
 2021-09-23 21:49:09 +03:00
frutiemax 355019f97f
#15367: Encode RideType in TrackElement 2021-09-21 10:49:28 +02:00
duncanspumpkin 664dd4386c Merge branch 'develop' into HEAD 2021-09-18 19:09:46 +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
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
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 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
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
ζeh Matt 59a6c34db4
Make use of std::optional strict 2021-09-13 20:02:32 +03:00
ζeh Matt b733e97bfa
Remove numerics from common.h and use it as needed 2021-09-11 20:21:08 +03:00
ζeh Matt c9e2c9f4d2
Apply review suggestions 2021-09-11 17:25:42 +03:00
ζeh Matt e3f39bf554
Use PascalCase for object members 2021-09-11 16:50:30 +03:00
ζeh Matt 47d1633224
Refactor Export 2021-09-11 16:50:29 +03:00
ζeh Matt b1ba29716d
Refactor import of s6 objects 2021-09-11 16:50:29 +03:00
ζeh Matt ef6768dd33
Segment the object arrays in rct_s6_data 2021-09-11 16:50:26 +03:00
Hielke Morsink d42bc9a469
Merge pull request #15383 from Broxzier/refactor/smart-follow-cleanup 2021-09-10 20:13:23 +02:00
ζeh Matt 516232e0a7
Change static casts to EnumValue 2021-09-10 19:10:15 +03:00
ζeh Matt eda3188ecf
Fix rebase 2021-09-10 19:10:13 +03:00
ZehMatt 18fa68813d
Adjust importer/exporter 2021-09-10 19:10:13 +03:00
Hielke Morsink f966c229c0
Refactor out unnecessary Is<Guest/Staff> checks 2021-09-09 18:44:52 +02:00
Michael Steenbeek 624a32e93b
Make Coords isNull/setNull functions TitleCase (#15382) 2021-09-08 20:48:53 -03:00
Gymnasiast 4cc717ccdb
Rework path surface and railings descriptor handling 2021-09-05 19:09:09 +02:00
Michael Steenbeek a526caa1cb
Use std::copy for gParkRatingHistory 
Co-authored-by: ζeh Matt <5415177+ZehMatt@users.noreply.github.com>
 2021-09-04 00:03:24 +02:00
IntelOrca 600ce959d7
Use real values for gGuestsInParkHistory 2021-09-03 23:43:43 +02: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
ζeh Matt 77dccb995c
Use RCT12PeepThoughtItemNone for importers 2021-08-30 21:13:34 +03:00
ζeh Matt 483fb173f5
Adjust S6 import/export for different thought item type 2021-08-30 21:13:34 +03:00
ζeh Matt 5d2c9d8be4
Merge pull request #15267 from spacek531/remove-var-CA 
Remove var ca
 2021-08-30 11:13:20 -07:00