mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity
8,714 Commits 8 Branches 58 Tags
a60643e3ca8976d56df0f42e26255e704c361f6c
Commit Graph

8714 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marijn van der Werf
b707053fce Add defines for colour groups 2016-08-07 20:13:46 +02:00
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
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
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
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