1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 06:44:38 +01:00
Commit Graph

76 Commits

Author SHA1 Message Date
janisozaur
68bad6505c Add and correct licence headers to all sources (#3108) 2016-05-04 18:24:41 +01:00
Gymnasiast
b37d4804ce Integrate gErrorType and gErrorStringId, fixes 2016-05-03 07:25:19 +02:00
Gymnasiast
5d0b79227f Clean up some magic values and refactor a bit 2016-05-03 07:25:19 +02:00
Ted John
a6ca76813d rename import.h and remove includes 2016-04-22 20:14:29 +01:00
Ted John
25958b0d30 remove old RCT1 import code 2016-04-22 19:26:15 +01:00
Ted John
7754204a25 finish conversion of RCT1 import to c++ 2016-04-22 18:25:19 +01:00
Ted John
72e625c5a3 import research list as best as possible 2016-04-22 18:23:57 +01:00
Ted John
88a26f17b0 refactor colours, use constants 2016-04-22 18:23:57 +01:00
Ted John
17abf1d970 use localised strings for RCT1 scenarios 2016-04-22 18:23:55 +01:00
IntelOrca
3c347c2e10 fix rebase / compile error 2016-04-22 18:23:54 +01:00
Gymnasiast
41a84e899b Import with correct launch mode, better grey roof replacement 2016-04-22 18:23:53 +01:00
Gymnasiast
e7c7dcda61 Import banners correctly, use some constants 2016-04-22 18:23:52 +01:00
Gymnasiast
f3ec92a426 Initial support for importing SV4 and importing more park flags 2016-04-22 18:23:52 +01:00
Gymnasiast
705f264cf8 Import music, entrance style, some flags and park open status 2016-04-22 18:23:51 +01:00
Gymnasiast
e27e0611ae Fix vehicles in imported S4's not leaving the station 2016-04-22 18:23:50 +01:00
Gymnasiast
c72a4caa75 Fix number of trains and number of cars per train 2016-04-22 18:23:50 +01:00
Gymnasiast
15d077410e Fixed object selection and lift hill speeds 2016-04-22 18:23:49 +01:00
Gymnasiast
6ba69c52ca Use a define to specify the default vehicle should be used 2016-04-22 18:23:48 +01:00
Gymnasiast
caefc1d9cc Define RCT1 vehicles as constants and use a lookup table 2016-04-22 18:23:48 +01:00
Gymnasiast
74d0c2aed8 Fix import of alternative vehicles 2016-04-22 18:23:47 +01:00
duncanspumpkin
3b2fade400 Fix rebase issues 2016-04-22 18:23:46 +01:00
Gymnasiast
2d3dfd8834 Move RCT1 file version detection to its own function 2016-04-22 18:23:46 +01:00
Gymnasiast
a28ba1d4d8 Also take AA in account when importing merry-go-rounds and make version detection more robust 2016-04-22 18:23:45 +01:00
Gymnasiast
5ad1c224a6 Fix import of Merry-go-round colours 2016-04-22 18:23:44 +01:00
Gymnasiast
8169969756 Fix typo 2016-04-22 18:23:43 +01:00
IntelOrca
1873d659a9 RCT1 import: import vehicle colours, scenario descriptions and animations 2016-04-22 18:23:43 +01:00
IntelOrca
e319df533e rct1 import, fix peeps entering rides 2016-04-22 18:23:41 +01:00
IntelOrca
0e1f0cbbe8 improve RCT1 ride import 2016-04-22 18:23:41 +01:00
IntelOrca
a90a59c39c rct1 import: fix colouring 2016-04-22 18:23:40 +01:00
IntelOrca
f0382b9ab2 implement import of rct1 scenarios, part 1 2016-04-22 18:23:40 +01:00
Gymnasiast
62f26c52a6 Fix import of white and red wooden fences 2016-02-26 12:41:53 +01:00
Gymnasiast
49e2e8d46d Improve wall conversion 2016-02-26 12:27:55 +01:00
Michał Janiszewski
14bff0c66f Rename rct_ride_type to rct_ride_entry 2016-02-25 13:33:19 +01:00
duncanspumpkin
772502309f Label ride offsets 2016-02-18 20:58:22 +00:00
duncanspumpkin
f267af3356 Fix chairlift bullwheel rotation animation.
Issue caused by incorrect check for breakdown
2016-02-18 20:32:04 +00:00
Michał Janiszewski
6d6f9f3c23 Refactor rides to be only accessible with getters
This changes how rides are accessed from macros to getter functions.
2016-01-23 01:13:36 +01:00
Marijn van der Werf
98b5ad1bf4 Replace known addresses with constants 2016-01-15 21:01:34 +01:00
duncanspumpkin
268e2d34ce Merge branch 'develop' into vehicle-update
Conflicts:
 object.c
2016-01-09 16:51:23 +00:00
IntelOrca
40a4bd1fa8 remove old object_paint calls, replace with new 2016-01-07 19:01:19 +00:00
Michał Janiszewski
133096cd64 Merge branch 'develop' into vehicle-update 2016-01-05 09:59:53 +01:00
Hielke Morsink
f04c97fbc1 Getting path scenery type and index using helper functions throughout the entire project. 2016-01-01 21:28:53 +01:00
Hielke Morsink
6f0d14b65f Using ghost helper funcitons for getting and setting the bit now. 2016-01-01 21:28:52 +01:00
duncanspumpkin
c00669c942 Merge sub_6DAB4C into vehicle-update 2015-12-14 21:56:00 +00:00
Kyle Kirbatski
4f03530e48 Clean up instances of 0x.. & 0x.. to 0x.., 0x.. 2015-12-12 14:08:09 -06:00
IntelOrca
a66966a4d9 fix rating bugs and merge mistakes 2015-12-05 10:49:03 +00:00
Michał Janiszewski
a911ff09d0 Some more checks, make sure gVehicleHierarchies are counted properly 2015-11-02 22:58:15 +01:00
Alexander Overvoorde
01793e11b7 Replace RCT2_GLOBAL magic numbers with address identifiers and string ids 2015-10-29 09:44:46 +01:00
Michał Janiszewski
7d0ce00bab Strip all whitespace 2015-10-20 20:48:51 +02:00
Michał Janiszewski
d570163958 Fix types
Bunch of type fixes
2015-10-19 20:30:46 +02:00
duncanspumpkin
ee1e71f287 Fix loadlandscape breaking enabled tabs
Issue was caused by not calling sub_6DFED0 when loading the landscape. I assume in vanilla this would happen as part of the loading but due to the way loadsave now works it doesn't happen. In the process I also labelled the offset for editor step.
2015-10-15 22:16:27 +01:00