mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
15,479 Commits 7 Branches 39 Tags 358 MiB
Commit Graph

15479 Commits

Author SHA1 Message Date
Aaron van Geffen e553cc3962
Merge pull request #7919 from ZehMatt/gameaction-paused 
Fix #7910: Allow game actions while paused if requested from callee.
 2018-08-25 17:19:17 +02:00
Matt 673d9861ee Bump up network version. 2018-08-23 13:29:04 +02:00
Aaron van Geffen a22ff5f8ea Apply clang-format. 2018-08-22 12:18:27 +02:00
Aaron van Geffen f8c765f798
Fix #7912: 'New folder' and 'New file' buttons are missing (#7926) 2018-08-22 00:00:44 +02:00
Hielke Morsink e7af3290c0 Fix system file browser not populating properly (#7916) 2018-08-21 23:19:32 +02:00
Michael Steenbeek 28c5221f6d
Fix missing comma 2018-08-21 21:51:50 +02:00
OpenRCT2 git bot 9a08845bb1 Merge Localisation/master into OpenRCT2/develop. 2018-08-21 04:00:33 +00:00
Matt e5dd0be813 Remove unnecessary GetActionFlags overrides. 2018-08-20 21:14:32 +02:00
Matt dcc4827833 Use reference instead of copy. 2018-08-20 21:12:06 +02:00
Matt a89b352fb2 Rename rct_sprite::unknown to rct_sprite::generic 2018-08-20 18:27:40 +02:00
Matt 57fe4b6756 Simplify sprite structures. 2018-08-20 18:16:57 +02:00
Michael Steenbeek 7743d0e8e7
Prefer Steam and GOG installs to disc during autodetection 
Some people apparently have both a disc version and a Steam version of RCT2 installed. The problem is that the former does not always include the expansions, while the latter does. The same applies to RCT1.

By checking for Steam/GOG versions first, these problems can be avoided.
 2018-08-20 17:48:52 +02:00
Michael Steenbeek cfe70f886f
Update changelog [ci skip] 2018-08-20 17:48:23 +02:00
Matt ec5ab09943 Fix #7910: Allow game actions while paused if requested from callee. 2018-08-20 17:41:48 +02:00
Hielke Morsink 3e2f8148c5
Fix #7911: Unable to save new scenarios (#7914) 
The problem was that the filters have changed so they included the '*' character. This got appended to the path, which caused the check for valid filenames to fail.

This commit reverts the offending strings and code lines to how it was before.
 2018-08-19 19:49:49 +02:00
OpenRCT2 git bot ea8bab9897 Merge Localisation/master into OpenRCT2/develop. 2018-08-19 04:00:23 +00:00
Aaron van Geffen 4feac44595
Merge pull request #7902 from AaronVanGeffen/windows/loadsave-native 
Add option to always use system file browsing window
 2018-08-18 16:01:03 +02:00
Aaron van Geffen 678c71ed03 Change existing terminology for consistency. 2018-08-18 13:28:27 +02:00
Aaron van Geffen c4f93e24b5 Rename heightmap load/save type; add heightmap dir. 2018-08-18 13:28:27 +02:00
Aaron van Geffen 4b4510b347 Refactor common code to their own functions. 2018-08-18 13:28:27 +02:00
Aaron van Geffen 25170fda45 Implement #7658: Add option to always use system file browsing window. 2018-08-18 13:28:27 +02:00
OpenRCT2 git bot 64d45bd7bd Merge Localisation/master into OpenRCT2/develop. 2018-08-18 04:00:28 +00:00
Aaron van Geffen 35ac24a4f3
Merge pull request #7848 from SijmenSchoon/feature/master-volume-slider 
Add master volume slider and checkbox
 2018-08-17 22:41:02 +02:00
Aaron van Geffen c47b77b8c4 Add a changelog entry for #7848. 2018-08-17 22:18:38 +02:00
Hielke Morsink 01608baeb6 Draw sound effects and music checkboxes as disabled when appropirate 2018-08-17 22:15:58 +02:00
Aaron van Geffen d4591a1492 Draw disabled checkboxes inset. 2018-08-17 22:14:11 +02:00
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 5f8c7ef04d Refactor widget_hscrollbar_draw to be more readable 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
Sijmen Schoon 2e95c64a7c Fix issue with more than two rct_scrolls not working 2018-08-17 22:14:11 +02:00
OpenRCT2 git bot 2e64bdbe26 Merge Localisation/master into OpenRCT2/develop. 2018-08-17 04:00:24 +00:00
Michael Steenbeek 9f891bfdcc
Allow opening SV7 files 2018-08-16 16:16:56 +02:00
Aaron van Geffen 0d99186085
Merge pull request #7903 from AaronVanGeffen/fix/7899 
Use localtime instead of gmtime in file browser
 2018-08-15 10:12:35 +02:00
OpenRCT2 git bot 84bdf1f9ac Merge Localisation/master into OpenRCT2/develop. 2018-08-15 04:00:23 +00:00
Aaron van Geffen 7cc5bc87e9 Check result of FileTimeToLocalFileTime; add to changelog. 2018-08-15 00:15:06 +02:00
Hielke Morsink 4a442d0d6d Convert filetime to local time on Windows 2018-08-15 00:14:47 +02:00
Aaron van Geffen 786806e116 Use localtime instead of gmtime in file browser. 2018-08-15 00:14:47 +02:00
Hielke Morsink c0becabcb8
Fix converting of megapark file when path fails to resolve (#7904) 
This fixes a small regression from #7895.
 2018-08-14 21:45:53 +02:00
Michael Steenbeek f9d60ea106
Allow loading CSS17.DAT and MP.DAT on all three RCT1 sources 
This should equalise the three in terms of supported features.
 2018-08-14 15:41:51 +02:00
OpenRCT2 git bot 6e7621b304 Merge Localisation/master into OpenRCT2/develop. 2018-08-14 04:00:35 +00:00
Michael Steenbeek 81b778f1c6
Merge pull request #7893 from Gymnasiast/fix/7804 2018-08-13 21:59:13 +02:00
Gymnasiast 6fc86d5766 Fix #7872: CJK tooltips are often cut off 2018-08-13 21:41:10 +02:00
Gymnasiast 3a8bf352ac Fix #7804: Russian ride descriptions cut off 2018-08-13 20:35:46 +02:00
Michael Steenbeek 6d530002bc
Add ellipsis character 2018-08-13 19:57:43 +02:00
Michael Steenbeek 13c326eb50
Fix part of #7415: Korean scenario descriptions are mangled 
OpenRCT2 used to incorrectly write UTF-8 to SV6 names and descriptions. This fixes reading such scenarios. It should also fix the game crashing when attempting to load such a scenario.

What this doesn't do is add support for the encoding that vanilla used for CJK, or add support for creating scenarios with Korean descriptions. That will only be feasible when switching to our own format.
 2018-08-13 15:53:44 +02:00