1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 06:44:38 +01:00
Commit Graph

718 Commits

Author SHA1 Message Date
duncanspumpkin
d8d706cc58 Fix #2700. Friction sound no longer goes very quite at high speeds.
Also labelled friction_sound_id and small refactor
2016-01-12 17:55:19 +00:00
duncanspumpkin
75ed781a5c Fix part of #2700. Reverse freefall now correctly slows down on reverse. 2016-01-12 17:43:47 +00:00
duncanspumpkin
b5b6e93a03 Fix #2701. Rotated trains no longer disobey physics when crashing. 2016-01-12 17:32:16 +00:00
Duncan
e2e749d644 Merge pull request #2697 from marijnvdwerf/get-ride-entry
Minimise direct usage of `RCT2_ADDRESS_RIDE_ENTRIES`
2016-01-11 23:09:43 +00:00
duncanspumpkin
27ec97d3c5 Fix #2694. Multi tile block breaks (i.e. cable lifts) now correctly unstop.
Issue was caused by looking at the wrong tile to unstop
2016-01-11 18:35:36 +00:00
Marijn van der Werf
6eadf824ea Replace raw addresses of RIDE_ENTRIES 2016-01-11 13:34:08 +01:00
Marijn van der Werf
e961cc885a Use RCT2_ADDRESS_COMMON_FORMAT_ARGS instead of raw address 2016-01-11 12:55:33 +01:00
Duncan
8997f2aa6a Merge pull request #2605 from OpenRCT2/vehicle-update
Vehicle Update
2016-01-10 17:13:02 +00:00
Duncan
052254ca1f Merge pull request #2640 from janisozaur/exit-fix
Fix for missing exit
2016-01-10 10:08:22 +00:00
duncanspumpkin
b16337a035 Refactor to remove all remaining warnings and remove redundant comments 2016-01-10 09:24:56 +00:00
duncanspumpkin
2bd6dac20f Merge branch 'develop' into vehicle-update
Conflicts:
 openrct2.vcxproj
2016-01-10 08:57:41 +00:00
IntelOrca
25237bf810 fix #2679: game_command_set_ride_appearance did not work correctly for non-apply flag 2016-01-09 21:15:51 +00:00
duncanspumpkin
268e2d34ce Merge branch 'develop' into vehicle-update
Conflicts:
 object.c
2016-01-09 16:51:23 +00:00
duncanspumpkin
326c1f276a Fix fixed broken restraints causing the train to get stuck in a loop 2016-01-09 16:17:04 +00:00
duncanspumpkin
8e0413bd2f Fix mechanics not being called to broken down rides 2016-01-09 15:57:55 +00:00
Michał Janiszewski
abf0801725 Fix erroneous address 2016-01-07 21:26:38 +01:00
IntelOrca
40a4bd1fa8 remove old object_paint calls, replace with new 2016-01-07 19:01:19 +00:00
IntelOrca
ee9c695902 fix #2651: remove ride when multiplayer client aborts ride construction
also fix ride construction window closing immediately after placing first track piece of a ride for clients
2016-01-05 20:37:21 +00:00
Michał Janiszewski
133096cd64 Merge branch 'develop' into vehicle-update 2016-01-05 09:59:53 +01:00
Michał Janiszewski
e63f43c337 Fix for missing exit 2016-01-05 08:16:14 +01:00
IntelOrca
f0adf90660 integrate variable: gInputFlags 2016-01-04 22:53:03 +00:00
Michał Janiszewski
9c4cf14069 Game commands hardening 2016-01-04 22:03:28 +01:00
duncanspumpkin
d5bce19af1 Fix race car mode collisions 2016-01-04 10:06:26 +00:00
duncanspumpkin
ccc7b1f228 Refactor var_4C into seperate variables 2016-01-04 09:36:29 +00:00
duncanspumpkin
5e6befe20b Fix 3D films only lasting 1 ticks time 2016-01-04 09:11:36 +00:00
duncanspumpkin
3d2a456481 Rework logic to make flow clearer. Fix issue with invalid direction. Fix small logic mistake. 2016-01-03 11:10:02 +00:00
Michał Janiszewski
2b1b0f76f3 Whitespace fixes.
This is just whitespace fixup for all files affected in vehcile-update
branch.
2016-01-03 00:59:10 +01:00
Hielke Morsink
bc2ac2e28b Split extension setter into two functions 2016-01-02 20:45:00 +01:00
Hielke Morsink
f31a5f2248 More secure checks for removing and setting file extensions. 2016-01-02 18:57:11 +01:00
duncanspumpkin
797a2cc75d Fix bug with block breaks when there are track overlaps.
Labeled map_flag (1<<5) as block break closed as well.
2016-01-02 17:04:39 +00:00
duncanspumpkin
afca9d27d6 Fix sound bugs with opening/closing track doors. Fix average speed bug. 2016-01-02 16:19:06 +00:00
duncanspumpkin
bcd02e833c Fix vehicles bunching up when waiting for passengers in certain directions.
Most notable in bumper boats on blackpool pleasure
2016-01-02 10:45:59 +00:00
Michał Janiszewski
5f66cd48f8 Merge branch 'develop' into vehicle-update
Conflicts:
	openrct2.vcxproj.filters
