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

16476 Commits

Author SHA1 Message Date
Duncan 9f2e1d7450
Merge pull request #8970 from Nazey/tooltipBug-8468 
Place tree underwater tooltip bug
 2019-03-26 18:26:06 +00:00
Nazey 047fa65a66 Fix #8942: Water level is raised abnormally (#8971) 2019-03-26 17:34:30 +01:00
Joshua Tucker c09f283c25 Fix #8468: Removed code incorrectly increasing tile height 2019-03-26 12:10:46 -04:00
Michael Steenbeek c841ee31e7
Remove more remains of scenario description from Object Selection window 2019-03-25 17:21:53 +01:00
Michael Steenbeek cf913d1419
Remove two unused functions 2019-03-25 15:56:40 +01:00
ζeh Matt d41822e0f5 Network relevant player info on changes 2019-03-24 23:16:57 +01:00
Ben Hopkins c537f87fd5 Add scenery picker shortcut 2019-03-24 22:45:42 +01:00
Gymnasiast 262a9f29e8 Fix formatting 2019-03-24 22:24:40 +01:00
ζeh Matt 184d95c720 Fix #8947: Detection of AVX2 support 2019-03-24 21:53:54 +01:00
Duncan 791c3059f6 Add ParkEntranceRemove GameAction 2019-03-24 21:41:14 +01:00
Nazey 9cbc308c40 Remove gTrackGroundFlags by returning it within GameActionResult (#8930) 
Fix #8726
 2019-03-24 19:48:37 +00:00
Duncan fef7a4afa1
Merge pull request #8943 from IntelOrca/fix/8941 
Fix #8941: Price sync is not able to check
 2019-03-23 10:12:18 +00:00
Ted John 6143326b66 Fix #8941: Price sync is not able to check 2019-03-23 09:31:39 +00:00
ζeh Matt 6d99426c80
Merge pull request #8806 from ZehMatt/mp-ga-cooldown 
Implement rate limiting times for game actions.
 2019-03-22 09:25:38 -07:00
Matt c0cd1aaef3 Exclude host from rate limiting. 2019-03-22 08:06:54 +01:00
Matt 097ed015d8 Add cooldown time for SmallSceneryPlaceAction 2019-03-22 08:06:54 +01:00
Matt cfe2fb939e Add cooldown time to RideDemolishAction 2019-03-22 08:06:54 +01:00
Matt 7be312c4c6 Implement rate limiting times for game actions. 2019-03-22 08:06:54 +01:00
Aaron van Geffen ad3cc19a1d
Update Xcode libraries to use SDL 2.0.9 (#8929) 2019-03-21 23:15:04 +01:00
ζeh Matt 5d5373b63c Allow use of numpad enter for console and chat 2019-03-21 21:11:06 +01:00
Michael Steenbeek bba672c235
Merge pull request #8936 from tomlankhorst/bugfix/missing-xcode-files 
Added libopenrct2 source files to Xcode project
 2019-03-21 21:10:20 +01:00
Tom Lankhorst 467d69981b
Add world/spritebase to xcode 2019-03-21 20:12:21 +01:00
Tom Lankhorst d85e280666
Add ride/ridetypes to xcode 2019-03-21 20:11:39 +01:00
Tom Lankhorst 040b2de075
Add paint/virtualfloor to xcode 2019-03-21 20:10:42 +01:00
Tom Lankhorst bdd0a76500
Add network/discord to xcode 2019-03-21 20:10:07 +01:00
Tom Lankhorst e2d1a190fd
Add localisation headers to xcode 2019-03-21 20:09:40 +01:00
Tom Lankhorst 7a66f4ede6
Add core headers to xcode 2019-03-21 20:08:41 +01:00
Tom Lankhorst 3d0925b0da
Add actions to xcode 2019-03-21 20:08:21 +01:00
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