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

17081 Commits

Author SHA1 Message Date
Matt 2053ecb688
Refactor window_scroll_to_viewport to use rct_window::ScrollToViewport 2019-08-11 17:22:00 +02:00
Matt b046d45c01
Refactor window_set_location to use rct_window::SetLocation 2019-08-11 17:21:56 +02:00
Duncan c677a9681a
Merge pull request #9840 from duncanspumpkin/fountian_refactor 
Refactor fountain to use CoordsXY(Z)
 2019-08-11 12:47:01 +01:00
duncanspumpkin d7a725f1d5 Refactor fountain to use CoordsXY(Z) 2019-08-11 07:21:07 +01:00
Ted John 68dc4d0fb8 Bump network version to deprecate recent bugged versions 2019-08-10 15:24:59 +01:00
Ted John d730a76809 Fix #9844: Guests can't enter park 2019-08-10 15:22:03 +01:00
Ted John 132a1916d6
Fix #9832: Access violation in ride_measurement_update (#9842) 
We can not store a ride pointer in ride measurement as rides are now stored in a vector which means their addresses can change when rides are constructed / removed.
 2019-08-10 15:14:22 +01:00
Ted John 60db202ea7 Return nullptr in get_sprite if out of range 2019-08-10 12:18:51 +01:00
Duncan 77d813f0f1
Merge pull request #9103 from duncanspumpkin/trackImporter 
Track importer/exporter
 2019-08-10 07:19:17 +01:00
Andrew 04159a92b6 Update contributors.md 2019-08-09 20:43:03 +01:00
Andrew Rimpici bc36ee973c Xcode fixes for macOS support 
Added in Duncan's files to the xcode project so the project builds correctly on Mac.
 2019-08-09 20:43:03 +01:00
duncanspumpkin 996cbdec02 Correctly input num_holes, inversions 2019-08-09 20:43:03 +01:00
duncanspumpkin d145f93c0b Clang format 2019-08-09 20:43:03 +01:00
duncanspumpkin 2e24dc1f00 Fix large scenery mirror rotation 2019-08-09 20:43:03 +01:00
duncanspumpkin af31404472 Use std::string and cleanup unused functions 
Use CoordsXY for save pop scenery functions

Use CoordsXY for push save scenery functions

Further refactoring to use coordsxy and standard functions
 2019-08-09 20:43:03 +01:00
duncanspumpkin e9b59064e0 Fix code and clang format. Delete dead code. 
Use correct TD4 checksum for vanilla TD4's.

Simplified the code for version detection since checksum numbers do not match up to a version

Fix TD4 imports.

Oh yeah TD4 doesn't have scenery or entrances

Move track related structs to correct files
 2019-08-09 20:43:02 +01:00
duncanspumpkin 54d6722bf2 Link everything together 2019-08-09 20:40:35 +01:00
duncanspumpkin 16022a8b57 Remove dead code 2019-08-09 20:39:54 +01:00
duncanspumpkin 02d552e048 Create td4 importer 2019-08-09 20:39:54 +01:00
duncanspumpkin af92dcba3e Creating t6 exporter 2019-08-09 20:39:54 +01:00
duncanspumpkin e3c63b762e Create new TrackDesign format 2019-08-09 20:39:53 +01:00
Ted John f87b97cda4 Fix formatting 2019-08-09 19:03:59 +01:00
Ted John 6dcedf7f57 Fix #9813: Crashes on loaded save game 
Because ride bool array was not passed by reference, game though all rides had no track and reset their type on export.
 2019-08-09 18:39:47 +01:00
