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
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
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
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
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
Gymnasiast
548bee8325
Fix formatting and rebase
2016-04-20 20:14:07 +02: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
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
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
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
zsilencer
3ba7d54247
Fix reconnect issue caused by inboundpacket not being cleared
2016-04-20 01:49:16 -06:00
zsilencer
0ceff7fd90
More efficient map transfers
2016-04-20 01:49:15 -06:00
zsilencer
82e02e7cf8
String ids got switched around from the language files.
2016-04-20 01:49:15 -06:00
zsilencer
e742e96461
Fix bug that gave error when trying to join saved server
2016-04-20 01:49:15 -06:00
zsilencer
e582a8f47f
Stop constantly resizing vector
2016-04-20 01:49:15 -06:00
zsilencer
b257e431d9
Get rid of using user_strings for interface
2016-04-20 01:49:15 -06:00
Ted John
3405fd5bad
fix #3352 : assertion trigger while fixing tiles
...
Remove assertion and add warning message instead.
2016-04-19 23:14:02 +01:00
Michał Janiszewski
fb8646e66f
Fix typo in variable name
2016-04-19 21:15:48 +02:00
Michał Janiszewski
b2a3b82d08
Show network version to client if mismatched
...
This will let players know which version should they be using to connect
to server. Also prevents users from even trying to join servers running
versions we already know are incompatible.
2016-04-19 21:15:23 +02:00
Michael Steenbeek
423844c2fb
Don't open the New Ride window when in the Scenario Editor, fixes #3344 ( #3349 )
2016-04-19 19:37:35 +01:00
