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

157 Commits

Author SHA1 Message Date
wolfreak99
1f0b2aefb7 Fix #4771: Main Menu music not playing
When audio_init_ride_sounds is called, it calls audio_stop_title_music, but never calls audio_start_title_music. if you do an assert for gTitleMusicChannel it shows it is null. this fixes that. i will say though this is most definitely a band-aid fix, because if run audio_start_title_music in the audio_init_ride_sounds, it still doesn't play out loud. at least on my setup it doesn't.
2016-11-09 17:37:41 +00:00
wolfreak99
9a708cd9d2 auto-disable lightning without modifying config. 2016-09-21 10:37:50 -04:00
wolfreak99
ce85e0e743 Make lightning disabled while weather effects are disabled (Gymnasiast
suggestion)

Interpreting Gymnasiast part 2
2016-09-21 10:36:35 -04:00
wolfreak99
c60396cb53 Add option to disable weather gloom and rain effects 2016-09-21 10:35:02 -04:00
wolfreak99
498bab24c3 Fix window limit displayed in options 2016-09-09 17:16:12 +01:00
Ted John
aa15ff6ed9 Fix #4379: x64: Crash when clicking audio device dropdown
The dropdown arguments are limited to 8 bytes which was not enough for STRING and the 64-bit address for the string. A similar issue also for the dropdown text field. Changed to same solution as other dropdowns.
2016-09-05 00:05:48 +01:00
Michał Janiszewski
f8145b6edc Refactor inclusion of addresses.h
addresses.h is now only included when necessary, limiting scope as much
as possible.
2016-09-03 21:25:19 +01:00
Ted John
17b69d257b Merge pull request #4097 from marijnvdwerf/clean/string-ids-2
Continue string ID cleanup
2016-08-28 14:05:13 +01:00
Ted John
8cf7e87b5c Fix many warnings for x64 2016-08-27 23:32:15 +01:00
Marijn van der Werf
3a7fa512a2 Use rct_string_id as type where applicable 2016-08-21 16:33:37 +02:00
Michał Janiszewski
6c28a17906 Fix pointer casting for some strings 2016-08-03 20:53:25 +02:00
Aaron van Geffen
a1b8bdfa11 Make zooming to cursor optional.
This adds a checkbox to the interface settings panel to enable zooming around the cursor.
If disabled, which it is by default, vanilla RCT2 behaviour is retained.
2016-07-30 21:18:59 +02:00
Alexander Overvoorde
3842728f38 Fix indentation and code style in various files 2016-07-27 16:31:25 +02:00
Alexander Overvoorde
c56a683eed Disable OpenGL vsync when uncap fps option is enabled 2016-07-27 04:01:25 +02:00
wolfreak99
3b8bd8ce93 rename max_window_count to window_limit_max 2016-07-15 10:25:59 -04:00
wolfreak99
44202d0bd1 Allow setting limit on maximum windows allowed
This provides an option to set a limit on the number of windows that can
be open. Originally, the game had somewhere around 12, but was bumped up
to 64 for OpenRCT2. While this provides some value, this is for people who
prefer less windows at a time, and also for people with older computers.
The limit can be set anywhere between 8 and 64, (8 being chosen to still
preserve in-game toolbars that are counted as windows, and 64 to not
overshoot the maximum hard-coded value). This can be set in both options
and the in-game-console.
2016-07-15 07:07:34 -04:00
Marijn van der Werf
5204fb0ce9 Clean up string and sprite ID's (#3977) 2016-07-14 14:07:49 +02:00
Ted John
8d168fb2ce remove more old object code 2016-07-08 22:58:38 +01:00
Daniel Trujillo
fc6f4929b7 Refactor for compliance with coding standards. 2016-07-01 22:02:28 +02:00
Daniel Trujillo
dfd78ec359 Perform a refactor for compliance with conding style. 2016-07-01 22:02:28 +02:00
Daniel Trujillo
b12e5443e9 Add configuration support for the custom currency
This commit do several things:
 · Add proper entries to config.c file
 · Load custom currency definition at start time
 · Save every change made from the custom currency configuration window
