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

6143 Commits

Author SHA1 Message Date
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
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
LRFLEW 095e0e18e3 Fix unsigned warning in network_set_player_last_action_coord 2016-01-27 16:00:00 -07:00
duncanspumpkin e7545983f1 Fix #2825. Issue caused by incorrect signness of variable 2016-01-27 17:47:10 +00:00
Ted John 6ee91c7fe9 Merge pull request #2823 from janisozaur/libpng 
Fix for libpng
 2016-01-27 08:27:53 +00:00
Ted John 9a8460fe02 Merge pull request #2824 from LRFLEW/futravis 
Fixed travis OS X failure and removed using 10.10 SDK
 2016-01-27 08:25:40 +00:00
LRFLEW 5f2822f4a7 Fixed travis OS X failure and removed using 10.10 SDK 2016-01-27 00:53:33 -07:00
Michał Janiszewski 184dbe21c6 Fix for libpng 2016-01-27 07:54:28 +01:00
OpenRCT2 git bot cc40a8292c Merge Localisation/master into OpenRCT2/develop. 2016-01-27 04:00:12 +00:00
Ted John dff4a693e7 Merge pull request #2819 from janisozaur/headless 
Don't update title screen when running headlessly
 2016-01-26 10:48:18 +00:00
Michał Janiszewski fc6b472ba9 Don't update title screen when running headlessly 2016-01-26 11:26:32 +01:00
Ted John 6cb0a6bfbc Merge pull request #2818 from JarnoVgr/websitemerge 
Readme update: Download details
 2016-01-26 09:49:42 +00:00
Jarno Veuger c68ec75969 Download details update 
- Removed UrsaLabs build link since they're outdated.
- OpenRCT2.com and OpenRCT.net merged to OpenRCT2.org
 2016-01-26 10:35:35 +01:00
OpenRCT2 git bot c79541a3a7 Merge Localisation/master into OpenRCT2/develop. 2016-01-26 04:00:13 +00:00
Ted John e01da33fce Merge pull request #2812 from janisozaur/disable-cheats-mp 
Disable opening cheats window in MP
 2016-01-25 20:50:21 +00:00
Michał Janiszewski ec2387082c Remove cheats from config 2016-01-25 21:44:13 +01:00
Michał Janiszewski dd37ca05c3 Disable opening cheats window in MP 
When connecting to a server, also reset cheats.

This should fix #2811
 2016-01-25 21:44:09 +01:00
Ted John 6a3d199944 Merge pull request #2770 from pizza2004/develop 
Add New Game Option to the File Menu
 2016-01-25 20:33:19 +00:00
Ted John 312825c39c Merge pull request #2809 from LRFLEW/ini 
Fixed minor issues with handling whitespace in config.ini
 2016-01-25 20:30:01 +00:00
Chad Anderson bc92446d32 New Game Option 
I added a menu option to bring up the Scenario Selector from within
game, so that you can easily choose a new level without needing to load
the Title Screen.
 2016-01-25 13:15:26 -07:00
LRFLEW 7c0b1e288c Fixed minor issues with handling whitespace in config.ini 2016-01-25 13:10:36 -07:00
duncanspumpkin c879c1697e Fix #2110. Boat hire mode no longer causes a crash with incorrect vehicle type 
This fixes the crash but you can't at present set the number of cars to 1 so its still not completely possible to do what @webhawk wanted
 2016-01-25 18:20:46 +00:00
IntelOrca e3f0d22988 invalidate dropdown when highlighted index is set to default 2016-01-25 18:12:13 +00:00
Ted John cbd5afde53 Merge pull request #2813 from duncanspumpkin/fix_dropdown 
Fix dropdown default highlight regression
 2016-01-25 18:09:23 +00:00
duncanspumpkin ba314c6fc8 Fix dropdown default highlight regression 2016-01-25 17:11:56 +00:00
Ted John 0e96c259b9 Merge pull request #2807 from LRFLEW/disabled 
Improved Rendering of Disabled Scenario Names
 2016-01-25 13:13:37 +00:00