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
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
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
Ted John
e4c20902ba
Merge pull request #3019 from janisozaur/fixes
...
Minor fixes
2016-02-26 21:34:01 +00:00
Michał Janiszewski
aa8437cb9d
Minor fixes
2016-02-26 20:49:01 +01:00
Ted John
10d25d9259
Merge pull request #3017 from OpenRCT2/Gymnasiast-changelog
...
Update changelog.txt
2016-02-26 18:00:11 +00:00
Michael Steenbeek
3738943c40
Update changelog.txt
2016-02-26 16:55:00 +01:00
Ted John
f2b96ca4a6
Merge pull request #3018 from Gymnasiast/fix-8cars-invisibility
...
Support 8 cars MOM properly while keeping our own corrupted element, fixes #2706
2016-02-26 15:30:20 +00:00
Gymnasiast
4f4111dedb
Support 8 cars MOM properly while keeping our own corrupted element
2016-02-26 15:46:14 +01:00
Michael Steenbeek
15fcad3990
Update changelog.txt
2016-02-26 15:14:45 +01:00
Ted John
a6810eaed0
Merge pull request #3015 from Gymnasiast/fix-wall-import
...
Improve wall conversion
2016-02-26 13:28:14 +00:00
Ted John
9a9442ad01
Merge pull request #3016 from janisozaur/fixes
...
Fixes
2016-02-26 13:27:22 +00:00
Ted John
ddd9d5647a
Merge pull request #3013 from janisozaur/how-to-chat
...
Display message with chat shortcut keys upon connection
2016-02-26 13:25:37 +00:00
Michał Janiszewski
6b514d1e3a
Fix possible issues highlighted at higher warn levels
...
Mostly possibly uninitialized values and signedness
2016-02-26 12:54:00 +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
c0caf2d222
Minor fixes
2016-02-26 11:40:07 +01:00
Michał Janiszewski
e232358608
Display message with chat shortcut keys upon connection
...
Works for server as well.
2016-02-26 10:26:30 +01:00
OpenRCT2 git bot
adde88ca92
Merge Localisation/master into OpenRCT2/develop.
2016-02-26 04:00:23 +00:00
Ted John
ecb4dd2a09
Merge pull request #3007 from Overv/implement-2123
...
Hide the entrance/exit construction buttons if there is no station (resolves #2123 )
2016-02-25 20:50:33 +00:00
Alexander Overvoorde
f0c47ba292
Hide the entrance/exit construction buttons if there is no station ( resolves #2123 )
2016-02-25 21:30:46 +01:00
Ted John
4a84a33515
Merge pull request #3006 from Overv/fix-train-length
...
Fix vehicle length not being clamped when vehicle type is changed (fixes #2142 )
2016-02-25 20:25:20 +00:00
IntelOrca
1dde20a8f5
remove unused string ID
2016-02-25 20:21:22 +00:00
Alexander Overvoorde
58a19b7507
Fix vehicle length not being clamped when vehicle type is changed ( fixes #2142 )
2016-02-25 20:50:54 +01:00
IntelOrca
a227fc33c0
update changelog
2016-02-25 19:48:10 +00:00
Ted John
6ec2e1724c
Merge pull request #2943 from Overv/fix-ride-viewport-z
...
Fix overall view position using z coordinate of arbitrary element in same column (fixes #2636 )
2016-02-25 18:44:59 +00:00
Duncan
5f2e158a55
Merge pull request #3004 from janisozaur/new-compilers
...
Fixes for upcoming GCC6 & Clang 3.8
2016-02-25 18:37:27 +00:00
Michał Janiszewski
fc2bba3047
Fixes for upcoming GCC6 & Clang 3.8
2016-02-25 19:35:18 +01:00
Alexander Overvoorde
6311b5588d
Fix ride overall views being recalculated constantly
2016-02-25 19:31:46 +01:00
Alexander Overvoorde
4a42b09bb3
Add new overall view logic
2016-02-25 19:31:46 +01:00
Alexander Overvoorde
fe6d50f942
Fix overall view position using z coordinate of arbitrary element in same column ( fixes #2636 )
2016-02-25 19:28:43 +01:00
IntelOrca
95d4bd6e60
Merge pull request #2863 from thyeggman/ride_options
...
Ride List Info Type Additional Options
2016-02-25 18:04:22 +00:00
IntelOrca
6484326892
use built ago label for ride list instead of age
2016-02-25 17:59:32 +00:00
Jacob Wallraff
eb706fbdf5
Adding string ids
2016-02-25 17:59:31 +00:00
Jacob Wallraff
37de903831
Ride option additions
2016-02-25 17:43:29 +00:00
Ted John
74973a4a97
Merge pull request #2950 from janisozaur/ride-names
...
Rename ride_entry functions and provide better logging
2016-02-25 12:43:19 +00:00
Michał Janiszewski
14bff0c66f
Rename rct_ride_type to rct_ride_entry
2016-02-25 13:33:19 +01:00
OpenRCT2 git bot
10dbcfe447
Merge Localisation/master into OpenRCT2/develop.
2016-02-25 04:00:14 +00:00
Ted John
c3060d66c9
Merge pull request #3001 from OpenRCT2/fix-sound-music-mixing
...
Fix sound music mixing
2016-02-24 23:44:53 +00:00
IntelOrca
7b97721653
cap sound volume on title screen, closes #2487
2016-02-24 23:21:36 +00:00
IntelOrca
b0887f174b
split sound and music mixing correctly, closes #1270
2016-02-24 22:42:50 +00:00
Michał Janiszewski
d19fe0e334
Make sure null ride type gets handled properly
2016-02-24 23:16:25 +01:00
IntelOrca
a489fac185
implement mouse wheel for land tool size, closes #2260
2016-02-24 21:49:56 +00:00
Michał Janiszewski
eb645cd4f3
Rename ride_entry functions and provide better logging
...
For hacked rides, provide the name of offender in the log.
2016-02-24 22:23:33 +01:00
OpenRCT2 git bot
2e81dfa29e
Merge Localisation/master into OpenRCT2/develop.
2016-02-24 04:00:13 +00:00
Ted John
9b95666829
Merge pull request #2983 from janisozaur/performance
...
Performance
2016-02-23 20:41:43 +00:00
Ted John
50b42a96ce
Merge pull request #2982 from duncanspumpkin/sprite_flags
...
Refactor sprite_flags
2016-02-23 19:32:42 +00:00
Ted John
f2a4dcddc8
Merge pull request #2998 from janisozaur/performance2
...
Improvements to sprite_paint_setup
2016-02-23 18:51:20 +00:00
duncanspumpkin
53df541a39
Relabelled sprite_flags to flags. Relabelled peep/fountain flags
2016-02-23 17:22:19 +00:00