Ted John 60060480c2 Fix #9826: NRE in ride_construct 2019-08-09 18:29:34 +01:00
Ted John 9954f0b725
Add nullptr checks for more instances of get_ride (#9819) 2019-08-09 14:20:59 +01:00
Ted John 93789b9034
Add nullptr checks for get_ride in libopenrct2ui (#9795) 2019-08-09 08:06:25 +01:00
Ted John ab7b17fc4e
Add nullptr checks for get_ride in libopenrct2 (#9788) 2019-08-08 22:58:56 +01:00
ζeh Matt df4e412826 Fix #9762: Update network logic also from title screen (#9773) 2019-08-08 16:49:30 +01:00
Ted John 7fd4fd0c2a
Fix #9179: Crash when modifying a ride occasionally (#9756) 
Add lots of nullptr and tile element checks in the ride_modify call chain.
 2019-08-08 12:59:06 +01:00
Ted John 08677a3322 Fix #9761: invalid read in ride_measurement_update 2019-08-08 12:55:14 +01:00
Ted John 53f228fc33 Fix #9769: NRE in sub_6A4101 2019-08-08 12:45:17 +01:00
Ted John f7c86debe3 Fix #9767: NRE in window_tile_inspector_paint 2019-08-08 12:42:09 +01:00
Ted John 379047cf43 Fix #9765: NRE in news_item_get_subject_location 2019-08-08 12:39:10 +01:00
Ted John 2cfad1fc66 Fix #9764: NRE in ride_entrance_exit_paint 2019-08-08 12:37:53 +01:00
Ted John 601780722f Fix #9760: NRE in ride_ratings_begin_proximity_loop 2019-08-08 12:36:12 +01:00
Duncan 659b4d8f9f
Clean up some litter in the codebase (#9753) 
13CA740 and 141F568 have been doing mostly nothing since the game action refacotr. Before that they didn't do much as I've never found any instance where the code was hit.
 2019-08-08 06:05:58 +01:00
Duncan 75210ef3e2
Merge pull request #9742 from duncanspumpkin/fix_9729 
Fix 9729
 2019-08-08 06:02:08 +01:00
ζeh Matt 12854d8743
Merge pull request #9731 from ZehMatt/fix-9666 
Fix #9666: pause server if no clients are connected
 2019-08-08 01:31:43 +02:00
Ted John cbb1bf9289 Fix #9752: window_close from ride construction window causes a crash 
Re-obtain iterator after calling window close event as close event may open / close other windows.
 2019-08-07 23:20:50 +01:00
Ted John b17e9b1b18 Fix #9755: Crash when importing ride measurement for null ride 2019-08-07 23:11:11 +01:00
Ted John 746d784b0e Fix placing track designs when ride 0 is not allocated 2019-08-07 21:25:28 +01:00
Ted John cd4eb86a7c
Merge pull request #9725 from IntelOrca/refactor/ride-manager 
Refactor ride list
 2019-08-07 21:03:17 +01:00
duncanspumpkin ad06491d21 Abstract the common score generator 2019-08-07 20:35:20 +01:00
Ted John 16a2046032 Fix #9745: CJK characters are broken in ride names 2019-08-07 12:34:05 +01:00
duncanspumpkin 2557e373db Increment network version 2019-08-06 21:29:08 +01:00
duncanspumpkin 8ba5b43636 Fix #9729. Change peep pathfinding to take entrance height into account 
When choosing which entrance to head to peeps would not take into account the height difference between the locations. This caused peeps to choose badly especially when useing lift transport rides.
 2019-08-06 21:28:34 +01:00
ζeh Matt 18e35c1c98
Merge pull request #9740 from ZehMatt/mp/saveprompt-pause 
Do not pause the game during save/load prompt in networked mode
 2019-08-06 19:44:49 +02:00
ζeh Matt dac99b5a13
Merge pull request #9738 from ZehMatt/fix-9727 
Fix #9727: Crash when multiple windows are closed during close events
 2019-08-06 19:44:23 +02:00
ζeh Matt 1ec1c38882
Merge pull request #9737 from ZehMatt/fix-9730 
Fix #9730: Ghost footpath not getting removed
 2019-08-06 19:44:02 +02:00
Matt aaeb64888f
Do not pause the game during save/load prompt in networked mode 2019-08-06 18:01:31 +02:00