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

10867 Commits

Author SHA1 Message Date
Ted John 4d16e3e1bd Remove use of RWops from track design 2017-02-11 12:03:03 +00:00
Ted John 3a1331190b Merge pull request #5203 from oli414/price-tooltips 
Add tooltip for ride and entrance price when price is disabled for clarification
 2017-02-11 11:57:05 +00:00
Aaron van Geffen 5feaab2f8e Fix #5206, #5207: Do not draw all disabled tabs. 
PR #5138 had the unintended side-effect of drawing all disabled tabs, stemming from the assumption that !widget_is_disabled would be identical to widget_is_enabled.

I have reverted commit 4b91d92 to follow the original logic more closely, adding an exception for disabled tabs made explicitly visible through a sprite.

The tab PR has been much more involved than I'd originally anticipated. Hopefully, a new widget system will eventually make these things easier.
 2017-02-11 11:45:22 +00:00
OpenRCT2 git bot 5f3fc807af Merge Localisation/master into OpenRCT2/develop. 2017-02-11 04:00:24 +00:00
Olivier Wervers dcf0702f3c Fix #4493: - Fix tooltip order.\n - Add tooltip to price label. 2017-02-10 19:30:57 +01:00
Ted John 477de18c17 Merge pull request #5138 from AaronVanGeffen/bugfix/twitch-tab 
Disable Twitch tab in versions without Twitch support
 2017-02-10 18:19:15 +00:00
Ted John 591e81a0af Merge pull request #5157 from IntelOrca/fix/windows-tests-assert 
Allow control of assertion behaviour
 2017-02-10 18:18:49 +00:00
Olivier Wervers 9c8232e735 Added tooltip to ride and entrance price when price is disabled 2017-02-10 15:03:32 +01:00
Ted John e717c363eb Merge pull request #5198 from IntelOrca/refactor/sprite-c-to-cpp 
Refactor sprite c to cpp
 2017-02-10 09:46:33 +00:00
LRFLEW a15fd6c5f1 Update Xcode Project 2017-02-10 02:34:38 -06:00
Gymnasiast 6c21b469d4 Correctly save booster speed, fixes #5032 2017-02-10 00:32:41 +01:00
Marijn van der Werf f45b8d6e63 Conditionally set Twitch tab colour 2017-02-09 22:28:53 +01:00
Aaron van Geffen e60a92ecd8 Add disabled tab sprite. 2017-02-09 22:28:53 +01:00
Aaron van Geffen eff15e9c9d Simplify disabled sprite drawing. 2017-02-09 22:28:53 +01:00
Aaron van Geffen 4b91d92105 Simplify tab drawing logic. 2017-02-09 22:28:52 +01:00
Aaron van Geffen 9459ea8442 Revert change to MAIN_OPTIONS_ENABLED_WIDGETS 2017-02-09 22:28:52 +01:00
Aaron van Geffen d7d7c6d1dc Draw tab outline even if tab is disabled. 2017-02-09 22:28:52 +01:00
Aaron van Geffen 2e84410843 Draw sprite outline for disabled tabs. 2017-02-09 22:28:52 +01:00
Aaron van Geffen 1698d0d65a Disable Twitch tab when compiling without Twitch support. 2017-02-09 22:28:52 +01:00
Michał Janiszewski 6eeac4b536 Simplify version number for Travis builds 2017-02-09 21:20:47 +01:00
Jacob W. Breen b1b5fa9c5a Fix #4972: Map window not updated properly when shrinking map... 2017-02-09 18:54:03 +00:00
Christian Murphy b3e079c7fa Resolve #5140: Headless server saves default user.json 2017-02-09 18:51:49 +00:00
Ted John b79e714740 Fix compilation of sprite.cpp 2017-02-09 18:50:30 +00:00
Ted John 6a0f934a5f Tabs to spaces for sprite.cpp 2017-02-09 17:59:17 +00:00
Ted John 6ea4e4987d Turn sprite.c into sprite.cpp 2017-02-09 17:59:17 +00:00
danidoedel e7b9500bb6 Update Xcode project 2017-02-09 17:58:19 +00:00
Ted John e649e7ad4a Move creation of version string to Version.cpp 2017-02-09 17:58:19 +00:00
Ted John f59afb8c44 Use constant for assertion message 2017-02-09 17:57:39 +00:00
Ted John 3a4bc87198 Allow control of assertion behaviour 
This allows tests to change the behaviour at runtime so that OpenRCT2 aborts instead of showing a message box.
 2017-02-09 17:57:39 +00:00
Ted John c4e89278c1 Merge pull request #5194 from IntelOrca/refactor/more-istream 
Use IStream instead of SDL in more places
 2017-02-09 17:56:55 +00:00
Ted John d0a05df106 Move Convert definitions to TcpSocket.h 2017-02-09 12:33:44 +00:00
Ted John b3b5631f07 Merge pull request #5163 from Broxzier/tile_inspector_fixes 
Minor tile inspector improvements
 2017-02-08 22:26:42 +00:00
wolfreak99 54504cc75f remove excess generate_new_guest, make park_generate_new_guest public 
I noticed there is an extra generate_new_guest which calls park_generate_new_guest. This can be removed in favor of just making park_generate_new_guest public.

This also allows potential in the future for customized trams, such as a group of angry people arriving to trash the park or something like that.
 2017-02-08 22:26:04 +00:00
Ted John 7281b34486 Update changelog 
[ci skip]
 2017-02-08 22:23:16 +00:00
Marijn van der Werf 5504471715 Fix #5188: Clicking on a Magic Carpet doesn't open the ride window 2017-02-08 22:22:25 +00:00
Ted John 5787a0bf90 Use S6Exporter for crash handler 2017-02-08 22:17:01 +00:00
Ted John e2aebb2236 Use streams for reading title sequence scripts 2017-02-08 22:11:46 +00:00
Ted John 410376356d Remove scenario_load_rw, no longer used 2017-02-08 22:06:27 +00:00
Ted John c379347d59 Use stream for chat log 2017-02-08 22:00:04 +00:00
Ted John ad1634631f Fix MemoryStream::EnsureCapacity 2017-02-08 21:53:37 +00:00
Ted John d124f4fad0 Use streams for network load and save 2017-02-08 18:16:33 +00:00
Ted John de0e6bf521 Use IStream for network code 2017-02-08 12:53:00 +00:00
Ted John 61b69546fa Fix convert command 2017-02-08 12:06:08 +00:00
Ted John c80021d9da Remove use of RWops from ConvertCommand 2017-02-08 12:06:08 +00:00
Ted John 4a6905d1eb Remove object_read_and_load_entries 2017-02-08 12:06:08 +00:00
Ted John 811ab88660 Refactor CreateObjectFromLegacyFile to use FileStream 2017-02-08 12:06:07 +00:00
Ted John 2a11bc97fd Merge pull request #5179 from IntelOrca/refactor/sc-chunk-writer 
Use streams for SV6 export
 2017-02-08 12:01:38 +00:00
LRFLEW b1c7caf315 Update Xcode Project 2017-02-07 16:48:52 -06:00
Ted John 629ccec466 Use write extended mode to fix checksum calculation 
[ci skip]
 2017-02-07 20:14:31 +00:00
Michał Janiszewski 7cb9d10d72 Fix wrong #define checks for DEBUG macro 2017-02-07 21:01:07 +01:00