mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 13:33:02 +01:00
Code Issues Releases Wiki Activity
15,253 Commits 8 Branches 59 Tags
c99d28116f57acaf03286ea9fd1601ff57f747ce
Commit Graph

77 Commits

Author SHA1 Message Date
Hielke Morsink
c99d28116f Fix muting game sounds instead of master sound 
Clicking mute from the top toolbar or from with the hotkey will toggle the master volume instead of the game volume now, and invalidates the options window to immediately make the checkbox visible.
 2018-08-17 22:14:11 +02:00
Aaron van Geffen
69d76a3263 Pause/unpause audio when disabling channels. 2018-08-17 22:14:11 +02:00
Sijmen Schoon
1b805d94e7 Change window_options_scrollgetsize width to 500px 2018-08-17 22:14:11 +02:00
Sijmen Schoon
a7d17a6b41 Fix widget_index type and scroll_index -> _id 2018-08-17 22:14:11 +02:00
Sijmen Schoon
1a1ad56336 Refactor volume slider initialization 2018-08-17 22:14:11 +02:00
Sijmen Schoon
9583368b7c clang-format Options.cpp 2018-08-17 22:14:11 +02:00
Sijmen Schoon
0cdd7c8cc8 Add master sound checkbox and master volume slider 
Also includes some rewriting of rct_scroll code that I did while
debugging the issue with more than two rct_scrolls in one window. I
decided to leave it in.
 2018-08-17 22:14:11 +02:00
