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

16548 Commits

Author SHA1 Message Date
Michael Steenbeek df687ac59c
Merge pull request #8928 from AaronVanGeffen/scenario-editor-cheats 
Make cheats menu partially accessible in scenario editor
 2019-03-21 17:42:20 +01:00
Aaron van Geffen f4602d0a34 Use SCREEN_FLAGS_EDITOR when appropriate. 2019-03-20 20:58:08 +01:00
Duncan 476f392eeb
Merge pull request #8919 from duncanspumpkin/console_set_price 
Console command to set price of all rides of type
 2019-03-20 19:13:19 +00:00
Michael Steenbeek 1c570c8eec
Move some ride functions to struct methods 2019-03-20 20:05:25 +01:00
Aaron van Geffen aeaa45c05b Fix #8927: Make cheats menu partially accessible in scenario editor. 2019-03-20 20:03:28 +01:00
duncanspumpkin 320c88df99 Make requested changes 2019-03-20 18:48:01 +00:00
Michael Steenbeek e64aafa735
Merge pull request #8908 from Gymnasiast/stall-colours 
Allow different default colours per stall
 2019-03-20 16:57:36 +01:00
Gymnasiast 511dd44f6b Bump network version 2019-03-20 16:57:22 +01:00
Gymnasiast 80c57f3804 Bump objects version to 1.0.10 2019-03-20 13:02:32 +01:00
OpenRCT2 git bot 2fec60fb77 Merge Localisation/master into OpenRCT2/develop. 2019-03-20 04:00:28 +00:00
Gymnasiast aa21f0fb1d Prepare for food/drink stall recolouration 2019-03-19 22:55:28 +01:00
Gymnasiast 79318997bc Remove old code for MEDIENTR 2019-03-19 22:21:06 +01:00
Gymnasiast 8b1330ec57 Add comment [ci skip] 2019-03-19 22:13:02 +01:00
Gymnasiast 14c2925ae5 Add import code to make Ice Cream Stalls light blue 2019-03-19 22:11:18 +01:00
Gymnasiast 59c74ead94 Add fallback for legacy objects 2019-03-19 21:20:31 +01:00
Gymnasiast 4f8548dfea Allow different default colours per stall 2019-03-19 21:20:31 +01:00
Michael Steenbeek 68aa5122fa
Fix #6006: Objects higher than 6 metres are considered trees 2019-03-18 22:56:14 +01:00
duncanspumpkin d5fa7185ca Prevent a crash when bad data passed 2019-03-18 21:50:29 +00:00
duncanspumpkin 576976627e Use displayable character instead of pipe 2019-03-18 21:45:32 +00:00
duncanspumpkin fb36d2b1f9 Set price of all rides from the console 2019-03-18 21:38:48 +00:00
Duncan b8aeb56bdc
Merge pull request #8918 from duncanspumpkin/game_actions 
Game actions
 2019-03-18 20:32:34 +00:00
duncanspumpkin aa2f0a46d0 Increment network version 2019-03-18 20:01:30 +00:00
duncanspumpkin add40feb57 Merge #8898 branch 'staff_ga' into game_actions 2019-03-18 20:00:34 +00:00
duncanspumpkin 351adcc88b Merge #8897 branch 'surface_set_style_ga' into game_actions 2019-03-18 19:58:21 +00:00
duncanspumpkin f28be1ae30 Merge #8881 branch 'set_park_open' into game_actions 2019-03-18 19:57:50 +00:00
duncanspumpkin 329514a49c Merge #8900 branch 'zehmatt/mp-peep-flags-ga' into game_actions 2019-03-18 19:56:49 +00:00
Michael Steenbeek 5b600e6caa
Mention the bug, not the fix [ci skip] 2019-03-18 19:42:07 +01:00
Michael Steenbeek a8ebd76b2d
Update [ci skip] 2019-03-18 19:40:17 +01:00
Matt ce1d0756b4 [ci skip] Update changelog.txt 2019-03-18 18:37:40 +01:00
Duncan a9e9993ff5 Fix #8910. Staff patrol areas sharing id's. (#8912) 2019-03-17 23:18:56 +01:00
Matt 57283a4e2b Fix #8900: Implement GuestSetFlagsAction. 2019-03-17 22:17:04 +01:00
Michael Steenbeek 8bf693983a
Fix #7884: Unfinished preserved rides can be demolished with quick demolish 2019-03-17 16:55:17 +01:00
Aaron van Geffen 97ba6eec08
Move common actions from debug menu into cheats menu (#8892) 
This aims to make it less necessary for users to enable debugging tools.
 2019-03-17 12:52:32 +01:00
duncanspumpkin e97428acc0 Make requested changes 2019-03-17 07:26:39 +00:00
duncanspumpkin 9fc464a322 Remove game command 
Correct the copyright

Include correct headers
 2019-03-17 07:20:37 +00:00
duncanspumpkin c9332b4c5d Use the game action. Fix issues with it 2019-03-17 07:20:36 +00:00
duncanspumpkin 2457feb6ab Create surface set style action 2019-03-17 07:20:36 +00:00
Aaron van Geffen 2af13904c5 Update copyright notices for 2019. (#8903) 2019-03-17 07:16:15 +00:00
duncanspumpkin 9e316f9191 Fix formatting 2019-03-16 21:07:50 +00:00
ζeh Matt cb88c713c3
Merge pull request #8896 from duncanspumpkin/fix_8885 
Fix #8885. Incorrect function for calculating lowest water height.
 2019-03-16 13:55:32 -07:00
ζeh Matt 3b69c1c75e Fix #8055: Ignore rendering specific fields for sprite checksum. (#8895) 2019-03-16 21:53:26 +01:00
duncanspumpkin ca92d63b20 Put the correct copyright date on 2019-03-16 20:50:00 +00:00
duncanspumpkin 0b231c8b38 Remove old game commands 2019-03-16 20:47:54 +00:00
duncanspumpkin 77238c1e5e Add staff set patrol area and fire actions 2019-03-16 20:45:52 +00:00
duncanspumpkin 1274a3fae4 Fix #8885. Incorrect function for calculating lowest water height. 
Looks like a good old ctrl+c, ctrl+v and then forgot to actually modify it correctly.
 2019-03-16 20:08:57 +00:00
Michael Steenbeek eaf75c7448
Merge pull request #8893 from duncanspumpkin/large_scenery 
Use specific element types for return type
 2019-03-16 18:54:56 +01:00
duncanspumpkin cb087e3b4e Fix formatting. Initialise to bad value 2019-03-16 16:41:18 +00:00
duncanspumpkin 6c92594c4b Use wall element as return 2019-03-16 16:35:30 +00:00
duncanspumpkin 2c2239b131 Use small scenery element as return 2019-03-16 16:29:02 +00:00
duncanspumpkin c80c7b5cd2 Use LargeSceneryElement for return type 2019-03-16 16:23:26 +00:00