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

7233 Commits

Author SHA1 Message Date
OpenRCT2 git bot a8aff1679e Merge Localisation/master into OpenRCT2/develop. 2016-05-04 04:00:18 +00:00
Michael Steenbeek 142c54852d Clean up some residual usages of old config (#3484) 2016-05-03 22:36:29 +01:00
Patrick de Wit 13701660c9 Implement customizable toggle windowed mode shortcut (#3462) 
Implement customizable toggle windowed mode shortcut
 2016-05-03 20:07:33 +01:00
Ted John 2aa73dcbe2 Merge pull request #3439 from marcovmun/VS-build-fix 2016-05-03 18:50:43 +01:00
Ted John df781b3384 create symlinks only for data sub-directories 2016-05-03 18:49:14 +01:00
Marco van Munster 8bd9a772e6 Fix tabs and formatting 2016-05-03 17:54:19 +01:00
marcovmun 08b3e803bf Check if you can create a symlink first 2016-05-03 17:54:18 +01:00
Marco van Munster dcbbf2ec78 Symlink data to bin\data 2016-05-03 17:54:12 +01:00
Patrick de Wit 60579932ef Fix overflow in ride_mode_tweak (#3478) 
Fixes #2529: Time overflow when unlocking dodgems' operating limits
Fixes #3424: Max. people on ride overflows when operating limit is unlocked
 2016-05-03 14:44:54 +01:00
Duncan 83aa549a9f Merge pull request #3482 from marijnvdwerf/fix/3481 
Fix #3481: Enable smoothing terrain transitions
 2016-05-03 14:04:25 +01:00
Marijn van der Werf dc920475bc Fix #3481: Enable smoothing terrain transitions 2016-05-03 14:51:07 +02:00
Michael Steenbeek 98bff6997e Update changelog.txt 2016-05-03 10:30:33 +02:00
Michael Steenbeek 94f688480b Update changelog.txt 2016-05-03 10:27:06 +02:00
Matte A 45234d1afb Add description for Disable train length limit and align the button (#3480) 2016-05-03 10:16:38 +02:00
Ted John 44c7aff148 Merge pull request #3474 from Gymnasiast/housekeeping 
Clean up some magic values and refactor a bit
 2016-05-03 08:06:23 +01:00
Gymnasiast 6c7f685b08 More occurrences of shop_item 2016-05-03 07:26:29 +02: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
OpenRCT2 git bot 2854973c09 Merge Localisation/master into OpenRCT2/develop. 2016-05-03 04:00:19 +00:00
Ted John af6a4da58b Merge pull request #3475 from janisozaur/car-length 
When enabled, this cheat allows users to set any train length between 1 and 64, regardless of station length or the normal maximum and minimum length of the train. It also increases the supported maximum length of trains from 16 to 64. It should be noted that rides with trains longer than 16 will not be backward compatible.

It is known not to work on tower rides or on the reverse freefall coaster - I'm not exactly sure why, but it doesn't seem too much of an issue for now. Also, if there is not room behind the station for the extra cars (either because it's a shuttle coaster or because there's a track merge), then they all just layer on top of one another. I'm not sure what can be done about it - ideally you'd limit the trains to what will fit, but that means traversing the track to determine how much room there is, which seems excessively complex.

Closes pull request #3192
 2016-05-02 22:11:32 +01:00
Michał Janiszewski 1cd1144dd5 Janitorial fixes 
Mostly style fixes, includes minor change to make sure spinner's down
button gets shown, update to string IDs, network version and making sure
correct string gets selected based on car count.
 2016-05-02 22:35:08 +02:00
X7123M3-256 d191e6a8c3 Fix indentation (again) 2016-05-02 21:42:17 +02:00
X7123M3-256 a34c3b8e19 Fix indentation (again) 2016-05-02 21:42:16 +02:00
X7123M3-256 80f83f9aec Fix indentation (again) 2016-05-02 21:42:16 +02:00
X7123M3-256 9c7de18292 Fix indentation 2016-05-02 21:42:16 +02:00
X7123M3-256 4089538c78 Fix inconsistent spacing 2016-05-02 21:42:14 +02:00
X7123M3-256 0efd6ca88b Remove unused local variables 2016-05-02 21:37:10 +02:00
X7123M3-256 c8144c5964 Remove constant that is no longer needed 2016-05-02 21:37:09 +02:00
X7123M3-256 102521d131 Replace dropdowns with spinners 2016-05-02 21:37:09 +02:00
X7123M3-256 ef82bbbab1 Send cheat status over network 2016-05-02 21:37:09 +02:00
X7123M3-256 3a4139eea0 Prevent car count being incorrectly updated 2016-05-02 21:37:09 +02:00
X7123M3-256 7f9b35a04e Prevent vehicle_colours from being accessed out of bounds (the last element will be used instead) 2016-05-02 21:37:09 +02:00
X7123M3-256 fd5bb09271 Remove calls to ride_entry_get_train_layout and replace with calls to ride_entry_get_vehicle_at_position 2016-05-02 21:37:08 +02:00
X7123M3-256 34a67436cd Fix spacing around operator 2016-05-02 21:37:08 +02:00
X7123M3-256 652ab949b0 Define constant for the maximum number of cars in a train 2016-05-02 21:37:08 +02:00
X7123M3-256 9d618231fb Add disable train length limits checkbox to cheat window 2016-05-02 21:37:08 +02:00
X7123M3-256 35ccd0b8e1 Implement disable train length limits cheat 2016-05-02 21:37:08 +02:00
X7123M3-256 8f6089818f Added "Disable train length limits" string 2016-05-02 21:37:05 +02:00
X7123M3-256 77894e4250 Added disable train length limits cheat 2016-05-02 21:35:26 +02:00
Duncan 2845dc293a Merge pull request #3471 from marijnvdwerf/paint-setup/peep 
Peep paint setup
 2016-05-02 12:48:08 +01:00
Marijn van der Werf 3350f34820 Decompile viewport_peep_paint_setup 2016-05-02 13:42:33 +02:00
OpenRCT2 git bot 4c9cc4f9f8 Merge Localisation/master into OpenRCT2/develop. 2016-05-02 04:00:18 +00:00
Duncan e345d24695 Merge pull request #3366 from marijnvdwerf/paint-setup/ride-50-52-53-54 
Paint setup: ride 50 52 53 54
 2016-05-01 20:26:11 +01:00
Duncan 34c6f5ab40 Merge pull request #3435 from zsilencer/paint-setup/virginia-reel 
Virginia reel paint setup
 2016-05-01 20:18:29 +01:00
Duncan c1b11743a0 Merge pull request #3358 from marijnvdwerf/paint-setup/surface-paint 
Paint setup/surface paint
 2016-05-01 19:29:40 +01:00
Marijn van der Werf 7c7d868844 Fix water selection 2016-05-01 20:10:13 +02:00
Marijn van der Werf eaa9aa7527 Make requested changes 2016-05-01 19:53:10 +02:00
spacek531 8e72cb140e Add github username to contributors list (#3457) 2016-05-01 12:18:06 +02:00
Patrick de Wit 7656cfdcbe Add rides amount to ride_list window. (#3461) 2016-04-30 17:12:12 +01:00
Marijn van der Werf ec80cbe6c8 Draw water bottom 2016-04-30 13:46:04 +02:00