2015-12-31 11:41:23 +01:00
duncanspumpkin
1f4b4b2c3f Fix flying boats when entering the station.
Issue was caused by not clearing the word var_34 but instead only the byte var_34. This caused track_progress (word var_34) to become a very large negative number that would be interpreted as a valid track_progress. This would eventually end up reading invalid memory.
2015-12-31 10:27:33 +00:00
duncanspumpkin
3e03ab71fa Fix small bugs in boat hire code. 2015-12-31 09:53:23 +00:00
Alex Bahm
2c7f0d6ae2 Improved mechanic selection for broken rides
Switch to using manhattan distance to calculate distance. Also changed
starting closestDistance to UINT_MAX and removed ternary check because it is not needed.
2015-12-29 13:51:30 -08:00
duncanspumpkin
ac0d729baf implement sub_6DA280 2015-12-29 12:06:11 +00:00
Ted John
69f0e9d55d Merge pull request #2398 from Broxzier/comments_and_optimizations
Refactored some util functions and some minor tweaks for saving tracks
2015-12-29 11:31:58 +00:00
Jonathan Haas
dfd6cfef87 Fix incorrect memset 2015-12-27 20:33:04 +01:00
Jonathan Haas
cf67177a08 Extract ride data array, use memset for zeroing array 2015-12-27 18:42:32 +01:00
Michał Janiszewski
4c6ee9570c Merge branch 'develop' into vehicle-update
Conflicts:
	openrct2.vcxproj.filters
2015-12-27 18:11:13 +01:00
Jonathan Haas
bb01732f74 Fix indentation 2015-12-27 13:06:18 +01:00
duncanspumpkin
f7520fd2ba implement vehicle_update_motion_collision_detection 2015-12-27 11:46:15 +00:00
Jonathan Haas
cf78b28adf Use memmove for shifting
Use memmove for shifting the customer history, rename ride fields, and add back the offset comments.
2015-12-27 10:45:11 +01:00
Jonathan Haas
b71c649d45 Refactor ride customer count
Renamed some confusing ride fields, extracted function to get recent ride customer count.
2015-12-26 22:03:33 +01:00
IntelOrca
574774b2af add notification conditions 2015-12-26 17:33:33 +00:00
Jonathan Haas
2ed4802032 Fix and replace some StringIDs
Create some additional named StringIDs.
Fix a broken condition for tracked peep notifications, as the in/on ride messages were reversed.
2015-12-26 14:50:03 +01:00
Aaron van Geffen
9232a9906f Inventarised instances of RCT2_ADDRESS_COMMON_FORMAT_ARGS 2015-12-26 18:24:36 +09:00
Michał Janiszewski
cd2ec16290 Merge branch 'develop' into vehicle-update
Conflicts:
	openrct2.vcxproj.filters
	projects/openrct2.vcxproj
2015-12-23 19:47:16 +01:00
duncanspumpkin
4c88609e7e Fix stretch backwards coasters 2015-12-23 11:57:50 +00:00