1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Commit Graph

16568 Commits

Author SHA1 Message Date
Hielke Morsink
ac7bc97736 Expose colour scheme in the tile inspector (#6116) 2019-04-22 15:49:09 +02:00
Hielke Morsink
d8f1933a5b Show dash for station index for non-station elements 2019-04-22 15:25:29 +02:00
Duncan
462bafc24e Merge pull request #9109 from tharkne/issue-9053
Fix 9053: Remove gSceneryGroundFlags by returning it within GameActionResult
2019-04-22 07:57:26 +01:00
Trevor Harkness
700ebe646f Add new class in SmallSceneryPlaceAction def
Change to definition to refer to created SmallSceneryPlaceAction subclass instead of GameActionResult
2019-04-22 02:33:46 -04:00
duncanspumpkin
cc2da47271 Fix parameters 2019-04-21 20:06:55 +01:00
duncanspumpkin
228628b702 Undo 2nd mistake 2019-04-21 19:59:37 +01:00
duncanspumpkin
90a04e2758 Undo mistake. Remove pointless parameter 2019-04-21 19:56:18 +01:00
Duncan
46844e2218 Merge branch 'develop' into issue-9053 2019-04-21 19:50:20 +01:00
Hielke Morsink
bcaa856911 Merge pull request #9089 from Broxzier/bugfix/9083-ghost-banner-index
Fix #9083: Wrong sign index is set for clients
2019-04-21 10:26:05 +02:00
Michael Steenbeek
5a906b2378 Port more functions to Ride struct (#9119) 2019-04-20 22:22:39 +02:00
Michael Steenbeek
42a1a8704d Use empty() for vectors; clean up bool comparisons (#9118) 2019-04-20 20:39:47 +02:00
hokasha2016
6022521118 Fix #7871: String::StartsWith() returns true if source is shorter than match 2019-04-20 18:55:27 +02:00
Liam Parker
82c73e18c7 Fix #9067 - Prices rendering in unlimited money game state 2019-04-20 18:10:15 +02:00
Hielke Morsink
71af88fc5c Bump network version 2019-04-20 14:47:45 +02:00
duncanspumpkin
8035127acd Allocate banner index in the constructor.
Note this does not fix the issue as ghosts still break placement
2019-04-20 00:05:04 +02:00
Trevor Harkness
0dfa079002 Fix remaining formatting issue
Remaining formatting error adjusted in SmallSceneryPlaceAction for CI tests
2019-04-19 02:38:38 -04:00
Trevor Harkness
844a28f3f5 Fix formatting and added to contributors.md
Adjusted formatting for CI tests
2019-04-19 02:18:55 -04:00
Trevor Harkness
6df19daa02 Remove comments from subclass 2019-04-17 23:03:37 -04:00
Trevor Harkness
8cb50432de Fix #9053. Remove instances of gSceneryGroundFlags
Created subclass of GameActionResult in LargeSceneryPlaceAction and SmallSceneryPlaceAction. Removed references to global variable in other files.
2019-04-17 22:55:37 -04:00
Hielke Morsink
70fc620ebe Fix #9083: Wrong sign index is set for clients
This issue was caused by the ghost for banners, which already create an entry on the banner. The game command is then received while the ghost still exists, giving the placed banner another ID.
This fix is basically a copy of the fix that is also `game_do_command_p` that tackles this same issue.
2019-04-16 20:26:42 +02:00
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