1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-10 09:32:29 +01:00
Commit Graph

16636 Commits

Author SHA1 Message Date
Ted John
aaebb109e1 Update vscode config [ci skip] 2019-05-04 14:04:20 +00:00
Ted John
bf50d98e42 Update changelog [ci skip] 2019-05-04 11:33:14 +00:00
Hielke Morsink
5e9e7bcbe5 Fix: artifacts when changing ride type as client or using the in-game console (#9202) 2019-05-04 10:31:10 +00:00
OpenRCT2 git bot
c7afad7d49 Merge Localisation/master into OpenRCT2/develop. 2019-05-04 04:00:23 +00:00
Aaron van Geffen
0da35a599d Merge pull request #9193 from Gymnasiast/optional-header
Add `optional` header
2019-05-03 10:45:50 +02:00
OpenRCT2 git bot
ddcebc9b4c Merge Localisation/master into OpenRCT2/develop. 2019-05-03 04:00:26 +00:00
Aaron van Geffen
f1b9c71524 Merge pull request #8687 from Xkeeper0/f/multiplayer-plus
Multiplayer dropdown additions
2019-05-02 22:53:50 +02:00
Tom Lankhorst
63a38412aa Add optional header 2019-05-02 22:53:19 +02:00
Aaron van Geffen
21104376ea Add changelog entry; add Xkeeper0 to contributors. [ci skip] 2019-05-02 22:53:05 +02:00
Gymnasiast
72ca5ee3a4 Fix formatting 2019-05-02 22:44:47 +02:00
Duncan
a6c2aed26d Merge pull request #9059 from duncanspumpkin/banner_ga
Implement Banner Place/Remove Actions
2019-05-02 21:32:51 +01:00
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
Duncan
48bf5e10f3 Increment network version 2019-05-02 20:20:20 +01: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
duncanspumpkin
f0df14bb0f Use BannerIndex type 2019-05-02 17:50:04 +01:00
duncanspumpkin
7f42824642 Update game.h 2019-05-02 17:47:01 +01:00
duncanspumpkin
d14637e1ca Fix narrowing and formatting 2019-05-02 17:47:01 +01:00
duncanspumpkin
f6b610c325 Implement Banner Place/Remove Actions 2019-05-02 17:47:01 +01:00
Aaron van Geffen
57040c392c Change multiplayer toolbar image to framed globe, with pressed state. 2019-05-02 12:32:45 +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
Xkeeper
4a34d2a6da Disable "Reconnect" if not desynced. 2019-05-02 00:30:30 +02:00
Xkeeper
7e6bed39d4 Fix z->s and DISABLE_NETWORK support 2019-05-02 00:30:30 +02:00
Xkeeper
c075eec224 Update sync icons, new multiplayer toolbar button
The multiplayer toolbar button is the same globe used for the
multiplayer option on the title screen, since it seems like
a nicer (and better?) looking option than the two riders.

Also conflicts less with the new sync icons.
2019-05-02 00:30:30 +02:00
Xkeeper
8c4de40239 Add graphics for desync notice 2019-05-02 00:29:25 +02:00
Xkeeper
bc8ecd8e67 Add "Reconnect" option under the multiplayer button 2019-05-02 00:26:37 +02:00
Xkeeper
d614fb4035 add network indicators for desync/player count 2019-05-02 00:22:03 +02: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