mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
10,489 Commits 8 Branches 40 Tags 367 MiB
Commit Graph

7933 Commits

Author SHA1 Message Date
Michał Janiszewski 2f7ee8460e Fix compilation with clang 2017-01-02 23:37:04 +01:00
Michał Janiszewski e45301b104 Fix compilation with GCC 2017-01-02 23:36:56 +01:00
Ted John fb37e57b96 Conform to naming conventions 2017-01-02 22:35:43 +00:00
Ted John 8b1590e248 Move AudioFormat to new header 2017-01-02 22:35:43 +00:00
Ted John 6ae1356af6 Move classes into their own source files 2017-01-02 22:35:43 +00:00
Ted John 1abafdc6a3 Rename audio sources 2017-01-02 22:35:43 +00:00
Ted John ca7bbdfbcc Move Source to an interface 2017-01-02 22:35:43 +00:00
Ted John 6b2ad98a07 Move source implementations to mixer.cpp 2017-01-02 22:35:43 +00:00
Ted John beb5fcb054 Extract resample code to new method 2017-01-02 22:35:43 +00:00
Ted John cab4562950 Refactor resample code 2017-01-02 22:35:43 +00:00
Ted John c70c80c8f4 Add underscores to class fields 2017-01-02 22:35:43 +00:00
Ted John 324dea94bc Make effect buffer lazy and dynamic 2017-01-02 22:35:43 +00:00
Ted John 7d16685d58 Re-use convert buffer 2017-01-02 22:35:43 +00:00
Ted John 2496c872d7 Refactor MixChannel more 2017-01-02 22:35:43 +00:00
Ted John 8c49bb8590 Move reading channel data to channel class 2017-01-02 22:35:43 +00:00
Ted John 46b4dbb4cb Make Channel an interface 2017-01-02 22:35:43 +00:00
Ted John 0d4531d10d Make Mixer an interface 2017-01-02 22:35:43 +00:00
Michał Janiszewski a19b477c8e Fix compilation with ICC 2017-01-02 23:33:43 +01:00
Michał Janiszewski 8cb1460ca8 Fix undefined macro check in linux.c 2017-01-02 22:34:40 +01:00
Michał Janiszewski cbef2c8a29 Constrain surfaceStyle value to valid range 2017-01-02 16:11:23 +00:00
Ted John a091d39b1f Fix #4968: Completing a scenario does not save the name 2017-01-02 00:28:14 +00:00
Ted John 98a26d9dc1 Fix quick blank screen when loading title screen 2017-01-01 23:49:06 +00:00
Ted John fa2f889bc2 Fix #4951: RCT1 Scenario Menu doesn't display completion 2017-01-01 23:31:24 +00:00
Ted John 84ddd12a3c Merge pull request #4963 from Gymnasiast/add-boosters 
Re-add boosters
 2017-01-01 21:31:33 +00:00
Gymnasiast b6750c96c4 Change order of includes 
[ci skip]
 2017-01-01 22:22:20 +01:00
Gymnasiast 33c41456bf Move C header to 'extern C' block 2017-01-01 22:13:31 +01:00
Gymnasiast 2ef9078945 Put braces on separate line 2017-01-01 21:11:04 +01:00
Gymnasiast fd046a592c Sort includes 2017-01-01 21:10:06 +01:00
Ted John e0babbf7c2 Fix #4958: Assertion when opening ride window to R&D 2017-01-01 20:07:28 +00:00
Gymnasiast f60148c374 Enable boosters when loading vehicle 2017-01-01 21:06:54 +01:00
Gymnasiast 69ea33452b Fix alignment and dead code 2017-01-01 19:58:05 +01:00
Ted John 30c738e91c Add config property for RCT1 path 2017-01-01 18:33:51 +00: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
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
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
ipatix ae6ed2978d linear loudness scale on the music and sound volume settings 2016-12-28 22:22:45 +00: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
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
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
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
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 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 8480713050 Start v0.0.6 2016-12-28 00:00:05 +01:00
Michał Janiszewski a20250a57f Revert "Temporarily disable branch info for release" 
This reverts commit 5f4afbe57f.
 2016-12-27 23:59:57 +01:00
