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

8713 Commits

Author SHA1 Message Date
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
duncanspumpkin 8ffe0fb4b6 Fix #4320. Ignoring no entry signs caused by refactor when originally implementing function. 2016-08-22 21:08:53 +01:00
Michael Steenbeek 35ae7600f9 Update changelog.txt 2016-08-22 10:32:17 +02: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
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
Marijn van der Werf 2c89d30f26 Fix #4318: Use user locale on macOS 2016-08-21 15:18:09 +02:00
Ted John 112b70c15b Merge pull request #4068 from gDanix/refactor-clear_elements_at 
Refactor clear_elements_at()
 2016-08-21 13:59:07 +01:00
Ted John 9b77bb35ae Fix #4113: Free rides: Income and profit calculated using old price 2016-08-21 13:49:37 +01:00
Ted John 3f1a95cbee Merge pull request #4317 from marijnvdwerf/clean/data-palette 
Clean/data palette
 2016-08-21 13:48:37 +01:00
Marijn van der Werf bdb04e3da3 Integrate data at 0x009DEDF4 2016-08-21 14:24:55 +02:00
Marijn van der Werf 5a03c6b129 Integrate palettes 2016-08-21 13:53:31 +02:00
OpenRCT2 git bot 676c734f4c Merge Localisation/master into OpenRCT2/develop. 2016-08-21 04:00:18 +00:00
Tom Delebo 50348e015e Changed the server greeting buffer from 256 to 1024 
* Changed the server greeting buffer size to accept longer strings
* Added comment explaining character limit for greeting buffer
* Moved chat constants to header file to allow access from includes
 2016-08-20 23:20:53 +01:00
Ted John ff12c2b326 Integrate animation objects 2016-08-20 22:38:50 +01:00
Ted John 1fb7458207 Remove drawing of expansion packs on title screen 
This never worked anyway as we no longer read the registry keys for it.
 2016-08-20 22:24:56 +01:00
Marijn van der Werf 9319bee91f Use already integrated data 2016-08-20 22:12:52 +01:00
Marijn van der Werf 853b1c79b2 Integrate stru_9A3AC4 2016-08-20 21:59:59 +01:00
Ted John 77adbc5145 Merge pull request #4314 from marijnvdwerf/clean/data-vehicle-misc-1 
Clean/data vehicle misc 1
 2016-08-20 21:33:43 +01:00
Marijn van der Werf d51a14e8ca Integrate word_9A3684 2016-08-20 22:20:18 +02:00
Marijn van der Werf f862bc8675 Integrate dword_9A2970 2016-08-20 22:01:42 +02:00
Marijn van der Werf db92fc474f Integrate dword_9A2930 2016-08-20 21:50:27 +02:00
Marijn van der Werf d0399dd7f7 Include motion simulator vehicle data 2016-08-20 16:56:55 +01:00
Yaroslav Tretyakov 88be245504 Fix another cause of #4204 2016-08-20 14:06:48 +01:00
OpenRCT2 git bot 394eb94be3 Merge Localisation/master into OpenRCT2/develop. 2016-08-20 04:00:22 +00:00
Marijn van der Werf d99fa770fd Include vehicle rotation data 2016-08-20 00:53:54 +01:00
LRFLEW 248a933ab1 Fix Invalid Save Default Path (#4308) 2016-08-19 22:33:49 +01:00
Marijn van der Werf 72cb30c7c4 Include topspin vehicle data 2016-08-19 18:59:23 +01:00
Ted John 5f2c947182 Define correct architecture 2016-08-19 00:18:09 +01:00
Ted John 4a234a0f86 Merge pull request #3946 from pizza2004/chat_background 
Improve chat and background, fixes #3849
 2016-08-18 22:10:19 +01:00
Ted John c645eee046 Enable DPI awareness for Windows x64 2016-08-18 18:37:51 +01:00
OpenRCT2 git bot a874756fcc Merge Localisation/master into OpenRCT2/develop. 2016-08-18 04:00:19 +00:00
Tom Delebo b666a8d52c Minor chat window fixes and cleanup (#2) 2016-08-17 21:57:00 -06:00
Ted John b3a06106a8 Merge pull request #4279 from delebota/mp_greeting 
Add a server greeting which is displayed to connecting user
 2016-08-17 23:18:08 +01:00
Ted John 5a046ece60 Merge pull request #4291 from zaxcav/stationSync 
Fix problems with syncing adjacent stations
 2016-08-17 23:04:02 +01:00