1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 08:14:38 +01:00
Commit Graph

1664 Commits

Author SHA1 Message Date
Marijn van der Werf
4d7db62336 Use RideKeyColours for map legend 2016-08-06 01:04:37 +02:00
Marijn van der Werf
6c76d3f2d2 Use FlatTrackCoordinates 2016-08-06 01:04:37 +02:00
Marijn van der Werf
1fc5681f00 Use TrackCoordinates 2016-08-06 01:04:35 +02: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
Ted John
32fea99c36 Merge pull request #4210 from janisozaur/integrate
Fix pointer types for 64 bit
2016-08-04 23:14:29 +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
Marijn van der Werf
3d8b71ffbc Rename gTrackDefinitions to TrackDefinitions 2016-08-04 01:15:23 +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
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
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
Michał Janiszewski
a7f31dda4f Fix issues from gRideProperties review
Also renames it to RideProperties
2016-08-02 23:04:18 +02:00
Michał Janiszewski
2db2ef5eec Fix pointer types 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
41049e5a32 Fix positions of widgets 2016-08-01 22:17:38 +02:00
Michał Janiszewski
062ab25f95 Fix invalidation issues 2016-08-01 20:30:08 +02:00
Michał Janiszewski
155bc054df Fix #4172: Expose ride-type changing capability in UI
This also allows changing ride type in multiplayer games. Very crashy.
2016-08-01 20:30:08 +02:00
Ted John
349684b7ce Merge pull request #4146 from AaronVanGeffen/reposition-mouse
Change mouse scroll zooming behaviour to zoom towards the cursor keeping the map position under the cursor consistent. This new behaviour is opt-out.
2016-07-31 12:38:06 +01:00
Michael Steenbeek
ff7e119b46 Name some track design flags 2016-07-31 12:02:38 +01:00
Aaron van Geffen
a1b8bdfa11 Make zooming to cursor optional.
This adds a checkbox to the interface settings panel to enable zooming around the cursor.
If disabled, which it is by default, vanilla RCT2 behaviour is retained.
2016-07-30 21:18:59 +02:00
Michael Steenbeek
19220cbbce Add a button to the map generator window in the Map window (#4098)
Includes many fixes by @Wirlie
2016-07-30 21:10:04 +02:00
wolfreak99
8f254702a2 Add cheat to reset date (#4188) 2016-07-29 20:49:38 +02:00
Marijn van der Werf
b4f8f13849 Use sprite constants for staff list dialog 2016-07-28 23:28:32 +02:00
Marijn van der Werf
a17e6cee5e Use constants for shop item images 2016-07-28 23:28:32 +02:00
Marijn van der Werf
9401afa68f Use constants for colour preview images 2016-07-28 23:28:32 +02:00
Marijn van der Werf
c23750911f Add missing description for paint debug shortcut 2016-07-28 21:49:08 +01:00
Alexander Overvoorde
3842728f38 Fix indentation and code style in various files 2016-07-27 16:31:25 +02:00
Alexander Overvoorde
c56a683eed Disable OpenGL vsync when uncap fps option is enabled 2016-07-27 04:01:25 +02:00
Marijn van der Werf
7478cfc053 Wrap defines in round brackets 2016-07-26 23:37:22 +02:00
Marijn van der Werf
7ec458f1bd Fix indentation of new menu option 2016-07-26 23:18:52 +02:00
Marijn van der Werf
763ae7edd7 Use #define instead of constant 2016-07-26 23:16:25 +02:00
Marijn van der Werf
f9670fc1d4 Add debug menu option 2016-07-26 10:55:48 +02:00
Marijn van der Werf
dd756cb8be Add paint debug window 2016-07-26 10:55:47 +02:00
Michał Janiszewski
583372e082 Fix #4136: Can't exit game
Caused by badly placed check prevent exiting the game.
2016-07-19 20:53:03 +01:00
Ted John
0c180b8171 Merge pull request #4133 from janisozaur/fixes 2016-07-19 18:38:41 +01:00
Ted John
487fcc3c5b Fix #4134: Can't enable park-wide photo price for log flume and river ra
Caused by not shifting the shop item flags (those above 32) to the correct mask bit.
2016-07-19 18:35:44 +01:00
Michał Janiszewski
2900999944 Validate gSavePromptMode 2016-07-18 21:18:41 +02:00
Matte A
f6c8993da6 Fix #4080: Track list doesn't update when a track design gets deleted
Show an error if it can't select a track design rather than silently failing. Updating the list would require a file watcher on the tracks directory, and this edge case isn't particularly important at the moment.
2016-07-18 18:10:16 +01:00
Michał Janiszewski
9f57c82653 Refactor access to g_sprite_list
Hide g_sprite_list behind accessor function with a check. `assert` is
temporarily disabled, as it breaks nearly every park.
2016-07-17 22:19:34 +02:00
Ted John
e9df7310db Add missing object type check for scenery ORIs 2016-07-16 17:57:58 +01:00
Ted John
304d6d9304 Fix #4110: guests still get charged for rides 2016-07-16 16:27:49 +01:00