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 337 MiB
Commit Graph

1424 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
Michael Steenbeek a1b70b59d6
Fix #15177: Crash in lightfx_add_lights_magic_vehicle() 2021-10-26 20:10:03 +02:00
Michael Steenbeek dd007c836f
Fix #15579: Crash in track_block_get_next() 2021-10-26 18:05:13 +00:00
Gymnasiast 815d09a431
Fix #14482: Rides with Crooked House hack sometimes misbehave 2021-10-22 16:15:21 +02:00
ζeh Matt 3142ed7058
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-10-20 20:47:31 +03:00
Michael Steenbeek 62a9096079
Fix #15466: Crash when opening dropdown with 0 rows 2021-10-20 18:50:21 +02:00
ζeh Matt 7bb8a7b838
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-10-20 19:22:12 +03:00
Michael Steenbeek 578d8ce247
Fix #15612: Crash in WallCheckObstruction() 2021-10-20 14:15:35 +00:00
ζeh Matt a98caef48a
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-10-20 16:35:05 +03:00
seanmajorpayne f6cb144f8c
Fix #15322: Circus Music is Not Playing (Full Fix) 2021-10-20 13:11:06 +00:00
Hielke Morsink 2ad0ace1cc
Merge branch 'develop' into new-save-format 2021-10-17 13:14:25 +02:00
Michael Steenbeek 5cb1cee0d8
Fix #15584: Ride income underflows when on-ride photos are making losses 2021-10-17 09:15:13 +02:00
ζeh Matt f1875f9518
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-10-16 16:50:16 +03:00
Bas 8682a8677e Fix unable to read litter information in plugin api 2021-10-16 15:38:52 +02:00
Michael Steenbeek 0b6c6bb22a
Merge pull request #15490 from Broxzier/bugfix/invalid-clearance-surfaces 
Fix: Surface slopes edited by TI have invalid clearance
 2021-10-15 19:55:50 +02:00
ζeh Matt 57ec8424c9
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-10-14 19:13:35 +03:00
ζeh Matt 19464c6e17
Merge pull request #15566 from ZehMatt/fix-litter-underflow 
Fix #15567: Litter age underflow
 2021-10-14 09:11:22 -07:00
duncanspumpkin 1ff0929c91 Merge branch 'develop' into HEAD 2021-10-14 16:56:50 +01:00
seanmajorpayne 04004d9b8c
Fix #15377: Station Hover doesn't show entrance/exit ghost (#15523) 
Fix #15377: Station Hover doesn't show entrance/exit ghost

Replacing tileElement->AsTrack() with trackElement
Changing const auto* to TrackElement*
Replacing trackElement with auto
Implementing ZehMatt's Feedback
Update changelog.txt
 2021-10-14 17:01:47 +03:00
Hielke Morsink cac2708066
Add changelog entry 2021-10-13 23:44:17 +02:00
ζeh Matt f2bfec977f
Update changelog.txt 2021-10-13 21:35:21 +03:00
ζeh Matt b4cd8e4628
Fix #15560: Memory leak due to OpenGL Renderer not releasing a texture 2021-10-11 21:01:11 +02:00
Michael Steenbeek 6ea0d8639d
Merge pull request #15552 from CookiePLMonster/fix-15227 
Fix Object Selection not tearing down objects properly
 2021-10-11 09:30:33 +02:00
Adam c812b696bd
Fix #14741: crash on macOS exit (#15550) 2021-10-10 22:01:18 +01:00
duncanspumpkin e5f9568180 Merge branch 'develop' into HEAD 2021-10-10 07:21:36 +01:00
Silent daef940bc8
Fix LargeSceneryObject and WaterObject not tearing down the image ID 2021-10-10 00:09:36 +02:00
adam-bloom ab1b044925 Fix #13524: add changelog entry 2021-10-09 15:00:27 -06:00
ζeh Matt 754cabf50e
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-10-09 16:02:17 +03:00
ζeh Matt 05e58cda11
Merge pull request #15538 from ZehMatt/feature/parallel-draw 
Implement multithreaded drawing
 2021-10-09 05:53:48 -07:00
seanmajorpayne e8b6e24498
Fix #15451: Guest List name filter remains after group selection 2021-10-09 12:49:26 +02:00
duncanspumpkin 982b5b2cb3 Merge branch 'develop' into HEAD 2021-10-08 07:54:24 +01:00
seanmajorpayne 25419bb4e3
Fix #15197: Cannot place flat ride after removing it in construction 
Demolishing a flat ride (using the bulldozer icon in the construction menu) will now reopen the construction window to it's default state.
 2021-10-08 00:13:04 +02:00
ζeh Matt 5f874f15c7
Update changelog.txt 2021-10-08 01:02:45 +03:00
Michael Steenbeek 5563139ed1
Fix #15503: Freeze when doing specific merges 2021-10-06 23:00:06 +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 b246a4919d
Fix #15514: Two “quit to menu” menu items available in track designer 2021-10-03 15:20:45 +02:00
Gymnasiast 5a0fa60b9e
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-10-01 18:45:51 +02:00
Michael Steenbeek 06dc75845a
Fix #15476: Crash in map_place_clear_func() 2021-10-01 16:10:25 +00:00
Gymnasiast d3cfa07a2a
Fix #15496: crash in paint_swinging_inverter_ship_structure() 2021-10-01 13:51:00 +02:00
duncanspumpkin 7b954f876e Merge branch 'develop' into HEAD 2021-09-30 13:06:41 +01: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 ac84b61eaf
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-09-30 00:21:02 +03:00
Michael Steenbeek e5f9282a36
Merge pull request #15470 from Broxzier/bugfix/15213-unicode-freeze 
Fix #15213: Freeze when reading a partially cut unicode character
 2021-09-29 20:26:01 +02:00
Gymnasiast 17a6ecb09b
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-09-29 19:10:01 +02:00
Duncan cce3bb1845
Fix #15136: Exported SV6 hangs/crashes vanilla RCT2 2021-09-29 18:48:50 +02:00
Hielke Morsink 219a4efa0f
Add changelog entry 2021-09-27 15:09:08 +02:00
Gymnasiast e4d6cd3c34
Revert stray changes to openrct2.d.ts 2021-09-26 11:54:06 +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
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
seanmajorpayne 33fbad9726
Fix #15257: Chat widgets removed from Scenario Editor (#15365) 
* Update TopToolbar.cpp

Removed else statement which caused the game to skip toolbar element deactivations.

* Update contributors.md

Adding name to contrib.md

* Update changelog.txt

Updated changelog

* Update changelog.txt

Fixing changelog item position
 2021-09-08 12:39:34 +02:00