wolfreak99 6ba51e36da Make -force-scan command run without starting game 
reformat object_list_load to use parameter instead of external flag boolean

remove object_list_load_force_scan, call directly from RootCommands
 2016-12-26 19:27:58 -05:00
wolfreak99 5cd6c864a5 implement "force-scan" command 
Formatting improvements
 2016-12-26 19:27:55 -05:00
wolfreak99 47fe2d42b1 Count number of object conflicts during scan 2016-12-26 19:27:49 -05:00
Michał Janiszewski 5f4afbe57f Temporarily disable branch info for release 2016-12-27 01:24:28 +01:00
Michał Janiszewski 3aa0eb9bcd Prevent invalid access in malformed objects 2016-12-26 22:42:19 +00:00
Ted John c3035b7601 Enable visual styles for Windows 
Fixes an issue where message boxes used classic Windows style buttons.
 2016-12-26 22:17:44 +00:00
Michał Janiszewski ac32e7dd08 Fix #4920: Crash in peep pathfinding 2016-12-26 14:53:11 +00:00
Michał Janiszewski e25734819b Fix #4917: Crash when opening research 2016-12-26 13:09:22 +00:00
Gymnasiast a05557cb7b Add track elem constant for the RCTC booster 2016-12-25 13:57:56 +01:00
Gymnasiast c226df8dfe Load SV6 files with incorrect checksum if the user has enabled that option 2016-12-25 13:48:49 +01:00
LRFLEW a345560509 Add Importing of RCTC scenarios (#4905) 2016-12-25 13:40:45 +01:00
Ted John f6cb95e534 Fix restart command skipping first command in title sequence 2016-12-24 17:26:30 +00:00
Ted John ff6f46bce3 Fix title sequence not updating 2016-12-24 17:15:30 +00:00
Broxzier 41e168baf1 Don't use initializer lists for members 2016-12-24 13:12:09 +01:00
Broxzier 6c29bdbf21 CppCheck fixes 2016-12-24 13:10:03 +01:00
Ted John 8ed6dfec56 Remove unused variable 2016-12-24 01:17:35 +00:00
Ted John a79e742f39 Fix #4893: Assertion failed if no RCT2 directory selected on startup 
Bit of a hack, temporary until ObjectManager gets same initialisation treatment as ObjectRepository.
 2016-12-24 01:02:57 +00:00
Ted John 463ec2025a Fix #4902: Title Sequences hang when no waits are in, or loading single save 2016-12-24 00:53:33 +00:00
Ted John c2d2a515b4 Fix #4910: Title sequences get labelled incorrectly in game options 2016-12-24 00:06:42 +00:00
Gymnasiast 8324f6a383 Fix crashes, import some ride measurements 2016-12-21 21:59:05 +01:00
Gymnasiast cee63fbd4f Name more peep flags, import peeps on ride, import staff, import more peep fields 2016-12-21 21:17:24 +01:00
Ted John f2eb4c237d Fix #4898: Crash when title sequences are missing 2016-12-21 21:17:24 +01:00
Ted John 50a2e58b22 Fix #4898: Crash when title sequences are missing 2016-12-20 21:29:17 +00:00
Ted John df2cd48c52 Import more peep fields 2016-12-20 17:36:20 +00:00
Ted John 5fa756fef4 Copy RCT2 peep fields to RCT1, most are the same 2016-12-20 17:36:20 +00:00
Ted John b850e98511 Add peeps, just positions for now 2016-12-20 17:36:20 +00:00
Ted John 785a6ac850 Fix loading of RCT1 parks from command line 2016-12-20 17:36:00 +00:00