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

16997 Commits

Author SHA1 Message Date
OpenRCT2 git bot b7b846c0d5 Merge Localisation/master into OpenRCT2/develop. 2019-07-08 04:00:21 +00:00
Michael Steenbeek b973d51c73
Remove fix for feature introduced after 0.2.2 [ci skip] 2019-07-06 19:08:42 +02:00
Michael Steenbeek 8ff0cf9546
Update objects to 1.0.11 (#9529) 2019-07-06 16:50:58 +02:00
ζeh Matt a7f8960151 Fix #9498: Only close the most recent window when using the hotkey (#9504) 2019-07-01 22:59:31 +02:00
ζeh Matt e149722a15 Fix #9467: Crash when windows create new window when being closed (#9470) 2019-06-27 22:28:07 +02:00
muemart 7703774437 Correctly determine size of wchar arrays (#9490) 2019-06-27 19:46:03 +02:00
Jim Armstrong f80695d0eb Fix #9485: Staff cannot be hired in pause mode (#9489) 
Set ALLOW_WHILE_PAUSED flag for staff hire GA
 2019-06-27 17:42:18 +02:00
Michał Janiszewski c141e58ea6 Switch from RelWithDebInfo to MinSizeRel + -g for Linux amd64 (#9404) 
In https://github.com/OpenRCT2/OpenRCT2/issues/9357 it was found that
the archive to be uploaded is too big, over 32MiB quota imposed by
Google App Engine. To alleviate that, switch GCC to `-Os -g` to help
reduce the code size a bit.

Fixes #9357
 2019-06-26 23:07:19 +02:00
OpenRCT2 git bot b25c1c8088 Merge Localisation/master into OpenRCT2/develop. 2019-06-26 04:00:35 +00:00
Michał Janiszewski dec2d1c60b
Add `ls -l` to allow monitoring of package size on Travis (#9481) 2019-06-25 22:58:02 +02:00
Michael Steenbeek c00c8056ce Update title sequences to v0.1.2b (#9480) 2019-06-25 22:41:10 +02:00
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
Jim Armstrong cc62e41feb Refactor #9291: Move easter egg code to Guest 
Refactored static Peep functions related to easter egg names into member
functions in the Guest struct.
 2019-06-24 15:17:59 -04:00
Gymnasiast 063b87e0a0 Remove more unused code; fix compilation on GCC 2019-06-23 23:10:34 +02:00
duncanspumpkin 759db552f4 Remove game command for non network builds 2019-06-23 18:50:35 +01:00
duncanspumpkin 2d75c01882 Unnetwork game commands 
Only track designs still use game commands and they cannot be networked so remove dead code
 2019-06-23 18:50:35 +01:00
duncanspumpkin e99c51d23c Remove game command callback 2019-06-23 18:50:35 +01:00
Matt fc3afb3349
Remove unnecessary multiplication and division for sprite lists 2019-06-22 17:38:28 +02:00
Peter e7b051c32c
Update src/openrct2-ui/windows/TitleScenarioSelect.cpp 
Co-Authored-By: Aaron van Geffen <aaron@aaronweb.net>
 2019-06-21 19:01:14 -04:00
Spongeloaf 5777074a3e #9285 Add feature to remember scernario tab 2019-06-21 12:54:49 -04: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