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
IntelOrca
4b2776f266
move code from Diagnostics and Guard to cpp
2016-04-20 18:11:06 +01:00
janisozaur
e9bf2a742f
widget_index is sint16, make sure the check is valid ( #3335 )
2016-04-20 18:08:05 +01:00
Ted John
0286efc546
update changelog
2016-04-20 17:51:39 +01:00
Ted John
3a38bac1b6
Merge pull request #3283 from IntelOrca/fix-3282
...
fix #3282 : improve launched freefall ratings
2016-04-20 17:42:22 +01:00
Ted John
234f3ae7f1
update changelog
2016-04-20 17:41:38 +01:00
IntelOrca
94ecc1da40
fix #3282 : improve launched freefall ratings
...
When the ride mode is in downward launch mode, the intensity and nausea were fixed regardless of how high the ride is. To improve the rating calculations, alter the ratings in a similar fashion to roto-drop which is a similar mechanic.
2016-04-20 17:33:55 +01:00
janisozaur
54316a50dc
Drop quotes preventing regex match from travis script ( #3356 )
...
Original implementation was only tested in zsh, bash requires the regex
to be without quotes.
2016-04-20 17:19:43 +01:00
Ted John
039ab08747
update readme.md with improved badges
2016-04-20 13:17:13 +01:00
janisozaur
44717cfe2a
Add console command to set ride type ( #3273 )
2016-04-20 12:37:31 +01:00
Marijn van der Werf
8fc897522b
Clean up paint setup rotation ( #3343 )
...
* Use passed rotation
* Replace fixed 0 rotations
2016-04-20 12:33:42 +01:00
Ted John
3dc2651742
Merge pull request #3354 from zsilencer/bugfixes
...
Various bug fixes to multiplayer / network.
2016-04-20 12:26:55 +01:00
zsilencer
3ba7d54247
Fix reconnect issue caused by inboundpacket not being cleared
2016-04-20 01:49:16 -06:00