Marijn van der Werf
d0bb8597d9
Use RideProperties
2016-08-06 01:03:45 +02: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
Michał Janiszewski
91e04282ee
Fix pointer types for 64 bit
2016-08-03 23:33:12 +02:00
Ted John
70853d65d6
Merge pull request #4203 from janisozaur/integration
...
Integration commits from #4181
2016-08-03 21:21:27 +01:00
Ted John
bf4e3febeb
Fix #4207 : Scenario Editor freezes the game
...
Recent commits have caused the sprite spatial index to be uninitialised for the editor modes. Call
eset_sprite_spatial_index within
eset_sprite_list as the two come hand in hand.
2016-08-03 21:19:53 +01:00
Ted John
690e0641b4
Merge pull request #4206 from janisozaur/integrate
...
Add more 64-bit compatibility fixes enabling toolbars to work.
2016-08-03 20:58:49 +01:00
Michał Janiszewski
6c28a17906
Fix pointer casting for some strings
2016-08-03 20:53:25 +02:00
Michał Janiszewski
f8e0d4b25b
Add explicit empty string
...
Needed to properly handle toolbars in 64 bit builds
2016-08-03 20:51:53 +02:00
Michael Steenbeek
c522f9cfd3
Implement max people on maze properly
...
Last year the limit for max people on maze was raised using a hack. Since the responsible table has been implemented since then, remove the hack and update the value in the table.
2016-08-03 19:41:31 +01:00
Michał Janiszewski
c8d69c99f4
Make format_string_code capable of handling native pointers
2016-08-03 20:08:53 +02:00
Michał Janiszewski
76d0adb5ed
Remove unused variable
...
0x00F43896 usage has been refactored out in 9c3055224
2016-08-03 19:26:34 +02:00
Michał Janiszewski
e930a09f0b
Free compressed map when failed to connect client
2016-08-03 07:39:55 +02:00
OpenRCT2 git bot
3f07e5929d
Merge Localisation/master into OpenRCT2/develop.
2016-08-03 04:00:19 +00:00
Marijn van der Werf
0333eb760a
Add macro for support height
2016-08-02 23:32:58 +02:00
Marijn van der Werf
7bfdbbd409
Include ride stats labels
2016-08-02 23:32:58 +02:00
Marijn van der Werf
51f4988e06
Clean/include peep/staff vars
2016-08-02 23:32:58 +02:00
Ted John
e80bc86377
Merge pull request #4191 from janisozaur/integrate2
...
Integrate various bits to try and improve 64-bit compatibility.
2016-08-02 22:17:39 +01:00
Michał Janiszewski
a7f31dda4f
Fix issues from gRideProperties review
...
Also renames it to RideProperties
2016-08-02 23:04:18 +02:00
Michał Janiszewski
825f581f5f
Package and push Linux AMD64 builds to transfer.sh ( #4202 )
2016-08-02 19:17:20 +02:00
Michał Janiszewski
6db035f318
Extract gRideProperties ride flags
2016-08-02 12:56:08 +02:00
OpenRCT2 git bot
63c74b40de
Merge Localisation/master into OpenRCT2/develop.
2016-08-02 04:00:18 +00:00
Michał Janiszewski
6ba62ed123
Integrate vehicle synchronisation info
2016-08-01 23:33:55 +02:00
Michał Janiszewski
2db2ef5eec
Fix pointer types
2016-08-01 23:14:42 +02:00
Michał Janiszewski
ec8ac1a805
Change the way scrolling text positions are stored
2016-08-01 23:14:42 +02:00
Michał Janiszewski
2b85801fc3
Integrate 97e1bc
2016-08-01 23:14:42 +02:00
Michał Janiszewski
09a20524a5
Integrate gRideProperties
2016-08-01 23:14:42 +02:00
Michał Janiszewski
a71e60bed5
Make window_start_textbox accept pointer argument
2016-08-01 23:14:42 +02:00
Michał Janiszewski
a40b3c63af
Convert loadsave dialog to new string format
2016-08-01 23:14:42 +02:00
Michał Janiszewski
b16b6814aa
Fix pointer types for 64 bit builds
2016-08-01 23:14:42 +02:00
Michał Janiszewski
ddb72b6f22
Fix sprite pointers for 64 bit builds
2016-08-01 23:14:42 +02:00
Michał Janiszewski
e6575f09ea
Integrate scrolling text position offsets
2016-08-01 23:14:42 +02:00
Michał Janiszewski
2e319c4dd6
Fix CMake flags setup
2016-08-01 23:14:42 +02:00
Ted John
86d5447709
Merge pull request #4176 from janisozaur/ride-types
...
Fix #4172 : Expose ride-type changing capability in UI
2016-08-01 21:40:46 +01:00
Michał Janiszewski
41049e5a32
Fix positions of widgets
2016-08-01 22:17:38 +02:00