2016-07-01 22:02:28 +02:00
Daniel Trujillo
187499fd72 Fix currency dropdown not showing checked custom currency.
Due to the dropdown separator before custom currency entry, the selected
item index was incorrectly assigned to the separator.
2016-07-01 22:02:28 +02:00
Daniel Trujillo
9355eef5d4 Add custom currency option
Add custom currency entry to the dropdown menu of the options window
2016-07-01 22:02:28 +02:00
Ted John
79292b56ad allow disabling of OpenGL 2016-06-07 22:47:31 +01:00
Ted John
3b627651aa add drawing engine config 2016-06-07 22:47:31 +01:00
Martin Černáč
6e9d1bf1ea Refactor more string & sprite hard-coded ids (#3670) 2016-05-19 18:22:24 +01:00
Ted John
1cc35dfe6e integrate common format args 2016-05-15 22:03:53 +01:00
Steven Vascellaro
dbb64f8ea3 Added additional tooltips for options menu (#3394)
Added tooltips for every selectable item in the options menu, as well as some minor variable renaming and vertical alignment
2016-05-08 17:22:48 +01:00
janisozaur
68bad6505c Add and correct licence headers to all sources (#3108) 2016-05-04 18:24:41 +01:00
Michael Steenbeek
142c54852d Clean up some residual usages of old config (#3484) 2016-05-03 22:36:29 +01:00
Ted John
489ea66cc9 add global macro for gCurrentFontSpriteBase and gCurrentFontFlags 2016-04-25 23:00:58 +01:00
Ted John
307cb9e08b add global macro: gParkFlags 2016-04-23 00:51:22 +01:00
Gymnasiast
548bee8325 Fix formatting and rebase 2016-04-20 20:14:07 +02:00
Rune Laenen
e0c103031e Add shortcut to mute sound 2016-04-20 19:56:57 +02:00
Yaroslav Tretyakov
c3ba519a6e Integrate audio related variables (#3322) 2016-04-17 14:20:26 +01:00
danidoedel
57b7934b83 Add ability to disable lightning effect, resolves #1299 2016-03-04 23:13:20 +01:00
IntelOrca
c60e05fc99 add default ride inspection interval option, closes #1455 2016-03-02 19:27:54 +00:00
IntelOrca
646deebd3a re-order misc options 2016-03-02 19:00:33 +00:00
IntelOrca
b0887f174b split sound and music mixing correctly, closes #1270 2016-02-24 22:42:50 +00:00
Michał Janiszewski
2ebb691e71 minor fixes
* initialize variables properly
* fixes to handling of zenity/kdialog on Linux
* remove unnecessary call
2016-02-14 21:06:44 +01:00
IntelOrca
caf9bd9939 get game working with new theme manager
Theme editor currently unavailable.
2016-02-03 18:23:44 +00:00
Michał Janiszewski
f352fb7d47 Better options window design for scaling 2016-02-01 21:23:20 +01:00
Michał Janiszewski
b3ed293bb3 Add another page to options
All 32 available widgets on "Display" page were taken, this adds another
page, "Rendering", to the options window, so it can hold remaining widgets.
2016-02-01 21:19:28 +01:00
Michał Janiszewski
80ad302087 Allow user to use NN scaling at integer scales
While linear/anisotropic filtering introduces in previous commit looks
good at non-integer scales, using it at integer scales may make screen
look unnecessarily blurry. This commit introduces an option to use NN
scaling at integer values of scale.
2016-02-01 21:19:26 +01:00
Michał Janiszewski
18ec2238a2 Allow runtime selection of render quality hint
This change allows to pass render quality hint to SDL in runtime. While
using hardware display, SDL can hint the renderer to use linear or
anisotropic filtering, which can deliver a better experience when using
non-integer scale value.
2016-02-01 21:18:15 +01:00
Marijn van der Werf
6568798af7 Use globals instead of addresses where applicable 2016-01-15 21:01:49 +01:00
IntelOrca
cdee534eb1 use SDL2's platform defines to normalise platform guards 2016-01-14 20:12:43 +00:00
Michał Janiszewski
ac8aec63bc Skip "Default sound device" on Linux
Sound on Linux is handled by PulseAudio, which creates a sink and offers
a central place to control which sources are distributed how and where.

Applications in general are expected to only offer volume controls.

Tested with 0 A.D., SuperTuxKart and a few media players, none of which
offers selecting sink directly.

As per https://en.wikipedia.org/wiki/PulseAudio#Adoption it should
covert vast majority of uses.
2016-01-11 13:59:41 +01:00
IntelOrca
ab38828e03 integrate object list variables:
- gInstalledObjectsCount
- gInstalledObjects
- gNumInstalledRCT2Objects
- gNumInstalledCustomObjects
- gLastLoadedObjectChunkData
2016-01-06 20:41:21 +00:00
IntelOrca
82b05950ff add RCT1 title sequence 2016-01-02 21:05:33 +00:00