1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 03:53:07 +01:00
Commit Graph

10383 Commits

Author SHA1 Message Date
Gymnasiast
69ea33452b Fix alignment and dead code 2017-01-01 19:58:05 +01:00
Gymnasiast
95b954c5cb Allow importing TD4 files with boosters 2017-01-01 17:37:37 +01:00
Gymnasiast
c1cd196633 Draw brake image for boosters on twister and vertical rc 2017-01-01 17:31:19 +01:00
Gymnasiast
5a82b2e0d1 Add booster elements to build window, fix implementation 2017-01-01 17:17:11 +01:00
Gymnasiast
f23f443ad2 Accuracy fixes 2017-01-01 17:17:11 +01:00
Gymnasiast
e82b19100d Re-add boosters, fix typo 2017-01-01 17:17:11 +01:00
OpenRCT2 git bot
68ed96194f Merge Localisation/master into OpenRCT2/develop. 2017-01-01 04:00:23 +00:00
Michael Steenbeek
117c714948 Call metal_b_supports_paint_setup() with the correct support type, fixes #4961 (#4962) 2017-01-01 01:55:37 +01:00
Ted John
fae68f1651 Merge pull request #4633 from Gymnasiast/cleanup-b-and-m
Cleanup of B&M coaster types
2016-12-31 18:18:42 +00:00
Marijn van der Werf
f1fbcbc90b Update Xcode project 2016-12-30 13:09:08 +01:00
Gymnasiast
75342e3ae9 Code style, add last missing pieces, remove hacks 2016-12-30 13:05:02 +01:00
Michael Steenbeek
d7f8751a6f Add bolliger_mabillard_track.c to VS project 2016-12-30 12:26:35 +01:00
Michał Janiszewski
99a662fc5f Cap var2CTotal so it does not overflow 2016-12-30 01:16:13 +00:00
Michał Janiszewski
b1ab5c96e5 Prevent scrolling to ride before ride list is populated 2016-12-29 22:57:37 +01:00
Gymnasiast
e2a972e0b7 Twister RC 2016-12-29 22:36:10 +01:00
Gymnasiast
347a7dd2aa More 2016-12-29 21:25:38 +01:00
Gymnasiast
80ed6ed32c Use the same code for the Twister and Vertical RC 2016-12-29 21:25:38 +01:00
Gymnasiast
04953b921e Name some flags 2016-12-29 21:19:22 +01:00
zaxcav
e82a2de997 Constrain mechanics to their patrol area when heading to a ride 2016-12-29 21:18:02 +01:00
Michael Steenbeek
a10de678c1 Fix peeps not entering queues in RCT1 imported parks, fix excitement, import more fields 2016-12-29 20:35:02 +01:00
Michael Steenbeek
480624ff52 Implement code for detecting supported track pieces (#4946) 2016-12-29 20:32:33 +01:00
Ted John
004395acb7 Merge branch 'rct1/import-peeps' into develop 2016-12-29 19:15:49 +00:00
OpenRCT2 git bot
6080a159de Merge Localisation/master into OpenRCT2/develop. 2016-12-29 04:00:21 +00:00
ipatix
ae6ed2978d linear loudness scale on the music and sound volume settings 2016-12-28 22:22:45 +00:00
Marijn van der Werf
56c338bd3a Update Xcode project 2016-12-28 23:09:04 +01:00
Manuel Vögele
f503d440d4 Allow automatic positioning of new staff in multiplayer
This also changes the network protocol and thus increases
the network verion.
2016-12-28 21:45:22 +00:00
Michael Steenbeek
f431d0cbd9 Fix some cases of viewport clipping out of map bounds 2016-12-28 22:30:41 +01:00
wolfreak99
ba59854917 Send value for all toggles through command (#4926) 2016-12-28 22:02:08 +01:00
Michał Janiszewski
7d4b7f91ef Update changelog
[ci skip]
2016-12-28 21:45:53 +01:00
Ted John
2892a7ad3f Merge branch 'Overv-download-saved-park' into develop 2016-12-28 19:22:03 +00:00
Ted John
b0b3f9ac3c Use TryClassifyFile to auto load downloaded park 2016-12-28 19:13:19 +00:00
Alexander Overvoorde
61f4452526 Fix #3355: Implement loading of parks from URLs
The help text for the command line options already referenced the
possibility of opening a saved park directly from a URL, but this was
not yet implemented. This commit changes all path handling for command
line options to accept both local paths and URLs.

If a URL is specified instead of a local path, the program will download
the file to the operating system's temp directory. It will then proceed
to load this file just like local files would be loaded.

The program will try to derive the extension of the temp file from the
original URL and defaults to sv6 (a save file) if it is unable to do so.
2016-12-28 19:13:13 +00:00
Ted John
729ac13537 Don't scroll to ride on research page 2016-12-28 18:50:55 +00:00
Ted John
49446c3844 Add code to inspect any file and classify its format 2016-12-28 18:45:01 +00:00
Michał Janiszewski
ab43bf74d5 Speedup calculate_checksum by ~9%
Skips unnecessary `rol32`s
2016-12-28 19:31:56 +01:00
Michał Janiszewski
d15112dcb3 Fix broken includes in TestPaint.cpp 2016-12-28 19:07:46 +01:00
Daniel Kamil Kozar
1a521c53fb Fix out-of-bounds access in convert_multibyte_charset
convert_multibyte_charset unconditionally assumes that a 0xFF is always
followed by two more bytes. This is not the case with BATFL.DAT, whose
string at offset 0x2D6 (languageId = 0xA) ends with bytes 0xFF, 0xC2,
0x00. Therefore, it seems like 0x00 is used as both the string terminator
and the second byte of a multicharacter sequence in this case.

This commit does not change the original behaviour at all, and prevents
the code from looking for a 0x00 after the string actually ends.
2016-12-28 17:50:03 +00:00
Michał Janiszewski
da8964efab Fix CMake warnings about mismatched conditions 2016-12-28 15:44:38 +01:00
David CARLIER
1d17725592 Add FreeBSD support
At the moment the platform specific code supports only
FreeBSD as OpenBSD and NetBSD does not support the
full path retrieval for an executable, we intentionally
stop the compilation for those platforms.
2016-12-28 14:18:04 +01:00
Michał Janiszewski
d645e53428 Allow arbitrary entertainers' costume changes via console
This was discussed at
http://www.nedesigns.com/topic/32012/openrct-advantages-and-disadvantages/?p=712114
2016-12-28 13:06:24 +00:00
Ted John
1083ccebd0 Merge pull request #4847 from zaxcav/pathfind_history_fixes
Further pathfinding fixes
2016-12-28 12:58:19 +00:00
Ted John
31d4f79dc5 Merge pull request #4878 from Broxzier/cpp_fixes
CppCheck fixes
2016-12-28 12:57:34 +00:00
Ted John
f31e3898c8 Update changelog
[ci skip]
2016-12-28 12:55:50 +00:00
LRFLEW
8e449b9648 Fix #4571: Only start autosave timer after update or game command 2016-12-28 12:53:55 +00:00
Graham Edgecombe
f25a0b383c Fix compiling SetupEnvironment() under g++ 2016-12-28 13:15:39 +01:00
Ted John
20b1ce069f Merge branch 'wolfreak99-num_of_conflicts' into develop 2016-12-28 01:19:11 +00:00
Ted John
1e780d656f Make CLI object scan a command instead of a flag. 2016-12-28 01:18:13 +00:00
Ted John
5095e7037a Merge branch 'num_of_conflicts' of https://github.com/wolfreak99/OpenRCT2 into wolfreak99-num_of_conflicts 2016-12-27 23:56:59 +00:00
Ted John
a7b60c2419 Fix #4929: Changing TTF language crashes game 2016-12-27 23:27:49 +00:00
Michał Janiszewski
de88cdd7a2 Update Xcode build number 2016-12-28 00:00:11 +01:00