mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 16:24:35 +01:00
Code Issues Releases Wiki Activity
8,581 Commits 8 Branches 59 Tags
71c1f13ffad7789f32a7f490afac1e1f0f0fc048
Commit Graph

1683 Commits

Author SHA1 Message Date
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
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
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
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
897fc0591b Integrate track pricing 2016-08-07 14:31:08 +02:00
Marijn van der Werf
ec4cf80623 Use RideData4 2016-08-07 13:01:20 +01:00
Marijn van der Werf
a81b7c4892 Use WALL_SCENERY flags 2016-08-07 12:57:22 +02:00
Marijn van der Werf
198ebd0cb1 Use constants for colours 2016-08-07 12:57:12 +02:00
Marijn van der Werf
207f552203 Use contants for _currentTrackCurve 2016-08-07 12:57:07 +02: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
Ted John
1abc4a1915 Integrate and clean up rest of guest list window vars 2016-08-06 01:52:03 +01:00
Marijn van der Werf
dd2178c7cf Include AlternativeTrackTypes 2016-08-06 01:09:28 +01:00
Marijn van der Werf
b777a36722 Remove maze people limit override 2016-08-06 01:04:37 +02:00
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