Michael Steenbeek
0a1b53e1c2 Auto-detect RCT1 files location (#7882) 2018-08-13 15:50:45 +02:00
Linus Unnebäck
fd07be587a Remove Math::Clamp in favour of std::clamp 2018-08-12 16:47:12 +01:00
Gymnasiast
c615d08d78 Remove many unused strings 2018-08-12 15:56:47 +02:00
clang-format
b02dfdbc93 Binpack function arguments together 
Previously when the arguments of a function wouldn't fit on a single line, clang-format would put each argument on its own line instead. By enabling the binpack parameter setting, it tried to fit as many on one line as possible instead.

Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
 2018-07-23 16:00:22 +02:00
clang-format
95ce592579 Enforce not breaking before assignments and function names 
Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
 2018-07-23 16:00:19 +02:00
clang-format
e558660860 clang-format UI windows 2018-07-23 16:00:14 +02:00
Michael Steenbeek
1b08fb4e69 Replace our own integer types with standard ones 2018-06-20 17:30:40 +02:00
Michael Steenbeek
ec3a1e575e Replace Math::Min and Max with std variants 2018-06-20 17:11:35 +02:00
Hielke Morsink
0cf256ac9e Ready copyright notice for clang-format 
Clang-format sees the text behind `#pragma region` as code and formats it. Instead of stating the copyright and date there, it's now in the comment block right below it. The text "Copyright" is left in the `#pragma region` line, as clang-format sees it as a single identifier.

I took the opportunity to normalize the dates, and add the copyright notice to the source files where it was missing them (except for third-party and the generated resources.h file).
 2018-06-15 14:07:34 +02:00
Ted John
5a368ce6d9 Move theme code to libopenrct2ui 2018-06-10 23:34:27 +01:00
Hielke Morsink
36d123b272 Revert renaming of spinners (#7650) 2018-06-10 21:31:08 +02:00
Aaron van Geffen
f2b0f7457e Terminology change: rename spinners to steppers. 2018-06-01 23:25:07 +02:00
Aaron van Geffen
2181e35b95 Replace spinner widgets with horizontal +/- buttons. 
Limited to Options and Ride windows so far.
 2018-06-01 15:20:13 +02:00
Aaron van Geffen
bf44007197 Allow fine-tuning the virtual floor style (#7577) 
The virtual floor by @JeroenDStout, introduced in the v0.1.2 release, has generally been well-received. However, some players find it too intrusive in its current appearance (cf. #7221). This PR gives them the option of a toned-down version, rather than having to turn it off completely.

![screenshot_20180528_221350](https://user-images.githubusercontent.com/604665/40628292-6e71358e-62c4-11e8-9293-e166e75d0da6.png)

The clear/transparent style, introduced by this PR, looks like the virtual floor as originally introduced in #6338:
![](https://user-images.githubusercontent.com/14242454/31050274-e3f0e62e-a645-11e7-9b10-ec26b733d631.gif)

The glassy/translucent style is the virtual floor as we've come to know it since the v0.1.2 release, and remains the default setting.
 2018-05-30 13:09:50 +02:00
Park Joon-Kyu
30fa405eb3 Make Twitch integration API URL configurable. (#7555) 2018-05-28 22:01:37 +02:00
Michał Janiszewski
a2ef4bd699 Exclude pre-formatted blocks from clang-format (#7520) 
[ci skip]
 2018-05-16 20:41:29 +02:00
Ted John
35df72e61f Remove use of gCurrentLanguage 2018-05-11 20:39:00 +01:00
Aaron van Geffen
afd1dee580 Leftover cleanup of unnecessarily setting widget types. 2018-05-11 19:39:51 +02:00
Aaron van Geffen
56b9f5ff16 Removed unused string from audio options. 2018-05-11 19:39:47 +02:00
Aaron van Geffen
5ecb2d951e Draw misc options' dropdown captions directly through widgets. 2018-05-11 19:39:47 +02:00
Aaron van Geffen
fe044477c2 Draw interface options' dropdown captions directly through widgets. 2018-05-11 19:39:47 +02:00
Aaron van Geffen
bf817d2312 Draw culture options' dropdown captions directly through widgets. 2018-05-11 19:39:47 +02:00
Aaron van Geffen
13f3fb3448 Draw audio options' dropdown captions directly through widgets. 2018-05-11 19:39:47 +02:00
Aaron van Geffen
adf3e55d9b Draw display options' dropdown captions directly through widgets. 2018-05-11 19:39:47 +02:00
thyeggman
ccb1b330a5 Option for early scenario completion (#7187) 2018-03-20 12:58:59 +01:00
Michał Janiszewski
cd065d4f41 Reduce includes in common header 2018-03-20 00:27:58 +01:00
Marijn van der Werf
4c956def67 Update UI imports 2018-01-18 22:57:55 +01:00
ZehMatt
84f2917f59 Use const and constexpr whenever possible. 2018-01-11 22:29:08 +01:00
Aaron van Geffen
1d7bec8a11 Make the virtual floor optional, on by default. 2018-01-11 10:37:40 +01:00
Michael Steenbeek
6088a084a2 Replace 0x40 with COLOUR_FLAG_INSET 2018-01-09 10:37:09 +01:00
Aaron van Geffen
ecc1cfed2a Rename WWT_DROPDOWN_BUTTON to WWT_BUTTON. 
The previous name implied an exclusive association with dropdowns.
While used to display the dropdown triangle button, this is not an
exclusive use.
 2018-01-08 00:01:32 +01:00
Aaron van Geffen
8ad1bc9b86 Rename WWT_14 to WWT_LABEL. 
This is used for left-aligned label text.
 2018-01-07 23:54:51 +01:00
Ted John
83d1b6eb8f Refactor widget.c to C++ 2018-01-07 12:39:58 +01:00
Ted John
f18595a1c1 Refactor viewport.c to C++ 2018-01-07 12:39:58 +01:00
Michael Steenbeek
755add6c9a Compile localisation folder as C++ 2018-01-06 18:32:25 +01:00
Aaron van Geffen
1e7fe352fb Adjust Twitch options to make room for CJK glyphs. 2017-12-22 08:03:03 +01:00
Aaron van Geffen
9e686197aa Audio tab: widen label for 'focus loss' option. 
The string used in e.g. the German translation is much longer than its
English counterpart, which led to flickering of the label.
 2017-12-22 08:03:03 +01:00
Aaron van Geffen
ec37e14f98 More consistent indentation for nested checkboxes. 
Also fixes the height of the lightning effect checkbox.
 2017-12-22 08:03:03 +01:00
Aaron van Geffen
4e57ad55b3 Refactor widgets for 'controls and interface' tab. 2017-12-22 08:03:03 +01:00
Aaron van Geffen
dfffabc08f Change option window tab icons. 2017-12-22 08:03:03 +01:00
Aaron van Geffen
8fd4f323fd Reposition widgets in Miscellaneous tab; add strings. 2017-12-22 08:03:03 +01:00
Aaron van Geffen
b76c8b863a Move 'scenario grouping' to Misc tab. 2017-12-22 08:03:03 +01:00
Aaron van Geffen
f7b92e4d37 Reposition widgets for 'Advanced' tab. 2017-12-22 08:03:03 +01:00