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

8842 Commits

Author SHA1 Message Date
OpenRCT2 git bot 65beeeece5 Merge Localisation/master into OpenRCT2/develop. 2016-08-25 04:00:20 +00:00
Duncan f538d2f99b Merge pull request #4332 from OpenRCT2/fix-4331 
Increment version number, (hopefully) fixes #4331
 2016-08-24 17:08:05 +01:00
Michael Steenbeek 5ff0db3caa Increment version number, (hopefully) fixes #4331 2016-08-24 17:26:11 +02:00
jensj12 13979397de Allow corner tiles when using mountain tool 
The tile selection was limited to full tiles when using the mountain tool on a single tile. The game now allows selecting and raising/lowering corner tiles and the smoothing algorithm is modified to support that. The cost is the same as the old single-tile mountain tool. A bug where the mountain tool sometimes creates sharp edges has also been fixed.
 2016-08-23 19:30:09 +01:00
Ted John 75095bf9e5 Setup dynamic defines for build 2016-08-23 19:24:07 +01:00
Duncan 6cf546820a Merge pull request #4326 from zaxcav/queueAsNormalPath 
Treat queues not connected to rides as normal paths in the pathfinding.
 2016-08-23 18:40:10 +01:00
Ted John 04bf27e2c5 Refactor msbuild property inputs 2016-08-23 18:22:06 +01:00
Ted John 8c1aeb8f1f Add upload target to msbuild project 2016-08-23 18:13:45 +01:00
Duncan a9a77edeb0 Merge pull request #4325 from zaxcav/maxTilesCheck 
Share maxTilesChecked over all search directions.
 2016-08-23 12:51:28 +01:00
zaxcav 1a5b1197d3 Treat queues not connected to rides as normal paths in the pathfinding. 
Queue path tiles used as normal paths can otherwise cause search loops that the pathfinding does not detect, resulting in pathfinding problems.
 2016-08-23 13:03:01 +02:00
zaxcav 02ae6c7c4f Share maxTilesChecked over all search directions. 
Previouly, when maxTilesChecked was exceeded before all search directions were checked the search results could cause path finding issues. This ensures all search directions will always be searched.
 2016-08-23 12:39:19 +02:00
Ted John e18eb5d8b0 Add NSIS installer target 2016-08-22 22:30:47 +01:00
Ted John 6f27156abf Rename openrct2.props to openrct2.targets 2016-08-22 21:46:09 +01:00
Ted John bc698fdc4c Refactor msbuild targets 2016-08-22 21:45:36 +01:00
duncanspumpkin 8ffe0fb4b6 Fix #4320. Ignoring no entry signs caused by refactor when originally implementing function. 2016-08-22 21:08:53 +01:00
Ted John a60643e3ca Add sign target to build and improve g2 target 2016-08-22 20:39:06 +01:00
Ted John 8c00ad0e4f Create custom task for 7z 2016-08-22 18:31:52 +01:00
Ted John 5cb50f6925 Add install and publish targets to msbuild project 2016-08-22 13:11:57 +01:00
Michael Steenbeek 35ae7600f9 Update changelog.txt 2016-08-22 10:32:17 +02:00
Ted John c4f927eb3a Add a new msbuild project with a g2 target 2016-08-22 00:09:45 +01:00
Marijn van der Werf cbdf1695ea Fix #4318: Use user locale on macOS 2016-08-21 21:51:38 +01:00
Ted John 25328bccc9 Merge pull request #4221 from zaxcav/pathfind 
Path finding fixes and optimisations
 2016-08-21 21:34:12 +01:00
zaxcav c3dee036a7 Use memset() to initialise _peepPathFindHistory. 2016-08-21 22:24:56 +02:00
zaxcav b1da59d25a Ignore isolated footpath tiles in the wide processing. 2016-08-21 22:24:40 +02:00
zaxcav 60acab8676 Remove if statements originally used to overlay grid of non-wide paths. 2016-08-21 22:24:19 +02:00
zaxcav 7711ab811e Fix typo affecting Appveyor build. 2016-08-21 22:23:38 +02:00
zaxcav c1298f3be4 Ignore ride queues when determining 'thin' junctions. 
Why? In prinicple, a queue connected to a path should not be seen as causing a junction in that path.  Rather a ride queue should be treated equivalently to ride entrances/exits. For the path finding search this means that maxNumJunctions are not consumed when walking past ride queues (unless there is a legitimate path junction there).

