Marijn van der Werf
71c1f13ffa
Integrate 0x0098D8B4
2016-08-12 22:36:39 +02:00
Marijn van der Werf
69bbf7ea3b
Use RequiredSelectedObjects
2016-08-12 22:36:34 +02:00
Marijn van der Werf
8889530869
Use wage_table
2016-08-12 22:36:27 +02:00
Ted John
122139e1e8
Merge pull request #4263 from marijnvdwerf/clean/data-edgeslopes
...
Include edge styles
2016-08-12 20:53:07 +01:00
Ted John
97b0245697
Merge pull request #4181 from marijnvdwerf/clean/data-1
...
Misc RCT data integration
2016-08-12 20:52:10 +01:00
Marijn van der Werf
8903559f75
Include data at `0x99ba64` and `0x99ca64`
2016-08-12 20:51:22 +01:00
Ted John
389d75534d
Merge pull request #4224 from marijnvdwerf/clean/data-5
...
[Clean] Use already integrated data
2016-08-12 20:50:37 +01:00
Marijn van der Werf
34e046df41
Include TrackHeightMarkerPositions
2016-08-12 20:22:25 +01:00
LRFLEW
aa962b2cc8
Fix Warning in Xcode ( #4241 )
2016-08-12 09:34:05 +02:00
OpenRCT2 git bot
85210322ae
Merge Localisation/master into OpenRCT2/develop.
2016-08-12 04:00:24 +00:00
Marijn van der Werf
ef8d43328a
Name WallSceneryFlag
2016-08-11 18:29:44 +02:00
Marijn van der Werf
be1e832873
Include edgeslopes
2016-08-11 18:18:29 +02:00
OpenRCT2 git bot
bb07785e96
Merge Localisation/master into OpenRCT2/develop.
2016-08-10 04:00:26 +00:00
Ted John
0e04e9e47f
Merge pull request #4259 from marijnvdwerf/clean/constants-1
...
[Clean] Use more constants
2016-08-09 23:55:18 +01:00
Marijn van der Werf
bdf174d4a2
Use sprite constants for weather
2016-08-09 23:43:47 +02:00
Yaroslav Tretyakov
4066009778
Fix #4253 : Crash in vehicle_update_motion_collision_detection
2016-08-09 08:35:16 +01:00
OpenRCT2 git bot
a7454d6d88
Merge Localisation/master into OpenRCT2/develop.
2016-08-09 04:00:19 +00:00
Michał Janiszewski
645bb44eb4
Minor fixes to 64 bit builds
2016-08-08 23:06:10 +01:00
Ted John
53ec220bf9
Merge pull request #4244 from janisozaur/osx-test-64
...
64 bit support for OS X, Windows
2016-08-08 11:51:30 +01:00
Michał Janiszewski
796f496677
Remove leftover debug code from openrct2.c
2016-08-08 10:22:46 +02:00
Yaroslav Tretyakov
c967114463
Fix #4215 : Multiplayer, default group does not work correctly with group IDs
2016-08-08 09:01:52 +01:00
Michał Janiszewski
af91148051
Cast pointer to segment to satisfy mingw
2016-08-08 07:30:34 +02:00
Ted John
94397784bb
Let x64 Windows builds use mmap configuration
2016-08-08 07:25:23 +02:00
Ted John
c93a6f1275
Fix build for MSVC
...
Variable not used, but warning can be suppressed by initialising it
2016-08-08 07:25:22 +02:00
Michał Janiszewski
79e755a36b
Fix segments pointer type
2016-08-08 07:25:22 +02:00
Aaron van Geffen
95ef81b4c8
CMake: split OpenGL check for macOS and Linux.
...
The GL check doesn't work nicely with macOS, while find_package doesn't work well with multiarch on Ubuntu.
2016-08-08 07:25:22 +02:00
Michał Janiszewski
7e5102dd6f
mmap data segment to arbitrary location
2016-08-08 07:25:22 +02:00
Michał Janiszewski
db00598d18
Fix `main()` signature for Windows
2016-08-08 07:25:22 +02:00
Michał Janiszewski
20781a2922
Prevent using drawing functions in NO_RCT2 builds
2016-08-08 07:25:22 +02:00
LRFLEW
69404bd394
Fix OpenSSL CMake Dependency on macOS
2016-08-08 07:25:22 +02:00
Ted John
0fbdcbe62d
Unload objects before g1 and g2
...
This fixes a crash that happens when exiting the game where g1 elements has been disposed before the object images get disposed. Only apparent in NO_RCT2 or x64 builds where g1 elements is a dynamically allocated.
2016-08-08 01:30:55 +01:00
Ted John
7013e05c50
Update dependencies to version 9
...
This now includes both an x86 and x64 lib, so make changes accordingly to vcxproj.
2016-08-08 00:38:03 +01:00
Aaron van Geffen
807d53e43c
Prevent undefined behaviour in zooming functions. ( #4249 )
2016-08-07 23:12:09 +02:00
Marijn van der Werf
b707053fce
Add defines for colour groups
2016-08-07 20:13:46 +02:00
Marijn van der Werf
d556281a5a
Include RideColourPresets
2016-08-07 20:13:46 +02:00
Marijn van der Werf
443d508fb0
Include some peep data
2016-08-07 20:13:46 +02:00
Marijn van der Werf
80419556f4
Include some supports data
2016-08-07 20:13:46 +02:00
Marijn van der Werf
bb1ea5c9c7
Use `construction_markers`
2016-08-07 20:13:46 +02:00
Marijn van der Werf
6bdc2206d9
Use `gPaintInteractionType`
2016-08-07 20:13:44 +02:00
Marijn van der Werf
fc750583f9
Use MAP_ELEMENT_TYPE_FLAG_HIGHLIGHT
2016-08-07 20:12:48 +02:00
Marijn van der Werf
040a35f254
Inline `0xF4413E` as local variable
2016-08-07 20:12:46 +02:00
Marijn van der Werf
b428a95724
Ride classes
2016-08-07 20:11:43 +02:00
Marijn van der Werf
718c2906e9
Include news type list
2016-08-07 20:11:41 +02:00
Marijn van der Werf
f05a1b1e89
Clean up Top Spin
2016-08-07 20:05:21 +02:00
Marijn van der Werf
0054493d41
Remove globals used by crooked house paint
2016-08-07 20:05:19 +02:00
Ted John
6644902829
Merge pull request #4246 from marijnvdwerf/clean/data-7
...
Integrate data
2016-08-07 17:35:59 +01:00
Marijn van der Werf
ceaa7c8a04
Add track mirroring data
2016-08-07 14:31:19 +02:00
Marijn van der Werf
d5b8fe3732
Integrate dodgems data
2016-08-07 14:31:13 +02:00
Marijn van der Werf
897fc0591b
Integrate track pricing
2016-08-07 14:31:08 +02:00
Ted John
ba4df424cb
Merge pull request #4245 from janisozaur/integrate3
...
Integrations
2016-08-07 13:02:31 +01:00