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

16878 Commits

Author SHA1 Message Date
OpenRCT2 git bot a4f6d6b831 Merge Localisation/master into OpenRCT2/develop. 2019-06-25 04:00:23 +00:00
Ted John f9101a2d7a Fix #9476: Running `simulate` command on park yields `Completed: (null)` 2019-06-24 23:17:48 +01:00
Duncan 6bd298b3a3
Merge pull request #9392 from duncanspumpkin/pickupAC 
Peep Pickup Game Action
 2019-06-21 05:52:03 +01:00
duncanspumpkin 2de9430bd3 Remove incorrect code that resets picked peep 
The game command owner is never set for game actions so this would be incorrect
 2019-06-20 20:13:23 +01:00
duncanspumpkin 27e958fe2b Increment network version 2019-06-20 19:34:02 +01:00
ζeh Matt 6bd09f6b98 Cancel concurrent peep pickups on placement (#29) 2019-06-20 19:34:02 +01:00
duncanspumpkin b896f07687 Add PeepPickupAction 
Move Guest and Staff pickup to the new game action. Rework the game
action so that only one game action is required for the two game
commands. Remove the final game command with a callback.
 2019-06-20 19:34:02 +01:00
duncanspumpkin 65c0b0591d Fix build for gcc 
Invalid cast to int32_t that had been left in after refactoring months ago. Latest version of gcc flags this as the cast made this a comparison between a signed and unsigned value.
 2019-06-20 19:27:56 +01:00
Duncan cc82975090
Merge pull request #9448 from ZehMatt/fix-9287 
Fix marketing/money effect bugs
 2019-06-20 19:18:03 +01:00
Duncan 19798b8efe
Merge pull request #9446 from duncanspumpkin/fix_9440 
Fix 9440 Tile Coordinate in tile inspector not updating
 2019-06-20 19:17:49 +01:00
duncanspumpkin ecbff5d4f2 Refactor to use CoordsXY 2019-06-20 18:53:30 +01:00
duncanspumpkin 2a60268c05 Fix #9440. Set the tile coordinate correctly with spinner. 2019-06-20 18:52:40 +01:00
nhair eb13c5a776 Fix #9245: Headless servers apply Discord Rich Presence 2019-06-19 23:02:57 +02:00
Matt 881b7012ac
Bump up network version 2019-06-19 03:29:46 +02:00
Matt df30d5d9bc
Fix MarketingCampaignFlags::FIRST_WEEK not being imported/exported with sv6 2019-06-19 03:20:19 +02:00
Matt 0a4fa68138
Fix money effect having random position in multiplayer 2019-06-19 03:18:58 +02:00
Michael Steenbeek bbd93f93cc
Increase maximum height of Hypercoaster to RCT1 limits 2019-06-18 21:44:06 +02:00
OpenRCT2 git bot 72f605e206 Merge Localisation/master into OpenRCT2/develop. 2019-06-17 04:00:24 +00:00
ζeh Matt 7c0f04903e Fix crash with truetype fonts and multi threading (#9424) 2019-06-16 17:43:53 +02:00
Hielke Morsink 6b7fee86bb Don't clear the screen to black for giant screenshots 
When certain viewport flags were set (underground view, hide base land,
hide vetical faces, clip view), the viewport would always be cleared,
including for giant screenshots.
 2019-06-16 16:42:21 +02:00
ζeh Matt 2044dbcad5 Fix #9324: crash trying to remove invalid footpath scenery 2019-06-16 13:40:15 +02:00
Hielke Morsink 84e7376aac
Merge pull request #9403 from duncanspumpkin/fix_9396 
Fix #9396. Pass the ghost flag to banner remove to prevent invalid removal
 2019-06-14 23:55:12 +02:00
Hielke Morsink b94cd2b30a
Fix campaign bugs (#9402 and #9411) (#9413) 
Fix campaign bugs (#9402 and #9411)
 2019-06-14 23:54:59 +02:00
duncanspumpkin a0b77c4bff return the value 2019-06-13 19:33:37 +01:00
duncanspumpkin 357273fe7d Refund the removal cost of banners on paths. 
Found a small bug in the banner removal on paths code
 2019-06-13 19:31:49 +01:00
aw20368 9effe21dd0 Fix #8602: Wall piece collision detection deviates from vanilla (#9414) 
Wall piece collision used the base height of the wall. Changed to use the clearance height.
 2019-06-13 20:03:53 +02:00
Gymnasiast 72c4baebda Fix #9411: Ad campaigns end too soon 2019-06-12 22:31:16 +02:00
Gymnasiast 3933e2ffc6 Fix #9402: Ad campaigns disappear when you save and load the game 2019-06-12 22:20:00 +02:00
Duncan e5972f8a67
Fix #9401, Fix #9387. Check for tile element before deref. (#9409) 
This fixes two crashes that can occur when surface elements are deleted. For normal play you should never delete a surface element as the game expects there to be a surface element on all usable terrain.
 2019-06-12 21:16:40 +01:00
duncanspumpkin 501e4ba3f9 Increment network version 2019-06-12 19:18:07 +01:00
duncanspumpkin 082f969fab Fix #9396. Pass the ghost flag to banner remove to prevent invalid removal. 
Previously this would never have happened because the old code would do a scenery ghost removal before calling anything else. I think this is a better way of handling it though and don't want to revert to the old method
 2019-06-12 19:17:29 +01:00
Duncan 17cc6a862d
Merge pull request #9264 from duncanspumpkin/tilemodify 
Tile Modify GameAction
 2019-06-12 18:59:43 +01:00
Michał Janiszewski ea0483c4a9
Add libgtest-dev to Ubuntu AMD64 image (#9405) 
See discussion in https://github.com/OpenRCT2/OpenRCT2/pull/9404#issuecomment-501012361
https://packages.ubuntu.com/bionic/libgtest-dev
 2019-06-12 19:43:46 +02:00
duncanspumpkin 9cd3119897 Increment network version 2019-06-11 18:44:23 +01:00
duncanspumpkin 96ec0123ca Refactor and clean up for CI's. 2019-06-11 18:43:23 +01:00
duncanspumpkin afca838f17 Provide a game command translation 2019-06-11 18:43:06 +01:00
duncanspumpkin 3162d4dc75 Implement TileModifyAction 
Further work moving game commands into the game action framework
 2019-06-11 18:42:52 +01:00
Duncan 99772ab3b8
Merge pull request #9400 from ZehMatt/fix-9388 
Fix #9388: Crash using set grass length cheat
 2019-06-11 18:23:27 +01:00
Matt ea7374b332
Bump up network version 2019-06-11 17:50:17 +02:00
Matt 9a23234631
Fix #9388: Crash using set grass length cheat 2019-06-11 17:49:49 +02:00
ζeh Matt 1b8096d4e1
Merge pull request #9399 from ZehMatt/fix-8859 
Fix #8859: Network gCheatsEnableAllDrawableTrackPieces
 2019-06-11 17:48:58 +02:00
OpenRCT2 git bot 288921132d Merge Localisation/master into OpenRCT2/develop. 2019-06-11 04:00:22 +00:00
Matt 92129f01d0
Bump up network version 2019-06-11 05:10:27 +02:00
Matt 82fd212834
Fix #8859: Network gCheatsEnableAllDrawableTrackPieces on initial join 2019-06-11 05:10:05 +02:00
Gymnasiast b65e243486 Fix #9398: Observation tower vehicle is coloured incorrectly 2019-06-10 22:51:23 +02:00
Michael Steenbeek 1993704e8f
Add #8553 to changelog [ci skip] 2019-06-10 22:34:29 +02:00
OpenRCT2 git bot 712c2d9b67 Merge Localisation/master into OpenRCT2/develop. 2019-06-10 04:00:22 +00:00
Duncan ba040fcd6a
Fix clang format (#9393) 2019-06-09 19:18:04 +01:00
duncanspumpkin 4fa77e1f71 Fix the build 2019-06-09 16:08:29 +01:00
Peter dd948f99c4 #9295 Refactor rct_vehcile->status to rct_vehicle::SetState() (#9329) 
Fix #9295. Refactor rct_vehicle->status to rct_vehicle::SetState()

Created rct_vehicle::SetState() and refactored all assignments to
rct_vehcile->status. SetState also includes a call to
vehicle_invalidate_window(), so it cannot be forgotten.
 2019-06-09 15:45:56 +01:00