Remove the unused arguement 'dist' from get_ride_queue_end().
 2016-08-21 22:23:38 +02:00
zaxcav e559e2ce68 Generalise peep entrance station selection 
Remove gPeepFindAltStationNum replacing it with numEntranceStations, which is much simpler to understand.

For rides with multiple entrance stations that sync with adjacent stations, generalise cycling the station entrance selected by the peep through all of the ride's entrance stations (not limited to only stations 0 and 1) to enable this entrance cycling behaviour for rides with >= 2 entrance stations including rides with split entrance/exit stations (where the entrance stations are not stations 0 & 1).
 2016-08-21 22:23:38 +02:00
zaxcav fa2e16e42a Update path finding logging to use log_information, etc 2016-08-21 22:23:38 +02:00
zaxcav dd32ed3827 Revert changes to maxNumJunctions in commit 9c5df6c 2016-08-21 22:23:38 +02:00
zaxcav 76974d2d45 Rebalance maxNumJunctions - increase value. 
Remove earlier optimisation to heuristic search that was preventing searching for shorter paths once a path to the goal was reached.

Resolve Travis warnings.
 2016-08-21 22:23:38 +02:00
zaxcav 86be86331e Remove exlusions from path tiles being flagged wide based on tile coordinates. 2016-08-21 22:23:38 +02:00
zaxcav 9bf5707494 Rebalance maxNumJunctions to avoid exceeding maxTileChecked limit 
With the changes to the path finding, a similar search space to the original now corresponds to half the maxNumJunctions value.

Added warning message when maxTilesChecked is exceeded - path finding issues are to be expected in that case.

Removed some commented out code left over in the previous commit.
 2016-08-21 22:23:38 +02:00
zaxcav a768be5e88 Fix the peep path finding 
In the heuristic search, tiles in wide path were always being handled as junctions.  Changed to handle junctions according to the path thinning.

There was no search loop detection.  Added loop detection for returning to the starting location and any of the junctions visited in the current search path.

Various other optimisations added.
 2016-08-21 22:23:38 +02:00
Marijn van der Werf 3243e89cf9 Honor preferred user language on macOS 2016-08-21 22:15:35 +02:00
Luke Lau c05eef02d6 Fix #3809: No tooltip delay 2016-08-21 15:47:20 +01:00
Marijn van der Werf 9275cd1cbb Add descriptions for stalls 2016-08-21 16:33:37 +02:00
Marijn van der Werf 46959b20b4 Split up ride mode values 2016-08-21 16:33:37 +02:00
Marijn van der Werf 7a6d1ac082 Use different title for keyboard shortcut dialog 2016-08-21 16:33:37 +02:00
Marijn van der Werf ac8403f805 Use different title for preserved ride tab 2016-08-21 16:33:37 +02:00
Marijn van der Werf 245f289fd8 Identify raw string ids 2016-08-21 16:33:37 +02:00
Marijn van der Werf 3a7fa512a2 Use `rct_string_id` as type where applicable 2016-08-21 16:33:37 +02:00
Marijn van der Werf 8fed70d190 Fix #4087: Month names in graphs are written out in full and overlap 2016-08-21 16:32:13 +02:00
Marijn van der Werf 864fc7495e Fix #4132: T-Shirt stalls charge for doughnuts 2016-08-21 16:32:13 +02:00
Marijn van der Werf fbbc871aea Clean up double-used strings 2016-08-21 16:32:13 +02:00
Marijn van der Werf 8d1d699710 Clean up music credits window 2016-08-21 16:31:06 +02:00
Marijn van der Werf cb794ab3df Deprecate string 886 2016-08-21 16:31:06 +02:00
Marijn van der Werf bc3ec1b871 Use table for ride names 2016-08-21 16:31:06 +02:00
Ted John 63eb3580c4 Fix peep invalidation out of range 
When a new peep thought was created, the peep window action widget is invalidated. This would only be valid if the first tab is active. Instead just invalidate the whole window.
 2016-08-21 15:21:48 +01:00
Michał Janiszewski 634fc12875 Add assert for widget index invalidation 2016-08-21 15:20:30 +01:00