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

6317 Commits

Author SHA1 Message Date
IntelOrca caf9bd9939 get game working with new theme manager 
Theme editor currently unavailable.
 2016-02-03 18:23:44 +00:00
IntelOrca 0eb57e5fb5 start work on theme manager 2016-02-03 18:23:43 +00:00
IntelOrca de17eb7279 improve Theme to use List and Json 2016-02-03 18:23:42 +00:00
IntelOrca b1b9741090 add JSON helpers 2016-02-03 18:23:42 +00:00
IntelOrca d67d6a4831 add more core classes 2016-02-03 18:23:41 +00:00
IntelOrca 470ac384e2 refactor window themes and use JSON for format 2016-02-03 18:23:40 +00:00
Ted John 859c2ec8c7 Merge pull request #2871 from LRFLEW/confirmation_prompt 
Changed general_configuration.confirmation_prompt to bool type
 2016-02-03 08:07:43 +00:00
OpenRCT2 git bot a2c607682c Merge Localisation/master into OpenRCT2/develop. 2016-02-03 04:00:11 +00:00
LRFLEW 6aa104721a Changed general_configuration.confirmation_prompt to bool type 2016-02-02 17:30:11 -07:00
Ted John 18151042ac Merge pull request #2862 from zsilencer/multiplayer 
Enable cheats over multiplayer and fix some desync causes
 2016-02-02 23:36:48 +00:00
zsilencer c789449ea8 Change log_warning to log_verbose 2016-02-02 14:47:51 -07:00
zsilencer 41a52065fa Fix #2845: Remove file size limit on map send 2016-02-02 14:11:19 -07:00
zsilencer b2083deed0 implement cheats over multiplayer 2016-02-02 14:08:59 -07:00
zsilencer b23748c015 fix 2 sources of very common desyncs 2016-02-02 14:08:59 -07:00
duncanspumpkin c53ce355fa Fix #2827. Chairlifts now create vehicles correctly. 
Issue was caused by incorrectly returning on successfully finding the next track piece. This in turn would cause the chairlift to not realise it was on an end station piece.
 2016-02-02 18:52:41 +00:00
Ted John 21faeaeba1 Merge pull request #2867 from flk92/fix-scenario-dialog-text-overflow 
Fix scenario path overflowing dialog on RCT1 font
 2016-02-02 14:25:21 +00:00
Fabio K 976e0a53e0 Fix #2855: scenario path overflowing dialog on RCT1 font 
Changes the global variable defining the current font in use before
calculating whether the path should be shortened.

Fixes OpenRCT2/OpenRCT2#2855
 2016-02-02 11:36:25 -02:00
Ted John 67c807f81f Merge pull request #2865 from octaroot/net_game_segfault_missing_object 
Fix segfault when loading network game with unknown objects
 2016-02-02 13:36:13 +00:00
Martin Černáč 5d69eda3da Fix segfault when loading network game with unknown objects 
This oneliner causes the game not to crash, when connecting to a network game that utilizes objects, that the connecting client doesn't have installed. Instead, it quits to the main menu with an error message being displayed.
 2016-02-02 14:27:08 +01:00
OpenRCT2 git bot 7e21ef7ca4 Merge Localisation/master into OpenRCT2/develop. 2016-02-02 04:00:12 +00:00
Ted John 4ea798c62d Merge pull request #2861 from janisozaur/resolve-fix 
Don't prematurely fail network resolver
 2016-02-01 23:18:42 +00:00
Michał Janiszewski eeac901b11 Don't prematurely fail network resolver 
Sometimes the resolver is still in progress while an update checks its
status, which is `INPROGRESS` and makes the game think there was a
connection failure.

This lets resolver continue doing its job if the status is `INPROGRESS`.
 2016-02-01 23:44:48 +01:00
Ted John dde7a726aa Merge pull request #2852 from janisozaur/quality-hinting 
Quality hinting
 2016-02-01 21:25:57 +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
