Ted John
3fe48a262d
Merge pull request #2084 from duncanspumpkin/misc
...
Misc
2015-10-18 14:30:11 +01:00
Duncan
d7aea7c418
Merge pull request #2083 from clamburger/fix_2080
...
Fixes #2080
2015-10-18 14:04:56 +01:00
duncanspumpkin
3ee518bf87
Define CableLiftVehicle structure
2015-10-18 14:01:16 +01:00
Sam Horn
34e1e773a7
Fixes #2080
2015-10-18 22:40:07 +10:00
duncanspumpkin
f512c5fad0
Use correct function call for crashed vehicles
2015-10-18 13:18:10 +01:00
duncanspumpkin
7d378a3620
Fix unused variable warnings
2015-10-18 12:46:38 +01:00
duncanspumpkin
0551fb7170
Fix #1914 . Removed y variable as it is not part of function call
2015-10-18 12:07:45 +01:00
duncanspumpkin
fedd83987e
Fix Disable Network build
2015-10-18 12:02:31 +01:00
Duncan
45d3fbf10d
Merge pull request #2061 from clamburger/update_peep_on_enter_ride
...
Cleaned up peep_on_enter_ride
2015-10-18 10:21:04 +01:00
Ted John
516cb1f7c9
Merge Localisation/master into OpenRCT2/develop.
2015-10-18 04:00:17 +01:00
Ted John
25a70feb24
Merge pull request #2077 from zsilencer/bugfixes
...
fix #2076
2015-10-17 19:18:55 +01:00
zsilencer
cf78d76bdf
make disable volume on focus lost not reset title music
2015-10-17 11:48:39 -06:00
zsilencer
6449dfd6ea
fix #2076
2015-10-17 11:47:04 -06:00
Sam Horn
05f6ea96a0
Fixed inconsistent use of peep->rides_been_on
2015-10-18 02:32:26 +10:00
Sam Horn
8850d1153f
Split off independent logic into their own functions
2015-10-18 02:31:17 +10:00
Ted John
7e753afe52
Merge pull request #2074 from duncanspumpkin/fix_2049
...
Possible fix to #2049 .
2015-10-17 13:38:56 +01:00
IntelOrca
93e7e219cc
fix peep inverted logic from 76252a32d9
2015-10-17 13:35:09 +01:00
Ted John
ed0adb31a1
Merge pull request #2075 from xperia64/develop
...
Wrap download arguments in quotes
2015-10-17 13:27:58 +01:00
xperia64
0829059ee4
Wrap download arguments in quotes
2015-10-16 23:45:40 -04:00
duncanspumpkin
4ddca816e0
Possible fix to #2049 .
...
I need this confirmed as I can't reproduce the issue even when I change the peep logic to always being sick.
2015-10-16 23:26:55 +01:00
IntelOrca
341b658ed0
add gui option for stay_connected
2015-10-16 22:45:17 +01:00
IntelOrca
6c6fa1d444
add ability for server to kick player, closes #2071
2015-10-16 22:20:16 +01:00
IntelOrca
76252a32d9
fix peep.c warnings
2015-10-16 18:51:25 +01:00
Ted John
5d6fe6f7f0
Merge pull request #2067 from duncanspumpkin/fix_load_landscape
...
Fix loadlandscape breaking enabled tabs
2015-10-16 13:36:12 +01:00
Ted John
43e78c4dca
Merge pull request #2069 from zsilencer/bugfixes
...
Bugfixes
2015-10-16 11:37:17 +01:00
zsilencer
ae6c88d1ce
remove unused/redundant RCT2_GLOBALS fix #2065 and cleanup
2015-10-16 02:31:31 -06:00
zsilencer
109ebe4f56
fix compiler warning
2015-10-16 01:06:46 -06:00
Duncan
700cb3976d
Merge pull request #2055 from ccfreak2k/develop
...
Implement sub_69AF1E
2015-10-16 06:47:09 +01:00
Ted John
6068b361bc
Merge Localisation/master into OpenRCT2/develop.
2015-10-16 04:00:16 +01:00
Andrew Waters
b959d13c65
Add implementation of sub_69AF1E()
2015-10-15 18:22:51 -07:00
duncanspumpkin
ee1e71f287
Fix loadlandscape breaking enabled tabs
...
Issue was caused by not calling sub_6DFED0 when loading the landscape. I assume in vanilla this would happen as part of the loading but due to the way loadsave now works it doesn't happen. In the process I also labelled the offset for editor step.
2015-10-15 22:16:27 +01:00
duncanspumpkin
31e6942ff0
Fix #1761 . Issue caused by or = instead of !=
2015-10-15 21:03:29 +01:00
Ted John
fdfe52fc19
Merge pull request #2057 from Gymnasiast/show-vehicles-from-other-track-types
...
Show vehicles from other track types
2015-10-15 12:57:57 +01:00
Michael Steenbeek
eaf23f8e76
Merge pull request #12 from IntelOrca/show-vehicles-from-other-track-types
...
fix dropdown 64 item support and remove old RCT2 addresses
2015-10-15 09:41:29 +02:00
IntelOrca
0442f08aae
remove redundant dropdown assignment
2015-10-14 21:16:10 +01:00
IntelOrca
3855d70d1a
fix dropdown 64 item support and remove old RCT2 addresses
2015-10-14 21:01:04 +01:00
Gymnasiast
d71ca1f376
Extend dropdowns to hold up to 64 items (with bugs)
2015-10-14 16:19:50 +02:00
Sam Horn
0a14971cdf
Cleaned up peep_on_enter_ride
2015-10-14 23:31:50 +10:00
Ted John
e6359f486b
Merge Localisation/master into OpenRCT2/develop.
2015-10-14 04:00:16 +01:00
Ted John
80e973887c
Merge pull request #2059 from janisozaur/types
...
type and const fixes for sawyercoding
2015-10-13 19:15:29 +01:00
Ted John
2db3f4ee23
Merge Localisation/master into OpenRCT2/develop.
2015-10-13 04:00:16 +01:00
Michał Janiszewski
9572f1b532
type and const fixes for sawyercoding
2015-10-12 23:09:49 +02:00
Duncan
d2398b65bb
Merge pull request #2048 from clamburger/update_sub_6960AB
...
Clean up sub_6960AB function (peep_should_go_on_ride)
2015-10-12 21:49:46 +01:00
Gymnasiast
a1cc3e4759
Fix vehicle dropdown when 'Select-by-track-type' off and 'Show vehicles from other track types' on
2015-10-12 16:01:58 +02:00
Gymnasiast
105280a082
Introduce cheat option to show vehicles from other track types
2015-10-12 15:58:15 +02:00
Duncan
1629c75fb3
Merge pull request #2054 from CaioAlonso/develop
...
Fixes the portuguese (br) language name
2015-10-11 20:26:09 +01:00
Caio Alonso
63603871ea
fixes the portuguese (br) language name
2015-10-11 15:26:18 -03:00
Ted John
66dd53dd36
Merge pull request #2050 from OpenRCT2/game-command-land-smooth
...
Implement mountain tool + enhanced functionality.
2015-10-11 18:11:18 +01:00
IntelOrca
6cd3b41065
fix overflows / underflows with mountain tool
2015-10-11 12:31:57 +01:00
IntelOrca
d5ae4a55ff
allow 1 to 64 mountain tool size
2015-10-11 12:26:33 +01:00