mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
10,121 Commits 7 Branches 39 Tags 358 MiB
Commit Graph

10121 Commits

Author SHA1 Message Date
Michał Janiszewski a75c1f1bc4 Fix memory leak in FileScanner 2016-10-23 22:28:35 +02:00
Michał Janiszewski 8894be6a6d Tie _tooltipText size to that of gCommonStringFormatBuffer 2016-10-23 22:28:35 +02:00
zaxcav 86ae14c65d Add pathfinding loop detection based on peep->pathfind_history 
The heuristic search currently only inludes detection of loops in the current search path - i.e. from where the peep is now.

The peep->pathfind_history includes (limited) junctions that the peep has already passed through for the current search goal to get to their current location. Consider search paths through these junctions as loops as well.

This will prevent peeps getting stuck in some path layouts where looping back through a junction they already walked through and then proceeding via an alternative path (such that there is no loop in the current search path) hits the search limits on a continuing path that is closer to the goal than simply continuing on along the path which then turns (temporarily) away from the goal.

This prevents _some_ cases of alternate, longer routes to nearer tiles being returned as a better result than a route that goes through that same tile (with less steps) and then continues on to end overall further from the goal though closer to getting to the goal (as was previously documented in PR #4527).

The network version is incremented in this PR.
 2016-10-23 18:55:47 +02:00
Ted John 315c0e91ad Fix #4574: Changing the game language makes the scenery window wonky 2016-10-23 17:49:21 +01:00
Ted John 94a9c94c1f Fix saving in editor mode 
Fixes #4572: Don't create .sv6 autosaves in track designs manager, roller coaster designer and scenario editor
Fixes #4573: "Save this before quitting?" in scenario editor saves to .sv6, not .sc6
 2016-10-23 17:42:11 +01:00
Ted John 9ee865a8da Fix #873: Unable to save track with colon symbol in name of ride 
Add protection for saving any file with invalid path characters in save dialog.
 2016-10-23 17:12:55 +01:00
Ted John 7611b04ad1 Add --console switch for Windows 
Windows subsystem does not work like console subsystem which makes it almost impossible to obtain `stdout` until the application has finished. This adds a `--console` switch to make the game either attach to an existing console or show a new one and redirect the C streams to it.
 2016-10-23 16:16:20 +01:00
Ted John 667dd526e9 Merge pull request #4679 from IntelOrca/refactor/track-repository 
Convert track repository to C++
 2016-10-23 13:56:43 +01:00
Marijn van der Werf e8e2039832 Fix GCC 2016-10-23 14:52:32 +02:00
Marijn van der Werf b868cccea2 Remove `pragma mark` 2016-10-23 14:41:47 +02:00
Marijn van der Werf 551962123a Reorganise file to minimise diffs 2016-10-23 14:40:11 +02:00
Marijn van der Werf 50bb158ee0 Update Xcode project 2016-10-23 14:16:56 +02:00
Marijn van der Werf 7d3cd99c0c Combine Junior RC and Water RC drawing 2016-10-23 14:13:11 +02:00
Ted John 712e062bcc Only load tracks if cache is invalid 2016-10-23 01:12:17 +01:00
Ted John 9eaf887546 Fix track manager issues 2016-10-23 00:42:22 +01:00
LRFLEW f489bba4f0 Update Xcode Project 2016-10-23 00:15:33 +01:00
Ted John 25a7b98be0 Omit . and .. from linix file scanning too 2016-10-22 23:09:45 +01:00
Ted John a9db9528ae Fix bitwise and expression 2016-10-22 22:36:45 +01:00
Ted John a2efab7c45 Add unix file scanner implementation 2016-10-22 22:36:45 +01:00
Ted John cdc45a2848 When renaming, don't change extension 2016-10-22 22:36:45 +01:00
Ted John 7834afb34a Re-write FileScanner for easier cross platform and multiple patterns 2016-10-22 22:36:45 +01:00
Ted John 9118f24778 Rename FileEnumerator to FileScanner 2016-10-22 22:36:45 +01:00
Ted John 16626eabb8 Convert FileEnumerator to IFileScanner 2016-10-22 22:36:45 +01:00
Ted John a17748eb41 Fix typo 2016-10-22 22:36:45 +01:00
Ted John 42d8324997 Prevent delete or rename on RCT2 tracks 2016-10-22 22:36:45 +01:00
Ted John 29f75a71fb Use new item structure with std::string 2016-10-22 22:36:45 +01:00
Ted John e666028e02 Convert track repository to C++ 2016-10-22 22:36:45 +01:00
Michał Janiszewski 91d4058850 Merge pull request #4681 from janisozaur/cmake-update 
CMake updates
 2016-10-22 22:59:37 +02:00
Michał Janiszewski 03bd98f395 Remove special cases for Launchpad builds 2016-10-22 22:25:30 +02:00
Michał Janiszewski b1ec40f531 Use -Wno-error=date-time only when compiler supports it 2016-10-22 22:24:19 +02:00
Michał Janiszewski c70639302c Add convenience functions to CMakeLists.txt 
The helper functions allow setting compiler flags only if compiler
supports them.
 2016-10-22 22:20:37 +02:00
Michał Janiszewski 88ccfad303 Merge pull request #4615 from janisozaur/mediate-network-objects 
Mediate network objects
 2016-10-22 15:46:03 +02:00
Ted John f3b0044c8a Merge pull request #4659 from IntelOrca/refactor/painting 
Refactor some of the paint and draw functions to pass parameters instead of using globals as the first steps towards nicer paint code and multi-threaded paint code.
 2016-10-22 14:30:45 +01:00
Ted John 84e8b00900 Merge pull request #4678 from marijnvdwerf/fix/paint-4 
Track Paint fixes: segment support height
 2016-10-22 14:22:03 +01:00
Ted John 3e260fcfc5 Merge pull request #4677 from marijnvdwerf/fix/paint-3 
Track Paint fixes: general support height
 2016-10-22 14:21:28 +01:00
Ted John d15a179eae Rename / refactor paint quadrant variables 2016-10-22 14:20:57 +01:00
Marijn van der Werf 1ce7f38785 Fix various segment heights 2016-10-22 14:42:31 +02:00
Marijn van der Werf 4b4c00a1af Check for `SEGMENTS_ALL` when printing 2016-10-22 14:42:30 +02:00
Marijn van der Werf 1ebfba60d9 Fix right vertical loop 2016-10-22 14:42:30 +02:00
Ted John 60df18ee0f Refactor paint_arrange_structs 2016-10-22 13:35:21 +01:00
Ted John 86dd18a65d Rename paint functions 2016-10-22 13:35:21 +01:00
Ted John 504257ce08 Refactor paint_init 2016-10-22 13:35:21 +01:00
Ted John e4429641a4 Refactor viewport_paint_column 2016-10-22 13:35:21 +01:00
Ted John b81fe09469 Reformat sub_688217 2016-10-22 13:35:21 +01:00
Ted John 67e9ccb1fc Refactor paint_ps_money_effects 2016-10-22 13:35:21 +01:00
Ted John 1f810375a8 Refactor paint_attached_ps 2016-10-22 13:35:21 +01:00
Ted John 2aa0271222 Refactor paint_quadrant_ps 2016-10-22 13:35:21 +01:00
Ted John ce58c2e4e7 Merge pull request #4674 from marijnvdwerf/fix/paint-2 
More various track paint fixes
 2016-10-22 12:30:00 +01:00
Ted John 188e2efe9c Merge pull request #4675 from zsilencer/bugfixes 
A couple of bugs that I noticed while playing online
 2016-10-22 12:28:06 +01:00
zsilencer e2e4201112 Validate peep game command which caused crash from invalid sprite index 2016-10-22 01:53:33 -06:00