mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
12,835 Commits 7 Branches 39 Tags 356 MiB
Commit Graph

12835 Commits

Author SHA1 Message Date
Marijn van der Werf 162eea0924 [fixup] Cast pointer 2017-09-24 22:41:49 +02:00
Marijn van der Werf 9ae887bf97 Update Xcode project 2017-09-24 22:41:49 +02:00
Marijn van der Werf 7ede9a3f58 Add extra casts 2017-09-24 22:41:49 +02:00
Marijn van der Werf 9d93d28efb Change method argument type 2017-09-24 22:41:49 +02:00
Marijn van der Werf 257c9d60d5 Fix imports 2017-09-24 22:41:49 +02:00
Marijn van der Werf b7164c5eac Rename intent extra keys 2017-09-24 22:41:49 +02:00
Marijn van der Werf 619733ba05 Move track design windows 2017-09-24 22:41:49 +02:00
Marijn van der Werf d18e59ff17 Move loadsave dialog 2017-09-24 22:41:49 +02:00
Marijn van der Werf 9b1b2b5c62 WIP window moving 2017-09-24 22:41:49 +02:00
Marijn van der Werf 59e1a8ac25 Trying to use intents 2017-09-24 22:41:49 +02:00
Marijn van der Werf 700a82e200 Make more data and functions static 2017-09-24 22:41:49 +02:00
Marijn van der Werf ac910a5979 Move Error, Campaign and Ride Demolition windows 2017-09-24 22:41:49 +02:00
Marijn van der Werf a49a777047 Move Banner, Player and Sign windows 2017-09-24 22:41:49 +02:00
Marijn van der Werf 8503b8e204 Move Finances and Park windows 2017-09-24 22:41:49 +02:00
OpenRCT2 git bot f5cc789978 Merge Localisation/master into OpenRCT2/develop. 2017-09-24 04:00:24 +00:00
OpenRCT2 git bot e1568aab21 Merge Localisation/master into OpenRCT2/develop. 2017-09-23 04:00:26 +00:00
Michał Janiszewski cbeeea2a49
Remove workaround for mingw 
We have udapted MinGW-64 in use, so the workaround should not be needed
anymore
 2017-09-22 23:26:02 +02:00
Michael Steenbeek 1fd1d8c26b Move editor to C++; add defines for object limits 2017-09-22 07:56:24 +02:00
OpenRCT2 git bot 08eef61eb4 Merge Localisation/master into OpenRCT2/develop. 2017-09-22 04:00:21 +00:00
Michael Steenbeek 5c2870c0e0 Name RCT2_LANGUAGE_ID_8 (Japanese) 2017-09-21 10:34:31 +02:00
Michael Steenbeek c8d6cf12e3 Add experimental Arabic language support 2017-09-21 09:24:06 +02:00
OpenRCT2 git bot 3818ee5577 Merge Localisation/master into OpenRCT2/develop. 2017-09-21 04:00:25 +00:00
Michael Steenbeek fa5ec031f1 Clean up ride naming 2017-09-20 21:19:55 +02:00
OpenRCT2 git bot a24f2fba6a Merge Localisation/master into OpenRCT2/develop. 2017-09-20 04:00:24 +00:00
Michał Janiszewski 00fd18809c Move extern "C" {} blocks to headers (#6282) 2017-09-18 17:05:28 +02:00
Michał Janiszewski 7671b9fcde Add ninja to dockerfiles 2017-09-17 22:16:27 +02:00
Michael Steenbeek 6ab0f2f905 Name some rct_ride_entry_vehicle properties 2017-09-15 18:25:28 +02:00
OpenRCT2 git bot a774ae8bd7 Merge Localisation/master into OpenRCT2/develop. 2017-09-15 04:00:21 +00:00
Michael Steenbeek c4a89e4192 Merge pull request #6269 from Gymnasiast/small-cleanup 
Slightly refactor loading of vehicle entries
 2017-09-14 15:17:04 +02:00
Michael Steenbeek a4802983c2 Make var_02/_03 calculation methods private and static 2017-09-14 14:30:09 +02:00
Michael Steenbeek 4164d3aedd Clarify comment 
[ci skip]
 2017-09-14 14:12:13 +02:00
Michael Steenbeek 8954303d99 Add comment about special_frames 
[ci skip]
 2017-09-14 14:10:35 +02:00
Michael Steenbeek 9cba5436e5 Split off frame calculations; don't set var_02 and _03 2017-09-14 14:07:55 +02:00
Michael Steenbeek 98e15f1cd9 Rewrite confusing if statement 2017-09-14 13:48:14 +02:00
Michael Steenbeek d551108f12 en-GB: Fix typo 2017-09-14 13:34:54 +02:00
OpenRCT2 git bot 185ae6ff07 Merge Localisation/master into OpenRCT2/develop. 2017-09-14 04:00:26 +00:00
Michael Steenbeek 735b96ac18 Bump network version for the 'Enable all drawable elements' cheat 2017-09-13 22:51:01 +02:00
Michael Steenbeek 453fb4611c Update changelog.txt 2017-09-13 22:00:10 +02:00
Michael Steenbeek d4cc97165c Clean up brake speed in ride construction window, fix #6271 2017-09-13 21:57:36 +02:00
Ted John 8677793624 Fix #6267: Ride count is 255 for clients that join a server 
For S6 export and import, unused ride slots were not set to RIDE_TYPE_NULL.
 2017-09-13 20:04:55 +01:00
Michael Steenbeek 597d40b25b Add cheat to show all drawable track elements 2017-09-13 19:38:30 +02:00
Michael Steenbeek 671a7bcbe1 Improve and extend constant usage 2017-09-13 18:13:38 +02:00
Michael Steenbeek 8c33240c38 Slightly refactor loading of vehicle entries 2017-09-13 10:45:28 +02:00
OpenRCT2 git bot c6e162e31c Merge Localisation/master into OpenRCT2/develop. 2017-09-13 04:00:20 +00:00
Marijn van der Werf dfbce1ad4c Fix Cmake compilation on macOS 10.12.6 2017-09-12 21:19:56 +02:00
Ted John 3a9cafd2f0 Remove gTrackColours macro (#6266) 2017-09-12 19:48:18 +01:00
Michael Steenbeek 23265ae8c1 Merge pull request #6265 from Gymnasiast/split-rides 
Split Ride and rct2_ride
 2017-09-12 18:28:48 +02:00
Gymnasiast f174530ace Add comment to the Ride struct about Testpaint 
[ci skip]
 2017-09-12 14:03:46 +02:00
Gymnasiast 3a65ef79a7 Use field-wise assignments for rides in S6Exporter 
Also fixes some limit constant usage
 2017-09-12 14:00:56 +02:00
Gymnasiast 654ee4c95e Add missing pragma pack(pop) 2017-09-12 11:42:47 +02:00