Ted John
124fb0df90
Fix out of bounds error in window_editor_object_selection_scroll_mouseover
2018-04-09 17:46:43 +01:00
Michael Steenbeek
7ebd7f1194
Increase network version
2018-04-09 16:50:17 +02:00
Michael Steenbeek
92ba2dfb01
Make seatsInPairs default to true
2018-04-09 16:05:21 +02:00
Michael Steenbeek
b0413231b3
Update changelog for #2611 [ci skip]
2018-04-09 09:33:11 +02:00
OpenRCT2 git bot
396a234c8a
Merge Localisation/master into OpenRCT2/develop.
2018-04-09 04:00:27 +00:00
Ted John
dea5d2754b
Search ObjData recursively
...
Enable recursive searching ObjData for Windows and non-Windows. This allows players to continue using sub directories for their official objects, e.g. WW and TT. There will be a slight performance hit if all objects are in a sub directory as a search is done for each official object that is loaded.
2018-04-08 19:03:33 +01:00
Ted John
9dba4a87cc
Fix #7389 : Path items cannot be placed on sloped paths
...
Handle isAllowedOnQueue and isAllowedOnSlope separately
2018-04-08 18:46:01 +01:00
NathanZabriskie
cc256997ef
Opening the mini-map reverts the size of the land tool to 1x1, regardless of what was selected before. #7382 ( #7387 )
...
* Opening the mini-map reverts the size of the land tool to 1x1, regardless of what was selected before. #7382
* Updated changelog and contributors
2018-04-08 19:34:36 +02:00
Ted John
bb423194c1
Update vscode cpp properties
2018-04-08 13:02:39 +01:00
Ted John
c734738208
Fix AppVeyor builds
...
Prepend chocolatey NSIS to %PATH% so system install is not used.
2018-04-08 13:02:39 +01:00
Michael Steenbeek
f98aae12f1
Fix building g2.dat if the path contains spaces/apostrophes ( #7388 )
2018-04-08 12:25:54 +01:00
Duncan
0ab3d0955c
Merge pull request #7310 from OpenRCT2/json-objects
...
Add support for new JSON object format
2018-04-08 10:45:55 +01:00
Ted John
4c9d047b52
Update android build to download objects
2018-04-06 10:45:08 +01:00
Ted John
06da0b2fb5
Update vscode cpp properties [ci skip]
2018-04-05 21:24:52 +01:00
OpenRCT2 git bot
57b8ea4a89
Merge Localisation/master into OpenRCT2/develop.
2018-04-05 04:00:41 +00:00
OpenRCT2 git bot
7d16d65283
Merge Localisation/master into OpenRCT2/develop.
2018-04-02 04:00:41 +00:00
OpenRCT2 git bot
738b256895
Merge Localisation/master into OpenRCT2/develop.
2018-04-01 04:00:34 +00:00
Michał Janiszewski
66d1fa2bc8
Fix MinGW header checks
2018-03-31 23:48:15 +02:00
Michał Janiszewski
b26d484726
Fix remaining headers
2018-03-31 23:48:15 +02:00
Hielke Morsink
b62017657b
Fix header dependencies for openrct2-ui
2018-03-31 23:07:14 +02:00
Hielke Morsink
a51462b0fd
Include necessary files for compiling headers
...
This commits works towards #7289 . It includes files that it depends on, or forward declares types when possible. It may seem like this only increases compilation time, but before this commit they depended on the other includes of the source files that use them.
2018-03-31 23:07:14 +02:00
Fusxfaranto
69bb1cdf82
Use STR_NONE over magic number, and conform to style guide
2018-03-31 10:54:41 +02:00
Fusxfaranto
74361dcf87
Add different titles for multiplayer window tabs ( #2989 )
2018-03-31 10:54:41 +02:00
Ted John
63e9275b60
Protect against unknown ride types
2018-03-30 16:58:12 +01:00
Ted John
375deb0c9f
Include string not cstring
2018-03-30 16:53:55 +01:00
Hielke Morsink
aa7fb35839
Remove use of 'using namespace' from headers
2018-03-30 17:14:10 +02:00
Michał Janiszewski
3b7864957a
Cleanly shutdown in case of invalid g1.dat ( #7361 )
2018-03-30 15:38:22 +01:00
Michał Janiszewski
7443c66025
Fix validation of rct_ride_entry_vehicle for 32 bit builds
...
Also enables packing only for testpaint
2018-03-30 14:06:33 +02:00
Michał Janiszewski
64af3d25d4
Provide error message for older version of static_assert
2018-03-30 13:42:25 +02:00
Michał Janiszewski
4e44d6ef9c
Validate alignment of peep_loading_positions at compile time
2018-03-30 13:16:26 +02:00
deurklink
e960b3f150
Increment network version ( #7359 )
...
Both PRs #7343 and #7347 changed the network version from '1' to '2'.
2018-03-29 21:20:26 +02:00
Ted John
bb5b531f0c
Use resize instead of push_back
2018-03-29 17:59:49 +01:00
Ted John
bc5f253ce2
Update objects to latest v1.0
2018-03-29 17:56:03 +01:00
Michael Steenbeek
855baadd4c
Remove incorrect sujeonggwa spelling
2018-03-29 14:31:17 +02:00
Michael Steenbeek
68545e22da
Remove en-GB overrides for vanilla objects
2018-03-29 13:11:20 +02:00
Michael Steenbeek
cfb5a6b39d
Correct spelling of 'sujonkwa'
2018-03-29 13:00:01 +02:00
Ted John
b163064f6c
Update objects to v1.0
2018-03-28 23:15:32 +01:00
Michał Janiszewski
dcc834ae0a
Mark ObjectJsonHelpers::GetFlags<T> as static
2018-03-28 23:45:48 +02:00
Ted John
0779859d2b
Do not download objects if they already exist
2018-03-28 22:26:13 +01:00
Ted John
742edd45da
Update loading object images to use inclusive ranges
2018-03-28 22:26:13 +01:00
Gymnasiast
5eeecd82bd
Remove fixes to vanilla objects (moved to JSON)
2018-03-28 22:41:57 +02:00
Ted John
b8ae3f5e91
Fix cookie json item name
2018-03-28 21:13:59 +01:00
Ted John
025827809e
Add more include paths to .vscode config [ci skip]
2018-03-28 13:10:40 +01:00
Ted John
21d9ea53db
Add .vscode cpp config [ci skip]
2018-03-28 12:30:32 +01:00
Hielke Morsink
a2fe309be0
Merge pull request #7355 from Broxzier/fix/virtual-floor-zero-height
...
Fix #7303 Visual glitch with virtual floor near map edges
2018-03-28 12:48:39 +02:00
Hielke Morsink
8c23f16502
Merge pull request #7354 from Broxzier/fix/clip-height-assumes-order
...
Fix clipheight assuming tile order
2018-03-28 12:48:03 +02:00
Michael Steenbeek
28067c0bad
Add JSON object download to Xcode project
2018-03-28 09:42:15 +02:00
Ted John
617c14b868
Do not overwrite car.flags
2018-03-27 22:36:31 +01:00
Michał Janiszewski
ce06550b8f
Fix mismatched deleter in ~ImageTable()
2018-03-27 23:17:35 +02:00
Ted John
a4fe3962f0
Add libopenrct2 as a dependency of openrct2-cli in VS solution
2018-03-27 22:16:13 +01:00
