Commit graph

16588 commits

Author SHA1 Message Date
Xkeeper
a1454be336 Add new localizable strings for sign tooltips
re: OpenRCT2/OpenRCT2#8593

These strings use high IDs right now and are probably
not entirely suited for direct inclusion. There is also
some duplication in that "No entry" had to be unique,
as the actual no entry string is "No entry - -".
2019-05-01 23:57:07 +02:00
ζeh Matt
181a722c3b Fix game action errors not showing if no round trip was done (#9175) 2019-05-01 22:53:10 +02:00
Duncan
1e1d263dae
PlayerSetGroupAction (#9072)
* First pass at action.

* Version 2. Do all the work in Network.cpp

* Mark game command as complete

* Make requested changes

* Increment of network version
2019-05-01 16:54:12 +01:00
ζeh Matt
c5b66c0294 Fix #9152: Spectators can modify ride colours 2019-04-29 20:08:09 +02:00
OpenRCT2 git bot
53bbe68311 Merge Localisation/master into OpenRCT2/develop. 2019-04-29 04:00:22 +00:00
Michael Steenbeek
c8df801e66
Create ShopItemDescriptor 2019-04-26 20:25:11 +02:00
OpenRCT2 git bot
0183fc76db Merge Localisation/master into OpenRCT2/develop. 2019-04-25 04:00:23 +00:00
Michael Steenbeek
57201c12db
Merge pull request #9128 from Broxzier/feature/6116-tile-inspector-colour-scheme
Expose colour scheme in the tile inspector (#6116)
2019-04-24 19:42:12 +02:00
Michael Steenbeek
b2535ba35a
Merge pull request #9117 from Gymnasiast/fix/7729
Fix #7729: Money Input Prompt breaks on certain values
2019-04-24 19:41:24 +02:00
boucks
b052c4ac61 Fix #9054: remove gSceneryTileElement by returning it within GameActi… (#9127)
* Fix #9054: remove gSceneryTileElement by returning it within GameActionResult

* fixing Clang-format issues

* fixing clang-format

lets try this again...

* fixing clang-format

alright should be good this time

* fixing clang-format issues

using automatic clang-formatting

* initializing tileElement
2019-04-24 09:42:00 +01:00
Duncan
3f4acd7e69
Merge pull request #9120 from Gymnasiast/fix/8079
Fix #8079: Crash when unloading buggy custom rides
2019-04-23 18:28:34 +01:00
Nicole
d38fb6a7a2 Fix #8800: ensure tile_element_height is used correctly (#9087)
* Changed calls to tile_element_height to tile_element_water_height

* Changes to calls to tile_element_height

* Removed tile element_height, map_get_highest_land_height, and map_get lowest_land_height

3 functions removed due to relocation.

* Added function tile_element_height back to map.cpp

Added tile_element height back to map.cpp. Was unnecessarily deleted.

* Update Map.h

* water_height changes

* Update Scenario.cpp

* Update Scenario.cpp

* Fix 8800: applied clang format

* Removed unnecessary ANDs
2019-04-23 18:26:48 +01:00
Gymnasiast
6d3eca31fd Add log_verbose for vehicle entries with broken peep loading positions 2019-04-22 23:27:25 +02:00
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
Gymnasiast
89f591ffcb Also add #7700 to changelog [ci skip] 2019-04-21 12:21:39 +02:00
Gymnasiast
ec6b738317 Fix #8079: Crash when unloading buggy custom rides 2019-04-21 12:13:04 +02: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
Aaron van Geffen
7f473a791c
Fix typo
Co-Authored-By: Gymnasiast <m.o.steenbeek@gmail.com>
2019-04-20 21:59:52 +02:00
Michael Steenbeek
42a1a8704d
Use empty() for vectors; clean up bool comparisons (#9118) 2019-04-20 20:39:47 +02:00
Gymnasiast
61a402b913 Fix formatting 2019-04-20 19:19:33 +02:00
hokasha2016
6022521118 Fix #7871: String::StartsWith() returns true if source is shorter than match 2019-04-20 18:55:27 +02:00
Gymnasiast
8a4d90038d Update changelog 2019-04-20 18:43:02 +02:00
Gymnasiast
28ad78f204 Allow entry of numbers up to 10 million in string_to_money 2019-04-20 18:42:06 +02:00
Gymnasiast
abf416a5a9 Fix string_to_money rounding errors in 4.10, 5.10... 2019-04-20 18:37:50 +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