mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity
8,605 Commits 8 Branches 59 Tags
0a329fd53f61e4c2fba44ee60b73dea1075f9705
Commit Graph

8605 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ted John
0a329fd53f Merge pull request #4281 from marijnvdwerf/clean/data-13 
[Cleanup] Integrate more peep_update related data
 2016-08-14 13:11:44 +01:00
Marijn van der Werf
57ea87ed0b Integrate FlatTrackCoordinates 2016-08-14 13:10:44 +01:00
Marijn van der Werf
533696bb58 Integrate data at 0x00981F4C, 0x00981F4E 2016-08-14 11:39:12 +02:00
Marijn van der Werf
92403cf4a6 Integrate data at 0x00981F2C, 0x00981F2E 2016-08-14 11:39:12 +02:00
Marijn van der Werf
9127a67229 Integrate data for peep_update_ride_sub_state_15 
0x00981F0C, 0x00981F0E, 0x00981F1C, 0x00981F1E
 2016-08-14 11:39:11 +02:00
Marijn van der Werf
ad29a7006b Integrate data at 0x00981D7C, 0x00981D7E 2016-08-14 11:39:11 +02:00
Michael Steenbeek
7f71bece5c Clean up some residual usage of non-integrated versions of already integrated variables 2016-08-13 10:52:42 +01:00
YJSoft
4117e9a9e5 fix #4251 Banner font is black when using ttf font (#4272) 2016-08-13 10:29:04 +02:00
wolfreak99
eec0a0cb18 Invalidate Map Generator button when resizing map window (#4271) 2016-08-13 10:06:47 +02:00
LRFLEW
dd63caf5aa Disable NTFS Timestamps on Windows zip distributions 2016-08-13 00:18:26 +01:00
Ted John
572999e8e3 Merge pull request #4269 from marijnvdwerf/clean/data-11 
Integrate various data
 2016-08-12 23:38:09 +01:00
Ted John
6b57474945 Merge pull request #4268 from marijnvdwerf/clean/data-10 
Integrate various peep data
 2016-08-12 23:37:48 +01:00
Marijn van der Werf
32f6f36d1d Integrate data at 0x00982134 2016-08-12 22:44:41 +02:00
Marijn van der Werf
c60fd16617 Integrate data at 0x00982004 2016-08-12 22:44:41 +02:00
Marijn van der Werf
afde0df6f6 Integrate data at 0x009822F4, 0x00982310 2016-08-12 22:44:41 +02:00
Marijn van der Werf
da4307a6c6 Integrate nausea tolerances 2016-08-12 22:44:41 +02:00
Marijn van der Werf
af629d7867 Integrate discard containers 2016-08-12 22:44:40 +02:00
Marijn van der Werf
7c737e8538 Integrate crowded thoughts 2016-08-12 22:44:40 +02:00
Marijn van der Werf
5690b95ff0 Integrate peep clothing colours 2016-08-12 22:44:40 +02:00
Marijn van der Werf
38b5bba668 Integrate TrackSequenceElementAllowedWallEdges 2016-08-12 21:39:49 +01:00
Marijn van der Werf
76b470ac26 Integrate data at 0x0098D7E0 2016-08-12 22:37:05 +02:00
Marijn van der Werf
a5601b6558 Include data at 0x0098D7EC 2016-08-12 22:36:59 +02:00
Marijn van der Werf
f3bc1f13bc Integrate 0x0098D7F0 2016-08-12 22:36:53 +02:00
Marijn van der Werf
ace68bb491 Use byte_98D800 2016-08-12 22:36:47 +02:00
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
122139e1e8 Merge pull request #4263 from marijnvdwerf/clean/data-edgeslopes 
Include edge styles
 2016-08-12 20:53:07 +01: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
Marijn van der Werf
34e046df41 Include TrackHeightMarkerPositions 2016-08-12 20:22:25 +01:00
LRFLEW
aa962b2cc8 Fix Warning in Xcode (#4241) 2016-08-12 09:34:05 +02:00
OpenRCT2 git bot
85210322ae Merge Localisation/master into OpenRCT2/develop. 2016-08-12 04:00:24 +00:00
Marijn van der Werf
ef8d43328a Name WallSceneryFlag 2016-08-11 18:29:44 +02:00
Marijn van der Werf
be1e832873 Include edgeslopes 2016-08-11 18:18:29 +02:00
OpenRCT2 git bot
bb07785e96 Merge Localisation/master into OpenRCT2/develop. 2016-08-10 04:00:26 +00: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
bdf174d4a2 Use sprite constants for weather 2016-08-09 23:43:47 +02:00
Yaroslav Tretyakov
4066009778 Fix #4253: Crash in vehicle_update_motion_collision_detection 2016-08-09 08:35:16 +01:00
OpenRCT2 git bot
a7454d6d88 Merge Localisation/master into OpenRCT2/develop. 2016-08-09 04:00:19 +00:00
Michał Janiszewski
645bb44eb4 Minor fixes to 64 bit builds 2016-08-08 23:06:10 +01:00
Ted John
53ec220bf9 Merge pull request #4244 from janisozaur/osx-test-64 
64 bit support for OS X, Windows
 2016-08-08 11:51:30 +01:00
Michał Janiszewski
796f496677 Remove leftover debug code from openrct2.c 2016-08-08 10:22:46 +02:00
Yaroslav Tretyakov
c967114463 Fix #4215: Multiplayer, default group does not work correctly with group IDs 2016-08-08 09:01:52 +01:00
Michał Janiszewski
af91148051 Cast pointer to segment to satisfy mingw 2016-08-08 07:30:34 +02:00
Ted John
94397784bb Let x64 Windows builds use mmap configuration 2016-08-08 07:25:23 +02:00
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