Commit graph

6482 commits

Author SHA1 Message Date
IntelOrca
e57f27e1a1 improve group renaming 2016-02-29 22:34:37 +00:00
IntelOrca
4769e89b07 fix #3053: Long multiplayer group names overflow the dropdown 2016-02-29 22:34:36 +00:00
duncanspumpkin
957d5a9735 Fix #2324. Inventions list changes no longer break scenery window.
Issue was caused by the invention list flags being passed into the finish research function and interpreting always researched scenery sets as rides. This could also cause crashes if there were more scenery sets than rides researched.
2016-02-29 22:02:03 +00:00
Ted John
2272d965d8 Update ISSUE_TEMPLATE.md 2016-02-29 21:54:04 +00:00
IntelOrca
a634aacfab show information about locked scenarios, closes #2660 2016-02-29 21:28:01 +00:00
duncanspumpkin
e2073d22c4 Fix #3002. Fix ride construction on water breaking with shift.
Issue caused by a mistake during refactoring.
2016-02-29 20:53:22 +00:00
IntelOrca
1d99c233f6 fix #3008: construct ride that isn't placed yet causes side effects 2016-02-29 20:24:00 +00:00
duncanspumpkin
8749c1e98c Fix #3050. Assert changed to allow for valid index. 2016-02-29 20:04:33 +00:00
duncanspumpkin
70f38aa68f Fix support drawing issue 2016-02-29 19:54:05 +00:00
IntelOrca
4d6cce3cae play a sound when a screenshot is taken instead of an error message 2016-02-29 18:24:28 +00:00
duncanspumpkin
24df65af9d Label current paint tile max height 2016-02-29 18:04:48 +00:00
Duncan
433caa2f84 Merge pull request #3036 from marijnvdwerf/finish-6CA2DF
Remove asserts and original call from sub_6CA2DF
2016-02-29 17:16:09 +00:00
Ted John
36f7328b43 Merge pull request #3047 from OpenRCT2/Gymnasiast-uk-typo
UK: Typo
2016-02-29 10:39:00 +00:00
Michael Steenbeek
ad37bd0496 UK: Typo 2016-02-29 11:11:51 +01:00
Ted John
3dcc962ef9 Merge pull request #3043 from janisozaur/develop
Only enable assert() in drawing code when explicitly debugging
2016-02-28 20:50:51 +00:00
Michał Janiszewski
c4cf41de45 Only enable assert() in drawing code when explicitly debugging 2016-02-28 21:42:08 +01:00
Ted John
ab47aced0e Merge pull request #3041 from Gymnasiast/colour
Consistently use 'colour' rather than 'color'
2016-02-28 19:53:43 +00:00
Gymnasiast
ddf3d7a03d Consistently use 'colour' rather than 'color' 2016-02-28 20:32:02 +01:00
Ted John
d778bc7b73 Merge pull request #3039 from Overv/fix-vehicle-type-preset-bug
Fix presets from old vehicle type being used for new vehicle type (fixes #3014)
2016-02-28 18:12:54 +00:00
Alexander Overvoorde
1d81105f3b Fix presets from old vehicle type being used for new vehicle type (fixes #3014) 2016-02-28 18:21:04 +01:00
Ted John
017d7f41f5 Merge pull request #3035 from Gymnasiast/burn-more-flags
Remove magic crash protection for Six Flags rides
2016-02-28 11:30:08 +00:00
Gymnasiast
939fa24647 Remove magic crash protection for Six Flags rides 2016-02-28 11:59:43 +01:00
duncanspumpkin
d7459d07f8 Fix jerky vehicles on station platforms. Fixes #3011.
Issue caused by a mistake in implementing the function
2016-02-28 10:52:53 +00:00
IntelOrca
5ee023c86e reinstate string id: 5664 2016-02-28 10:37:44 +00:00
IntelOrca
90665c7185 always show number of fatalities news item, no six flags bias 2016-02-28 10:28:09 +00:00
Duncan
3f1738bd90 Merge pull request #3027 from Gymnasiast/fix-empty-boats
Don't make empty boats leave the platform on closed boat rides with passengers still on it, fixes #2728
2016-02-28 10:21:23 +00:00
Marijn van der Werf
3311e4f3e8 Remove asserts and original call from sub_6CA2DF 2016-02-28 09:04:41 +01:00
OpenRCT2 git bot
9e732095ec Merge Localisation/master into OpenRCT2/develop. 2016-02-28 04:00:13 +00:00
Ted John
0f2177e330 Merge pull request #3033 from Gymnasiast/name-and-remove-park-flags-8
Name PARK_FLAGS_8 and stop checking it
2016-02-27 20:43:57 +00:00
Gymnasiast
55a2b25f0f Name PARK_FLAGS_8 and stop checking it 2016-02-27 20:55:49 +01:00
Ted John
e52c95ca7a Merge pull request #3021 from X123M3-256/develop
Automatically fix unexportable objects so they can be exported normally
2016-02-27 13:45:02 +00:00
IntelOrca
22a194ffa6 clamp ride overview viewport zoom level to allowed range 2016-02-27 13:30:00 +00:00
IntelOrca
d27c9c0ec4 fix #3026: can construct maze when its open 2016-02-27 13:14:26 +00:00
X7123M3-256
9589a98d40 Added even more spaces 2016-02-27 13:13:15 +00:00
IntelOrca
db3c69c237 fix #3025: Wrong localisation of server messages 2016-02-27 13:12:04 +00:00
X7123M3-256
93ed052e20 Added more spaces and removed duplicate semicolon 2016-02-27 12:50:03 +00:00
Gymnasiast
0b87cd766c Don't make empty boats leave the platform on closed boat rides with passengers still on it, fixes #2728 2016-02-27 13:36:14 +01:00
X7123M3-256
cacedda7e4 Added spaces around operators 2016-02-27 12:10:53 +00:00
Ted John
b19d752b36 Merge pull request #3024 from zsilencer/bugfixes
Bugfixes
2016-02-27 11:32:47 +00:00
zsilencer
9b3d36eb95 Fix #2988: utf8 strings not working in multiplayer 2016-02-26 23:00:58 -07:00
zsilencer
6eb580f508 fix ride music related source of desync 2016-02-26 22:15:30 -07:00
OpenRCT2 git bot
af72a537af Merge Localisation/master into OpenRCT2/develop. 2016-02-27 04:00:19 +00:00
IntelOrca
c7c1f862cc fix #2878: Shops and stalls doesn't open on the server with auto open
Use the set status game command instead of setting the status of the ride directly. In order to stop stack overflow, closing the ride construction window is now done in the update event for that window.
2016-02-27 01:20:21 +00:00
X7123M3-256
08a0cc9272 Fix indentation 2016-02-26 22:56:24 +00:00
X7123M3-256
ba4681d624 Remove degug printfs 2016-02-26 22:41:55 +00:00
Ted John
d769806f17 Merge pull request #3020 from janisozaur/fixes
Don't crash if mapElement is null
2016-02-26 22:20:28 +00:00
X7123M3-256
0036575413 Fix memory leak in the checksum fixing code 2016-02-26 22:06:30 +00:00
Michał Janiszewski
4a24aa6cf3 Don't crash if mapElement is null
This allows for loading parks such as "Cocopa Bay"
2016-02-26 23:05:01 +01:00
X7123M3-256
7828d3d641 Automatically fix unexportable objects so they can be exported normally 2016-02-26 21:40:19 +00:00
Ted John
e4c20902ba Merge pull request #3019 from janisozaur/fixes
Minor fixes
2016-02-26 21:34:01 +00:00