1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Commit Graph

12312 Commits

Author SHA1 Message Date
Michał Janiszewski
63ff37cb48 Merge branch 'develop' into master 2017-07-12 21:42:48 +02:00
Tomas Dittmann
90bb6320e5 Guard against invalid sprite access crashes (#5867)
ride->num_vehicles not matching ride->vehicles[] in
ride_prepare_breakdown() and window_ride_maintenance_dropdown().
2017-07-12 21:23:50 +02:00
ζeh Matt
d7f1f13d0c Fix #5866: Don't tween sprites that did not move. (#5875) 2017-07-12 13:23:10 +01:00
Michael Steenbeek
da17ac9781 Bump network version 2017-07-12 12:10:21 +02:00
ZehM4tt
f000e885d3 Fix desync with "Disable clearance check" while placing rides with footpaths.
Refactored single constant to named flags.
2017-07-12 11:32:27 +02:00
Tomas Dittmann
9f451f1ed2 Add myself to contributors.md
[ci skip]
2017-07-11 23:11:43 +02:00
ZehM4tt
250a66c45f Fix game advancing too fast when game was paused/frozen.
Regression from #5848
Added braces.
2017-07-11 21:45:37 +02:00
X123M3-256
a2545d7050 Fix potentially uninitialized variable 2017-07-11 19:57:30 +02:00
X123M3-256
b73c954362 Prevent booster pieces from toggling spinning 2017-07-11 15:55:06 +02:00
Michał Janiszewski
ae282f782e Fix #5803: Null map element in onridephoto (#5852) 2017-07-11 12:34:11 +01:00
ζeh Matt
ec236f0bf5 Fix platform_get_ticks resolution to match other platforms. (#5843) 2017-07-10 21:46:11 +02:00
ζeh Matt
a8af3c7670 Refactor game loop to use a semi-fixed timestep. (#5848)
Fix headless game being jumpy/stuttering.
Bump up network version.
2017-07-10 21:43:20 +02:00
spacek531
337f15619b Add title sequence millisecond resolution to changelog 2017-07-10 10:18:29 +02:00
Duncan
454a5d9411 Fix diagonal steep slope support drawing. (#5844)
Mistake during original implementation. Fixes #5148
2017-07-10 08:16:33 +02:00
Richard Jenkins
fff3e55e6b Merge pull request #5854 from Chaosmeister/backwardsmotionnullguard
Guard against null in vehicle_update_track_motion_backwards_get_new_track()
2017-07-09 22:17:29 +01:00
Tomas Dittmann
e88e2d735b Update changelog
[ci skip]
2017-07-09 23:11:37 +02:00
Tomas Dittmann
e31c4d83db Guard against null in vehicle_update_track_motion_backwards_get_new_track() 2017-07-09 22:52:03 +02:00
Michał Janiszewski
ce24a6fb85 Prevent overflowing tunnel count (#5853) 2017-07-09 22:48:21 +02:00
Michał Janiszewski
23882ae7a6 Merge pull request #5814 from rwjuk/spriteguardnull
Guard against NULL in fix_invalid_vehicle_sprite_sizes()
2017-07-09 21:19:49 +02:00
Michał Janiszewski
f89e56bbc4 Update exit condition to prevent endless loop 2017-07-09 21:13:37 +02:00
Tomas Dittmann
cf1f907138 continue instead of return 2017-07-09 20:42:42 +02:00
Tomas Dittmann
a163c2b1b3 prevent crash with hacked spiral slides 2017-07-09 20:42:42 +02:00
Michael Steenbeek
ba2f129ca1 Add #5819 to changelog 2017-07-09 12:10:04 +02:00
duncanspumpkin
540763ad0c Fix tunnel portal drawing for multidim inverted track.
Mistake made from generated code. Missed in #5087. Fixes #5819.
2017-07-09 12:10:04 +02:00
Duncan
7b47438f49 Fix windows x86 debug builds (#5845) 2017-07-09 09:51:02 +01:00
OpenRCT2 git bot
7d5daad2e1 Merge Localisation/master into OpenRCT2/develop. 2017-07-09 04:00:32 +00:00
Tomas Dittmann
bec1538f48 Improve the error console output. (#5839) 2017-07-09 00:09:46 +01:00
wolfreak99
ac81072597 Fix hold down speed 2017-07-08 10:36:28 +02:00
Krutonium
49cdb021f7 Modify readme.md to be more clear about Gitter channels 2017-07-08 10:28:55 +02:00
OpenRCT2 git bot
e225ea2bc0 Merge Localisation/master into OpenRCT2/develop. 2017-07-08 04:00:41 +00:00
Ted John
22a936b4a9 Merge pull request #5755 from spacek531/seconds-to-ms
calculate ticks from ms instead of seconds
2017-07-07 18:11:42 +01:00
Ted John
3545d2d635 Update to 0.1.0 title sequence 2017-07-07 17:35:33 +01:00
spacek531
c73e17f02b move the zoom case up to handle it as it was 2017-07-07 17:35:33 +01:00
spacek531
e47e71e949 change format to uint8 to stop overflow
[ci-skip]
2017-07-07 17:35:33 +01:00
spacek531
7ecf049e87 add janisozar suggestion
[ci skip]
2017-07-07 17:35:33 +01:00
spacek531
668366bf6b Revert "upgrade save format from uint16 to uint32"
This reverts commit 85757d9fefbacf8b7d07cec9cd9714e2f70f2faa.
2017-07-07 17:35:33 +01:00
spacek531
78ab94b12a upgrade save format from uint16 to uint32 2017-07-07 17:35:33 +01:00
spacek531
bec8b73506 fix saving of milliseconds, loading still beyond knowledge
[ci skip]
2017-07-07 17:35:32 +01:00
spacek531
97bf67e605 add missing curly bracket 2017-07-07 17:35:32 +01:00
spacek531
16167d84f0 clarified comments, changed TITLE_COMMAND_ORDER command to uint16 2017-07-07 17:35:32 +01:00
spacek531
78e25e381c modify saving, add comments
[ci skip]
2017-07-07 17:35:32 +01:00
spacek531
a3acfb4312 Increase digits from 4 to 5
I'm not used to string lengths that are one shorter
2017-07-07 17:35:32 +01:00
spacek531
c1ac654916 fix order of rotate, zoom in clamping 2017-07-07 17:35:32 +01:00
spacek531
c302bec47a fix rotate being able to be set to 0 2017-07-07 17:35:32 +01:00
spacek531
fc71361a9e increase digits for wait, decrease digits for rotate, zoom 2017-07-07 17:35:32 +01:00
spacek531
bd4e8cbd08 change Min to Max 2017-07-07 17:35:32 +01:00
spacek531
51c34ff800 removed BOM from en-GB
[ci skip]
2017-07-07 17:35:31 +01:00
spacek531
ef38a66cc2 begin update editor for ms values
[ci skip]
2017-07-07 17:35:31 +01:00
spacek531
d5610ece54 Remove duplicate line 2017-07-07 17:35:31 +01:00
spacek531
c815a427c0 Change Seconds (internal) to Milliseconds, en-GB too 2017-07-07 17:35:31 +01:00