mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
6,947 Commits 8 Branches 40 Tags 376 MiB
Commit Graph

6947 Commits

Author SHA1 Message Date
Ted John 6086771988 extract code to new method 2016-04-22 18:25:28 +01:00
Ted John fb192bba0e prevent adding duplicate footpath entries 2016-04-22 18:25:28 +01:00
Ted John 228af15a30 add path object import 2016-04-22 18:25:27 +01:00
Ted John b888466fa1 fix loading of AA/LL scenarios 2016-04-22 18:25:26 +01:00
Ted John 486c10a9f1 add RCT1 path type enums 2016-04-22 18:25:26 +01:00
Ted John 26ce06a1c7 only import required path additions 2016-04-22 18:25:25 +01:00
Ted John 9d44aaa8a8 fix broken path additions import 2016-04-22 18:25:24 +01:00
Ted John c6615b942e fix fences type mapping 2016-04-22 18:25:23 +01:00
Ted John b93429052c fix more import bugs 2016-04-22 18:25:23 +01:00
Ted John 7401b5cf39 import default objects and themes 2016-04-22 18:25:22 +01:00
Ted John 92973c692d import more flags and finance correctly 2016-04-22 18:25:21 +01:00
Ted John ba90d2a55a fix RCT1 vehicle object table 2016-04-22 18:25:21 +01:00
Ted John 512ed6ce98 fix compile issues and bugs 2016-04-22 18:25:20 +01:00
Ted John 7754204a25 finish conversion of RCT1 import to c++ 2016-04-22 18:25:19 +01:00
Ted John cf7b81fd3a start moving RCT1 importer to C++ 2016-04-22 18:24:54 +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 2f0455b225 revert openrct2.vcxproj.user 2016-04-22 18:23:56 +01:00
Ted John 17abf1d970 use localised strings for RCT1 scenarios 2016-04-22 18:23:55 +01:00
Gymnasiast 086ba6909f Fix Junior RC import, use constants 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 3e9d56a284 RCT1 import: fix for Junior Roller Coaster 2016-04-22 18:23:42 +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
Duncan b2566a7223 Merge pull request #3387 from marijnvdwerf/paint-setup/drawing-function-signature 
Update drawing function signature
 2016-04-22 16:56:48 +01:00
Marijn van der Werf 7728a96e96 Update signature 2016-04-22 14:05:51 +02:00
janisozaur 7d2e62ba56 Fix typo introduced in 288d11a, fixes #3376 (#3379) 
See https://sourceforge.net/p/predef/wiki/Architectures/

This reverts commit 67a86fe22f.
 2016-04-22 07:59:50 +01:00
OpenRCT2 git bot 9561e76c39 Merge Localisation/master into OpenRCT2/develop. 2016-04-22 04:00:17 +00:00
Ted John 67a86fe22f fix #3376: define PLATFORM_X86 so that CALLPROC is used again 2016-04-22 00:26:39 +01:00
Ted John 2329972b58 Merge pull request #3371 from Broxzier/no_money_checks 
Check the no money flag in more places in case the price field is not free.
 2016-04-22 00:00:40 +01:00
Ted John 571907eabb Merge pull request #3374 from IntelOrca/feature/file-associations 
Register file associations on Windows
 2016-04-21 23:55:14 +01:00
Ted John 57301def05 disable register-shell for mingw 2016-04-21 23:48:58 +01:00