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

16548 Commits

Author SHA1 Message Date
Duncan cdf587080c
Merge pull request #9098 from w-flo/fix_5893 
Fix #5893: Invalidate widget only if it's visible
 2019-04-15 19:14:22 +01:00
Florian Will 0d3f287447 Add changelog entry, minor code improvements 2019-04-15 19:11:30 +02:00
Florian Will 6e9a9448a2 Fix format issue, second attempt 
Let's see if I can get this right.
 2019-04-15 16:10:57 +02:00
Florian Will 35ff10e480 Fix format issue and add myself to contributors.md 2019-04-15 15:51:01 +02:00
Florian Will eb6ea8e81d Fix #5893: Invalidate widget only if it's visible 
Remove the widget_invalidate() call after changing a guest's
guest_heading_to_ride_id, because that call fails a debug assertion if
the guest window is open and the currently active tab is not the
"overview" tab. In Release builds (if assertion is disabled),
widget_invalidate() might access the widgets array out of bounds.

Instead, introduce a new flag PEEP_INVALIDATE_PEEP_ACTION for
window_invalidate_flags in the peep struct and set that flag. The guest
window update function then makes sure to invalidate the label if the
flag is set.

The flag could be used in other places to reduce libopenrct2 dependency
on window_*() calls (see #6808), but this commit only cares about cases
where the assertion would fail.
 2019-04-15 14:26:33 +02:00
OpenRCT2 git bot 69ef23740e Merge Localisation/master into OpenRCT2/develop. 2019-04-15 04:00:29 +00:00
OpenRCT2 git bot 8632eb7297 Merge Localisation/master into OpenRCT2/develop. 2019-04-11 04:00:23 +00:00
OpenRCT2 git bot 27cccce312 Merge Localisation/master into OpenRCT2/develop. 2019-04-10 04:00:21 +00:00
Duncan 2515f8d6d2
Merge pull request #9082 from duncanspumpkin/fix_9079 
Fix 9079
 2019-04-09 20:05:38 +01:00
Duncan e01b5f908a
Merge pull request #9070 from ZehMatt/fix-9068 
Fix #9068: Unable to place staff or peeps during multiplayer
 2019-04-09 20:05:21 +01:00
duncanspumpkin 0ffa6d1ae5 Increment network version 2019-04-09 18:46:31 +01:00
duncanspumpkin e2e4c1d942 Fix #9079. Null derference checked for when getting banner element. 
Unsure how the save managed to get in this state
 2019-04-09 18:39:33 +01:00
OpenRCT2 git bot 198194fa35 Merge Localisation/master into OpenRCT2/develop. 2019-04-09 04:00:23 +00:00
Michael Steenbeek 981bd638e3
readme: do not mention the master branch PPA, which is no longer built [ci skip] 2019-04-08 21:35:35 +02:00
Duncan 736924ba21
Merge pull request #9055 from duncanspumpkin/largescenery_place 
LargeSceneryPlaceAction
 2019-04-08 17:58:05 +01:00
duncanspumpkin 2e104a00c8 Increment network version 2019-04-08 17:19:58 +01:00
duncanspumpkin d6522f0aee Fix formatting 2019-04-08 17:19:52 +01:00
duncanspumpkin d40a22e32b Make suggested changes 2019-04-07 15:11:03 +01:00
duncanspumpkin b7c3324bae Include missing include 2019-04-07 14:55:08 +01:00
duncanspumpkin baad532c17 Fix formatting 2019-04-07 14:55:08 +01:00
duncanspumpkin 00cbd75641 Return more useful error messages. 
Fix clearance checks always being on for underground placement
 2019-04-07 14:55:08 +01:00
duncanspumpkin d63919c0cc Implement LargeSceneryPlaceAction 2019-04-07 14:55:07 +01:00
Matt 7c901addc6 Fix #9068: Unable to place staff or peeps during multiplayer 2019-04-07 14:12:23 +02:00
Duncan 261132ebdd
Merge pull request #9064 from duncanspumpkin/scenery_paint_ga 
Scenery Set Colour Game Actions
 2019-04-07 12:44:30 +01:00
duncanspumpkin 57efe286cf Increment network version 2019-04-07 12:24:02 +01:00
duncanspumpkin 008ed86bca Make requested fixes 2019-04-07 12:02:04 +01:00
duncanspumpkin aa65e25c6b Implement banner set style action 2019-04-07 10:10:36 +01:00
duncanspumpkin 3593366e95 Implement banner set colour action 2019-04-07 09:22:39 +01:00
duncanspumpkin 5ab42488a9 Implement large scenery set colour action 2019-04-07 09:22:33 +01:00
duncanspumpkin 8ef5afe2ce Implement wall set colour action 2019-04-06 19:39:01 +01:00
duncanspumpkin 8fc1d70239 Implement small scenery set colour action 2019-04-06 19:39:00 +01:00
Duncan 7376e16601
Merge pull request #9063 from duncanspumpkin/fix_wall 
Fix wall
 2019-04-06 19:19:53 +01:00
duncanspumpkin 63f9e3dbb4 Set tertiary colour correctly 2019-04-06 18:56:44 +01:00
duncanspumpkin 787993c117 Fix #9062. Pass the correct flag for ghosts. 2019-04-06 18:16:24 +01:00
duncanspumpkin 3e9356857f Fix wall placement in track designs. 
X and Y values go a bit screwey in ride previews. So you need to override there check.
Also fixed the wall from nesting the command wrong
 2019-04-06 18:06:40 +01:00
Duncan 6afd0dc8f2
Merge pull request #8983 from duncanspumpkin/refactor_track 
Refactor track
 2019-04-04 20:06:37 +01:00
duncanspumpkin cee953f899 Fix #9042. Pass the flags to wall placement when in track design mode 2019-04-04 19:23:44 +01:00
duncanspumpkin eedb24700d Fix #8535, #8480. Unintialised variable used to get path object. 
When you try to mirror a track design that has a path object type that isn't loaded it will try to pass an uninitialised variable as the index of the path object. This will cause a bad pointer to be generated. Fix was to auto set it to zero and to be super careful reset it again to zero in the case when its not available
 2019-04-04 19:23:44 +01:00
duncanspumpkin 5280728760 Fix formatting 2019-04-04 19:23:44 +01:00
duncanspumpkin 356a0e5e91 Rework flags 2019-04-04 19:23:44 +01:00
duncanspumpkin 06645f6a0d Further small refactor. Name Game_command_flag_5 2019-04-04 19:23:44 +01:00
duncanspumpkin 561ce03d18 Fix formatting 2019-04-04 19:23:44 +01:00
duncanspumpkin 30a5194085 Use a vector for map selection tiles 2019-04-04 19:23:44 +01:00
duncanspumpkin 7b2363f0ef Refactor further 2019-04-04 19:23:43 +01:00
duncanspumpkin 086e60dd1d Save changes 2019-04-04 19:23:43 +01:00
duncanspumpkin f7c84fff60 Split scenery place into multiple functions 2019-04-04 19:23:38 +01:00
duncanspumpkin 9f80a16353 Further rename 2019-04-04 18:58:52 +01:00
duncanspumpkin 2320cd169f Rename PTD enum 2019-04-04 18:58:52 +01:00
ζeh Matt 62f163a67d Don't enable multithreading option by default. (#9039) 2019-04-04 12:11:37 +02:00
anon569 3efdcdef43 Hungarian Forint fix (#9043) 
https://en.wikipedia.org/wiki/Hungarian_forint
"The Hungarian abbreviation for forint is Ft, which is written after the number with a space between."
 2019-04-04 08:01:21 +01:00