Duncan e96881b732 Merge pull request #2859 from octaroot/cheat_ui_improvements 
Cheat window updates (weather dropdown, a UI gap removed)
 2016-02-01 20:10:19 +00:00
Martin Černáč 85b6effd0f Refactor the weather cheat UI 
I removed the two buttons that were used previously to change the park's weather with a proper dropdown, which allows the player to select any of the available weather, not being limited to just two options. This change is (currently) listed on the project's wiki page 'Features to implement'.
 2016-02-01 18:46:19 +01:00
Martin Černáč 52a42126f3 Fix a gap in the financial cheat UI 2016-02-01 18:46:08 +01:00
Duncan b0c5b85765 Merge pull request #2784 from marijnvdwerf/decompile-attempt 
[WIP] Attempt at decompiling `game_command_set_maze_track`
 2016-02-01 16:01:45 +00:00
Marijn van der Werf a926783164 Decompile game_command_set_maze_track 2016-02-01 14:03:56 +01:00
OpenRCT2 git bot 4019dee3ca Merge Localisation/master into OpenRCT2/develop. 2016-02-01 04:00:15 +00:00
Ted John d86bf8fae6 Merge pull request #2849 from janisozaur/scroll-tooltip 
On scroll widgets only display tooltip in main area
 2016-01-31 18:05:35 +00:00
duncanspumpkin b8c4c46f32 Minor refactor of map location compare flags. 
Labelled ELEMENT_IS_UNDERGROUND.
 2016-01-31 16:58:38 +00:00
Michał Janiszewski 9ff064ff7f On scroll widgets only display tooltip in main area 
This makes sure tooltip is only displayed in the "view" area of scroll
widget. Other areas are scrollbars and since they cannot have custom
tooltips, it should not affect any functionality.

Fixes #2848.
 2016-01-31 13:42:54 +01:00
IntelOrca 43b723a411 set show all files by default 2016-01-30 22:38:17 +00:00
Ted John d299dca475 Merge pull request #2844 from janisozaur/network-version 
Decouple network version from OpenRCT2 version
 2016-01-30 22:37:30 +00:00
Michał Janiszewski e814cdd271 Decouple network version from OpenRCT2 version 
This allows to present a different version of network stream than just
OpenRCT2 version, as we can possibly have breaking changes to network in
one release cycle.

This commit also adds easy way of identification which hosts are running
which versions, by showing a tooltip when hovering mouse cursor over the
network compatibility icon. Client's own version is displayed as well.
 2016-01-30 22:44:43 +01:00
OpenRCT2 git bot 083ec35362 Merge Localisation/master into OpenRCT2/develop. 2016-01-30 04:00:12 +00:00
anyc ffafd07c90 use enum to specify file dialog type 2016-01-29 19:03:09 +01:00
Fabio Ka d193e9f3b3 Change msgbox flags/log on Linux to "warning" 2016-01-29 19:01:00 +01:00
Fabio Ka 6b2b6e476c Add message box on Linux platforms 2016-01-29 19:00:36 +01:00
Ted John 40200c0d23 Merge pull request #2836 from LRFLEW/dates 
Added missing enum strings to config.c
 2016-01-29 10:21:52 +00:00
LRFLEW 3b9b929598 Added missing enum strings to config.c 2016-01-29 02:31:12 -07:00
OpenRCT2 git bot b23c27c6e9 Merge Localisation/master into OpenRCT2/develop. 2016-01-29 04:00:13 +00:00
Ted John 9fdc5639e8 Merge pull request #2833 from marijnvdwerf/fix-2828 
Fix maze placement
 2016-01-28 22:06:22 +00:00
Marijn van der Werf 8f8d0e2473 Fixes #2828: shifting by wrong number of bits 2016-01-28 21:40:06 +01:00
OpenRCT2 git bot 7a6cdbcfed Merge Localisation/master into OpenRCT2/develop. 2016-01-28 04:00:13 +00:00
Ted John 1bf543f606 Merge pull request #2815 from LRFLEW/develop 
Fix unsigned warning in network_set_player_last_action_coord
 2016-01-27 23:13:32 +00:00