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

6976 Commits

Author SHA1 Message Date
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
Ted John 3f1e49d510 use unicode for registering file associations 2016-04-21 23:03:25 +01:00
Ted John 6173eda7bb Merge pull request #3373 from janisozaur/platform 
Prepare code compiling for x86-64 port.
 2016-04-21 22:10:06 +01:00
Ted John c51f9a8ecc register file associations on Windows 2016-04-21 21:41:53 +01:00
Michał Janiszewski b7f9af41a8 Only initialize structs with compile-time consts 
See https://stackoverflow.com/a/32584666
 2016-04-21 22:20:24 +02:00
Michał Janiszewski 288d11a196 Add platform define for x86 2016-04-21 22:18:59 +02:00
Ted John b499a4589f embed OpenRCT2 icon for Windows (#3372) 
Embeds the OpenRCT2 icon file using Win32 native resources and sets the window icon to it.
 2016-04-21 19:17:26 +01:00
Hielke Morsink 87953f34db Checking for no_money flag when checking ride price 2016-04-21 19:21:09 +02:00
Hielke Morsink 09688b427e Fix #3238 - Guest refusing to pay that much in no money scenarios 2016-04-21 19:09:41 +02:00
duncanspumpkin d7cd3d0662 Fix #3345. Put banners back in their bounding box. 2016-04-21 17:19:16 +01:00
Duncan e5505b70c3 Merge pull request #3364 from Wirlie/develop 
Fix #3318. Mine/Mouse train now can swing on turns.
 2016-04-21 12:48:13 +01:00
OpenRCT2 git bot f6bfbb0186 Merge Localisation/master into OpenRCT2/develop. 2016-04-21 04:00:15 +00:00
Wirlie 407359e82b Fix #3318. Mine/Mouse train now can swing on turns. 2016-04-20 22:32:36 -05:00
janisozaur 7eb3a90cea Fixes for values being shifted (#3362) 2016-04-20 23:57:54 +01:00
Ted John 60ac228c51 Merge pull request #3277 from IntelOrca/refactor-twitch 
Refactor and clean up twitch.cpp
 2016-04-20 22:12:57 +01:00
Ted John 4e53fc4c40 Merge pull request #3359 from Gymnasiast/runemute 
Add shortcut to mute sound
 2016-04-20 22:02:04 +01:00
LRFLEW e71a918f65 Remanaged Xcode Project (#6) 
Fixes OS X compilation error
 2016-04-20 22:00:50 +01:00
Gymnasiast 548bee8325 Fix formatting and rebase 2016-04-20 20:14:07 +02:00
Ted John ce06346c8d update contributors.md 
[ci skip]
 2016-04-20 19:03:57 +01:00
Rune Laenen e0c103031e Add shortcut to mute sound 2016-04-20 19:56:57 +02:00
IntelOrca f10d79c63c refactor and clean up twitch.cpp 2016-04-20 18:11:07 +01:00
IntelOrca 770a37dd10 update VS filters 2016-04-20 18:11:07 +01:00