1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Commit Graph

16613 Commits

Author SHA1 Message Date
Duncan
1683ae736e Merge pull request #9192 from Gymnasiast/fix/8507
Fix #8507: Incorrect change in vehicle rolling direction
2019-05-02 21:32:22 +01:00
Florian Will
8c109307cf Fix #8507: Incorrect change in vehicle rolling direction
In OpenRCT2, when vehicles roll backward on a long, flat track piece,
they would eventually change their direction of movement and move
forward instead, after their velocity reached -4095. The acceleration
due to rolling resistance and drag changes to 0 at that point, which
caused the "implicit boost" up to a velocity of ~+32k (close to 2km/h)
to trigger.

The behavior is different in vanilla RCT2, where vehicles just keep on
very slowly rolling backwards.

This commit disables the "implicit forward boost" for vehicles rolling
backward to mimic vanilla RCT2 behavior.
2019-05-02 22:22:59 +02:00
Michael Steenbeek
76956a8fc1 Add missing issue to changelog [ci skip] 2019-05-02 21:50:04 +02:00
hokasha2016
6a6465498f Fix #7878: Scroll shortcut keys ignore SHIFT/CTRL/ALT modifiers 2019-05-02 21:42:05 +02:00
Ted John
4746051d1b Merge pull request #8814 from tomlankhorst/link-threads
Always link threads, fix linking cURL
2019-05-02 19:40:04 +00:00
Michael Steenbeek
2d5c21333a Merge pull request #9186 from IntelOrca/fix/5103-gl-track-preview
Fix track and screenshot rendering for OpenGL drawing engine
2019-05-02 21:08:34 +02:00
Ted John
c06476f93f Update target Windows SDK to 10.0.17763.0 (#9190) 2019-05-02 21:07:02 +02:00
Ted John
39123f68eb Fix #5889: Giant screenshot does not work while using OpenGL renderer 2019-05-02 00:07:43 +00:00
Ted John
f842d8a693 Fix #5103: OpenGL: ride track preview not rendered 2019-05-02 00:07:43 +00:00
Aaron van Geffen
6098c1c3cc Merge pull request #8659 from Xkeeper0/f/better-sign-tooltips
Better tooltips for banners and signs
2019-05-02 00:21:26 +02:00
Aaron van Geffen
05a1ce6339 Update changelog. [ci skip] 2019-05-02 00:21:02 +02:00
Aaron van Geffen
df42cfe1e1 Change map toolbar icon with current rotation (#9154) 2019-05-02 00:07:20 +02:00
Xkeeper
51593c540a Fix ride entrance hut banner issue
This fixes the problem where the ride entrance hut
banner would show a nonsense number after auto-named
rides based on the amount the text had scrolled.
2019-05-01 23:59:09 +02:00
Xkeeper
100ee139f5 Update code style with clang-format 2019-05-01 23:59:09 +02:00
Xkeeper
a3106e4c4c Add sign tooltips to 3d signs
For some reason, all signs report "Sign" as their text
before actually being modified. This also happens with the
tile inspector, so for now I'm not terribly worried about it
2019-05-01 23:58:38 +02:00
Xkeeper
877ce58f0b Update sign tooltip to use STR_NO_ENTRY
Changes the number of the sign tooltip string
and removes the now-duplicate "no entry" string
2019-05-01 23:58:38 +02:00
Xkeeper
c6a4316bd4 Update banner formatting code/strings
Changes some things to use STR_BANNER_TEXT_FORMAT and removes
instances of " - - " attached to other strings in the
localization files.

This can be used in the future to show the messages on
a sign or banner via a tooltip without having to
duplicate those messages without " - - ".
2019-05-01 23:57:07 +02:00
Xkeeper
8ac6c9e9de Tweak sign changes to match style guide 2019-05-01 23:57:07 +02:00
Xkeeper
8a674297eb Add sign tooltips that display the sign message
re: OpenRCT2/OpenRCT2#8593

Modifies the code for tooltip displays to show the
string assigned to a banner. It also uses the
color assigned to the sign (by sheer coincidence).

As of right now I do not think that it works for
non-banner signs (such as the 3D landscapes or
scrolling signs etc), but it works for the typical
case of banners, as well as "No entry" banners.
2019-05-01 23:57:07 +02:00
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