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
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
Marijn van der Werf
ec4cf80623
Use RideData4
2016-08-07 13:01:20 +01:00
Michał Janiszewski
fa68d31dbf
Remove RCT2_GLOBAL macro from stack buffer
2016-08-07 11:44:49 +02:00
Michał Janiszewski
9ac3b78530
Integrate g_currently_drawn_item
2016-08-07 11:41:33 +02:00
Michał Janiszewski
d9dcf86bd7
Apply RCT2_ADDRESS macro to strings as well
2016-08-07 09:06:55 +02:00
Yaroslav Tretyakov
bb822e351d
Fix #4237 : Some scenery dissapears while zooming out x2 or more
2016-08-07 01:47:31 +01:00
Ted John
c55d72412c
Add x64 VS project configurations
2016-08-07 01:47:18 +01:00
LRFLEW
e5666683aa
More RCT2_ADDRESS macro usage
2016-08-06 22:22:11 +01:00
Michał Janiszewski
0ece63a7f6
Wrap RCT2's addresses in RCT2_ADDRESS macro
2016-08-06 21:38:46 +01:00
Yaroslav Tretyakov
802fcedb6f
Fix #4222 : Artifacts with uncap fps on
2016-08-06 17:21:08 +01:00
Marijn van der Werf
680f7b7770
Integrate maze building data
2016-08-06 15:05:37 +01:00
Marijn van der Werf
ac950e0496
Integrate 0x0098DDB8 and 0x0098DDBA
2016-08-06 13:20:18 +01:00
duncanspumpkin
dd7e988f08
Fix #4231 . Ride colour issue caused by overlapping vars.
...
By using a union instead of a struct var_494 and var_496 where ontop of the same location this meant var_496 when written to would overwrite ride_colour that was also in a union with var_494/496. This in turn would cause the wrong ride_colour to be overwritten when using the colour picker.
2016-08-06 08:03:57 +01:00
Ted John
1abc4a1915
Integrate and clean up rest of guest list window vars
2016-08-06 01:52:03 +01:00
Ted John
c2db79919d
Integrate gWindowUpdateTicks
2016-08-06 01:35:46 +01:00
Ted John
252a00c35f
Integrate gCurrentWindowColours
2016-08-06 01:32:40 +01:00
Ted John
d5cb647c3a
Remove unused GLOBALs from window.c
2016-08-06 01:27:18 +01:00
Marijn van der Werf
dd2178c7cf
Include AlternativeTrackTypes
2016-08-06 01:09:28 +01:00
Michał Janiszewski
0e42554f73
Integrate drawpixelinfo bits pointer
...
This makes 64 bit build finally render properly, previously part of the pointer was getting overwritten by store to RCT2_ADDRESS_VIEWPORT_PAINT_X, which didn't make it invalid, but caused it to point wrong offset.
2016-08-05 23:46:44 +01:00
Michał Janiszewski
801c7f27d5
Use named addresses
2016-08-05 22:46:45 +01:00
Yaroslav Tretyakov
53a7b87414
Fix #4204 : Client trying to get sprite 65535
...
Caused by a conflict between a multiplayer map download and the title loading a different map.
2016-08-05 22:46:19 +01:00
Ted John
c3fdb99ceb
Merge pull request #4199 from marijnvdwerf/clean/sprite-ids-1
...
Cleanup sprite ids
2016-08-05 17:30:03 +01:00
Ted John
a66f55269b
Merge pull request #4211 from marijnvdwerf/clean/data-trackdefinitions
...
Integrate track definitions
2016-08-05 17:29:27 +01:00
Marijn van der Werf
9288029bd6
Include RideConstructionDefaultTrackType
2016-08-05 13:11:25 +01:00
Marijn van der Werf
082e4c76fa
Include data from 0x0097D7CB
2016-08-05 11:53:44 +01:00
OpenRCT2 git bot
42501c66fe
Merge Localisation/master into OpenRCT2/develop.
2016-08-05 04:00:24 +00:00
Marijn van der Werf
de6dcaaa86
Include data at 0x00982164
...
Reversed columns used for hot and cold values. Seemed to be a mistake in decompiling.
2016-08-04 23:36:51 +01:00
Ted John
32fea99c36
Merge pull request #4210 from janisozaur/integrate
...
Fix pointer types for 64 bit
2016-08-04 23:14:29 +01:00
Yaroslav Tretyakov
54974b3e6d
Fix ride music related desyncs
...
I think this might fix #1968 finally.
2016-08-04 22:56:47 +01:00
Michał Janiszewski
501f0126fa
Fix #4213 : FPS decreases with track window
...
The code must've been from before I got everything working properly,
because removing both these lines does not cause any glitches in
rendering.
2016-08-04 21:22:12 +01:00
