Michał Janiszewski
41b2168824
Fix namespace unused with HTTP disabled
2018-06-19 22:41:33 +02:00
Michał Janiszewski
e1c5fda28d
Compile Android builds with network support
2018-06-19 22:03:31 +02:00
Michał Janiszewski
6c4f714ecc
Update Android builds to use libs v0.9, link with ICU ( #7712 )
2018-06-19 21:57:44 +02:00
OpenRCT2 git bot
0ec3ccdaf4
Merge Localisation/master into OpenRCT2/develop.
2018-06-18 04:00:56 +00:00
Michał Janiszewski
65d1c7f490
Fix and enable -Wtautological-unsigned-zero-compare ( #7706 )
2018-06-17 22:48:45 +02:00
Aaron van Geffen
d5eb1c504d
Fix #7685 : Disable warning due to problems compiling OpenSSL on macOS. ( #7704 )
2018-06-17 09:29:05 +02:00
OpenRCT2 git bot
05fa04a8d6
Merge Localisation/master into OpenRCT2/develop.
2018-06-17 04:00:26 +00:00
Ted John
182bc1afe6
Fix #7696 : Servers do not get registered on master server list
...
Correct the HTTP method used for the heartbeat request.
2018-06-16 22:37:23 +01:00
Ted John
ee50895d81
Merge pull request #7703 from IntelOrca/refactor/window-2
...
Allocate the windows on the heap
2018-06-16 21:41:05 +01:00
Ted John
98905fdbc3
Change g_window_list to use the heap for windows
2018-06-16 16:04:01 +01:00
Ted John
0f6138f8b6
Convert g_window_list to a std::vector
2018-06-16 16:04:01 +01:00
Ted John
a716b4aa28
Remove use of window list in Viewport.cpp
2018-06-16 16:04:01 +01:00
Aaron van Geffen
1f5572fe28
Fix #7701 : Strings overflow in drawing debug windows. ( #7702 )
...
The last widget was not taken into account.
2018-06-16 14:41:18 +01:00
Ted John
26666b1da9
Remove empty function: viewport_update_pointers
2018-06-15 23:15:52 +01:00
Michael Steenbeek
c4cae83335
Fix AddRange to avoid duplicates in EntryList
2018-06-15 23:36:13 +02:00
devnoname120
4dea7f7971
Make related projects icons clickable ( #7699 ) [ci skip]
2018-06-15 21:27:44 +02:00
Hielke Morsink
14d6625c15
Merge pull request #7695 from Broxzier/wide-path-debug
...
Add debug option to visualize wide path flags.
2018-06-15 17:07:50 +02:00
Hielke Morsink
0528a455e9
Automatically resize debug window to fit strings
2018-06-15 16:13:47 +02:00
Hielke Morsink
0fda25d365
Add debug option to visualize wide path flags.
...
This implements #7694
2018-06-15 16:08:25 +02:00
Hielke Morsink
0cf256ac9e
Ready copyright notice for clang-format
...
Clang-format sees the text behind `#pragma region` as code and formats it. Instead of stating the copyright and date there, it's now in the comment block right below it. The text "Copyright" is left in the `#pragma region` line, as clang-format sees it as a single identifier.
I took the opportunity to normalize the dates, and add the copyright notice to the source files where it was missing them (except for third-party and the generated resources.h file).
2018-06-15 14:07:34 +02:00
Michael Steenbeek
d28e8a6126
Introduce calls to check for research markers
2018-06-15 12:11:03 +02:00
Hielke Morsink
aad1e69d7e
Add parentheses to macro arguments ( #7686 )
...
This adds parentheses around macro arguments that are either negative or used for calculations inside the macro itself. Doing this avoids getting errors in code that may look right.
2018-06-15 10:54:05 +02:00
Michael Steenbeek
706843e135
Use `get_ride_entry()` to build the correct `rct_research_item`
2018-06-15 10:39:38 +02:00
Michael Steenbeek
74dd8a4eac
Merge pull request #5993 from wolfreak99/improved_window_inputs/ride_price_textinput
...
Make ride window prices allow text input
2018-06-15 10:09:37 +02:00
Michael Steenbeek
7bd4244797
Merge pull request #7628 from Chaosmeister/unpickable-research-items
...
make always researched researchitems unpickable.
2018-06-15 09:47:08 +02:00
Michael Steenbeek
029ad2b5eb
Update changelog for #5993
2018-06-15 09:37:32 +02:00
Michael Steenbeek
e6dcf43680
Adjust money-string functions for exchange rates
2018-06-15 09:36:17 +02:00
Aaron van Geffen
ee64daae58
Fix event list.
2018-06-15 09:36:17 +02:00
Gymnasiast
fe54cf5ee6
Allow forcing decimals
2018-06-15 09:36:17 +02:00
wolfreak99
961d25dbb9
Make ride window prices allow text input
2018-06-15 09:36:17 +02:00
Ted John
fdb1d98868
Move rain window loop to libopenrct2ui ( #7684 )
2018-06-15 07:46:04 +01:00
Aaron van Geffen
9d68ba86ff
Update changelog.
2018-06-15 00:43:19 +02:00
Hielke Morsink
c3cff07b91
Disallow placing items in-between always researched items
...
This adds a loop that iterates down the list, until it reaches either a researched item or the end.
2018-06-15 00:34:30 +02:00
Hielke Morsink
c437f438f1
Remove invalid cast
2018-06-15 00:34:30 +02:00
Hielke Morsink
30b9d3a338
Move always_researched checks and add comments
2018-06-15 00:34:30 +02:00
Chaosmeister
308ae4b357
Make always-researched research items unpickable.
2018-06-15 00:34:30 +02:00
Gymnasiast
ac0c1ba94a
Use correct wording in changelog for #7683 [ci skip]
2018-06-14 21:02:58 +02:00
Gymnasiast
c804a7d02e
Use issue number instead of PR number for #4143 [ci skip]
2018-06-14 21:01:41 +02:00
Michael Steenbeek
8a9dfa6033
Stop ride type dropdown state sharing among ride windows
...
This eliminates the _rideType variable, which was necessary when we still used a spinner and an Apply button, but is now no longer needed.
2018-06-14 20:15:31 +02:00
Aaron van Geffen
e1f7efc7e9
Merge pull request #7665 from AaronVanGeffen/git_describe_version
...
Use `git describe` to express version in terms of closest tag
2018-06-14 16:57:25 +02:00
Aaron van Geffen
86035505e9
Update Xcode project to generate `git describe` info, too.
2018-06-14 16:10:27 +02:00
Aaron van Geffen
fd74c6c93f
Suppress branch info for releases on master.
2018-06-14 15:31:31 +02:00
Ted John
314707d67a
Add `git describe` support for AppVeyor builds
2018-06-14 12:52:01 +01:00
spacek531
b79239586a
Fix #7657 : All vehicles ring a tram bell when crossing paths
2018-06-14 13:36:35 +02:00
Andy Ford
ea371144e7
Fix #7643 : No Money scenarios can have funding set to zero
...
If research funding is set to no funding and scenario money is turned
off, then update research at the normal rate.
2018-06-14 13:17:09 +02:00
Michael Steenbeek
9436dab66c
Fix #7655 : Large portions of the screen do not invalidate properly
...
Also fixes #7676 .
Error was introduced during refactoring in 85dc161c5a
.
2018-06-14 12:01:55 +02:00
Ted John
9e9c2c072e
Fix #7678 : Crash when Loading or starting a new game...
...
...while having object selection window open
Close the object manager window before loading the next park.
2018-06-13 23:29:05 +01:00
Hielke Morsink
6b22a9d38b
Merge pull request #7586 from Broxzier/refactor/banner-ride-index
...
Banner code cleanups
2018-06-13 21:48:04 +02:00
Andy Ford
2ab3bd515d
Fix #7673 : Vehicle names cut in invention list ( #7675 )
...
* Fix #7673 : Vehicle names cut in invention list
The string formatting was formatting based on the size of the
pointer to the buffer, not the buffer itself, this truncated all
vehicle names to 8 characters.
* Adjust Long Vehicle Names For Vertical Scrollbar
The ellipsis in long vehicle names were being cut off by
the scrollbar. Reduced the string formatting length by
vertical scrollbar size - 1. The extra 1 is for the fact
that the second column starts + 1 from the middlepoint of the box.
2018-06-13 21:44:25 +02:00
Ted John
86ca6be58b
Fix #7674 : Rides show up as random numbers in guest's ride list
2018-06-13 18:32:00 +01:00