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
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
Michał Janiszewski
436809f778
Integrate rct_window::var_496
2016-08-04 21:54:37 +02:00
OpenRCT2 git bot
0be54fbac3
Merge Localisation/master into OpenRCT2/develop.
2016-08-04 04:00:20 +00:00
Marijn van der Werf
eb25fe2f38
Integrate (FlatRide)TrackDefinitions
2016-08-04 01:16:31 +02:00
Marijn van der Werf
3d8b71ffbc
Rename gTrackDefinitions to TrackDefinitions
2016-08-04 01:15:23 +02:00
Marijn van der Werf
69027a81e4
Add constants for flat ride tracks ( #4209 )
2016-08-04 00:36:42 +02:00
