Hendrik v. Raven
5b3f0454dd
reformatting to match if clause
...
reformat the existing code to match the newly introduced indention level
2017-07-26 11:44:06 +02:00
Hendrik v. Raven
0f111de224
add SYSTEM_GTEST option to use gtest of the system
...
This adds a new configure option forcing the system to use googletest
installed on the system instead of downloading a version. The default
is still to download googletest.
2017-07-26 11:44:06 +02:00
Hendrik v. Raven
cfa20d2117
rename GTEST_INCLUDE_DIR to GTEST_INCLUDE_DIRS
...
GTEST_INCLUDE_DIRS is the name used by the CMake GTest package. This
is a preparation for the optional usage of a system installed gtest.
2017-07-26 11:44:06 +02:00
Richard Jenkins
a2f8720143
Fix #5981 : Ride list doesn't update after using quick demolish
2017-07-26 11:07:12 +02:00
rwjuk
11711fe4c4
Fix #6010 : Assert triggered when loading SC6 via file assoc
2017-07-26 11:03:46 +02:00
Gymnasiast
271e6837e9
Refactor byte_F4414E into separate local bools
2017-07-26 09:17:43 +02:00
OpenRCT2 git bot
efdc52662d
Merge Localisation/master into OpenRCT2/develop.
2017-07-26 04:00:19 +00:00
Duncan
9a49490a0a
Refactor of scenery elements ( #5308 )
...
Label scenery flags, vars and refactor small scenery into cpp file.
2017-07-25 22:26:43 +01:00
Christian F. Coors
32da66aa79
Fix build errors
2017-07-25 22:50:19 +02:00
wolfreak99
6ec89fa78b
Implement dropdown/spinner combo for changing ride type
2017-07-25 13:25:31 +02:00
Michael Steenbeek
ef6aea98e4
Implement #4135 : Rename RC Designer to Track designer and allow more ride types
2017-07-25 12:16:37 +02:00
Gymnasiast
274abcb071
Clean up track designs a bit
2017-07-25 11:04:40 +02:00
wolfreak99
77035b0993
Move braces onto their own line
2017-07-25 10:45:38 +02:00
wolfreak99
7c6e260f77
Revise dividing by zero guards
2017-07-25 10:45:38 +02:00
wolfreak99
150cc90f89
fix empty dropdowns
2017-07-25 10:45:38 +02:00
zsilencer
424f2fcef5
Fix #5984 : Allow socket binding to same port after crash
2017-07-25 08:35:35 +02:00
ZehMatt
fabf7f9fb5
Refactored window flags only being updated every 1000ms.
2017-07-25 08:33:57 +02:00
OpenRCT2 git bot
fe19d9a2a3
Merge Localisation/master into OpenRCT2/develop.
2017-07-25 04:00:25 +00:00
Ted John
c87a0e59fd
Use dedicated msbuild property for enabling warnings
2017-07-24 22:04:40 +02:00
Michał Janiszewski
5811a9e08e
Lift C4548 for FD_SET
...
Others encountered that as well:
https://github.com/deflomu/cryptlib/blob/master/io/tcp.h#L572-L588
Nothing we can do about it ourselves.
2017-07-24 22:04:40 +02:00
Michał Janiszewski
252f3fd5c4
Add more warnings to MSVC
2017-07-24 22:04:40 +02:00
Michał Janiszewski
41819c5fb3
Fix the warnings section
2017-07-24 22:04:40 +02:00
Michał Janiszewski
f72b5b51a4
Manually enable some warnings in MSVC
2017-07-24 22:04:40 +02:00
Gymnasiast
3c3094fa83
Raise dropdown limit to 128
2017-07-24 21:49:24 +02:00
ζeh Matt
d45044239e
Fix #5977 : Custom music files not showing up in music list
2017-07-24 17:08:10 +02:00
Gymnasiast
346c9e1359
Fix #5985 : Entertainer custome dropdown has no checked item
2017-07-24 14:10:23 +02:00
Gymnasiast
8473a40bc4
Make gDropdownItemsChecked and gDropdownItemsDisabled static
2017-07-24 14:10:23 +02:00
Michał Janiszewski
b183d82062
Use MSVC2017 by default
2017-07-24 13:18:04 +02:00
Michał Janiszewski
8770b70ec0
Switch to deployment from MSVC2017
...
[ci skip]
2017-07-24 13:18:04 +02:00
Gymnasiast
1e3b6a2ea5
Change _countof to countof
2017-07-24 12:45:34 +02:00
ZehMatt
917bba777e
Fix ride previews going out of bounds.
2017-07-24 12:45:34 +02:00
Michał Janiszewski
7503e963fd
Add /permissive- switch to MSVC
...
MSVC2017 has a new compiler switch to become more conformant. See
https://blogs.msdn.microsoft.com/vcblog/2016/11/16/permissive-switch/
On MSVC2015 (as used currently in our AppVeyor setup) this switch is
safely ignored.
This should help reduce the need to fix build errors only found on
Travis et al.
2017-07-24 12:31:36 +02:00
Michael Steenbeek
218e6b1e0a
Add PFCKrutonium to long-term contributors
2017-07-24 12:15:26 +02:00
Michael Steenbeek
9af8f93bb3
Reinstate 'Long term contributors' section
2017-07-24 12:12:04 +02:00
Gymnasiast
50ba63df0e
Clean up dropdowns
...
Uses constants in more places.
Most of the changes were taken from a PR by @wolfreak99
2017-07-24 10:33:46 +02:00
Michael Steenbeek
e13dbfa419
Changelog: fix order
2017-07-24 09:40:45 +02:00
Gymnasiast
cc289a60b6
Correct 'Haunted Harbour' identifier
2017-07-24 08:49:45 +02:00
OpenRCT2 git bot
e431c812fa
Merge Localisation/master into OpenRCT2/develop.
2017-07-24 04:00:18 +00:00
Gymnasiast
c929311518
Make entrance/exit position list use MAX_STATIONS
2017-07-23 22:16:53 +02:00
Michael Steenbeek
2c52ef71a4
Replace SPR_METAL_PLATE with SPR_STATION_BASE_D and use it throughout ( #5978 )
2017-07-23 17:20:13 +01:00
Ted John
34096627ac
Fix #5973 : Headless Servers lost the ability to load Scenarios
2017-07-23 11:14:57 +01:00
wolfreak99
47a89c4cf3
Add "Ignore research status" cheat
2017-07-23 12:09:29 +02:00
wolfreak99
ed69983354
Overflow dropdowns with 32+items into columns
...
After about 32+ items, lists can sometimes go off screen. This commit
modifies the text based dropdowns loosely based off the code from the
image dropdowns. I've also added _dropdown_list_vertically to allow text
lists to continue to remain in an up-to-down format and images to remain
in a left-to-right format.
2017-07-23 11:56:42 +02:00
wolfreak99
32fbf31777
Define DROPDOWN_ITEMS_MAX_SIZE
...
This defines the current limitation of dropdown items.
2017-07-23 11:56:42 +02:00
OpenRCT2 git bot
eb28bba119
Merge Localisation/master into OpenRCT2/develop.
2017-07-23 04:00:16 +00:00
Ted John
bc88cb9c2b
Make TitleScreen a class ( #5971 )
2017-07-22 23:42:14 +01:00
Gymnasiast
7fcb39c833
Add Bobsleigh RC on ride photos to changelog
...
[ci skip]
2017-07-22 22:47:34 +02:00
Gymnasiast
2a4c0ebe20
Allow on-ride photo segments on Bobsleighs
2017-07-22 22:47:34 +02:00
CharlesLove
88290337f6
Fix #5881 : gCheatsUnlockAllPrices persists when loading new scenarios
2017-07-22 22:20:52 +02:00
ζeh Matt
6a56c8c716
Refactored some variables around paint_arrange_structs. ( #5876 )
2017-07-22 14:18:58 +01:00
