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

9937 Commits

Author SHA1 Message Date
Marijn van der Werf 54964857da Indent call test 2016-10-17 19:15:57 +02:00
Marijn van der Werf ba986f14ae Actually return after failed test 2016-10-17 18:04:12 +02:00
Marijn van der Werf 7d126126ed Add filters 2016-10-17 17:59:51 +02:00
Marijn van der Werf e1c4e3e8f2 Remove more C bridging code 2016-10-17 16:07:32 +02:00
Marijn van der Werf d05dfbe5dc Rename intercept2 to TestPaint 2016-10-17 16:06:05 +02:00
Marijn van der Werf 455080d8b8 Fix MSVC 2016-10-17 15:36:26 +02:00
Ted John 2bf4ded732 Merge pull request #4638 from OpenRCT2/janisozaur-mingw-test 
Configure MinGW to consume Vista+ APIs
 2016-10-17 12:10:59 +01:00
Marijn van der Werf 18d9b1e91e Don't use C for PaintIntercept functions 2016-10-17 12:45:27 +02:00
Marijn van der Werf d3ce7d1d75 Extract vertical tunnel testing 2016-10-17 12:45:27 +02:00
Marijn van der Werf 9efb41a13f Extract Side tunnels 2016-10-17 12:44:50 +02:00
Michael Steenbeek a6c95d8691 Merge pull request #4639 from Broxzier/patch-1 
Fixes typo
 2016-10-17 12:44:05 +02:00
Marijn van der Werf cb4519e9c5 Move support height testing 2016-10-17 12:43:14 +02:00
Marijn van der Werf 1bd87537eb Attempt to fix automatic segment heights 2016-10-17 12:43:14 +02:00
Marijn van der Werf deb266c443 Extract SupportHeightCalls 2016-10-17 12:43:14 +02:00
Marijn van der Werf 7d69446464 Attempt to fix GCC 2016-10-17 12:43:14 +02:00
Marijn van der Werf 6c54bba6f6 Fix MSVC 2016-10-17 12:43:14 +02:00
Marijn van der Werf 334b8cca05 Extract all of `intercept.c` to C++ 2016-10-17 12:43:14 +02:00
Marijn van der Werf abe6b8ee9e Update VS project 2016-10-17 12:43:14 +02:00
Marijn van der Werf 263dc9f189 Remove unneeded declarations from intercept 2016-10-17 12:43:14 +02:00
Marijn van der Werf f813a2871b Extract function comparison 2016-10-17 12:43:14 +02:00
Marijn van der Werf b8b3eb5af5 Fix for msvc 2016-10-17 12:43:14 +02:00
Marijn van der Werf 3b19dc02d3 Extract utilty functions 2016-10-17 12:43:14 +02:00
Marijn van der Werf 28db02885d Extract function printing 2016-10-17 12:43:14 +02:00
Marijn van der Werf d6772865f5 Use return codes for test results 2016-10-17 12:43:13 +02:00
Marijn van der Werf 70654e9ee5 Extract tunnel/segment resetting 2016-10-17 12:43:13 +02:00
Marijn van der Werf 486d9da0a0 Extract environment resetting 2016-10-17 12:43:13 +02:00
Marijn van der Werf a552a80165 Attempt to fix msvc compatibility 2016-10-17 12:43:13 +02:00
Marijn van der Werf 6642dc534c Update Project files 2016-10-17 12:43:13 +02:00
Marijn van der Werf 8034f6f427 Extract method interception to seperate class 2016-10-17 12:43:13 +02:00
Hielke Morsink 394e30633e Fixes typo 
`Currupt` to `Corrupt`
 2016-10-17 12:41:16 +02:00
Michał Janiszewski 46021ed2bf Fix self-assignment in ScenarioRepository 2016-10-17 11:59:10 +02:00
Michał Janiszewski 7f5b70ea78 Move WINVER definition before including common.h 2016-10-17 09:52:26 +02:00
Michał Janiszewski 33c3432556 Update MinGW to use APIs from WINVER 0x0600 2016-10-17 09:46:08 +02:00
zaxcav 8741a40674 Remove hacks for pathfinding to the ride exit. 
When sending a mechanic to a ride exit/entrance, the original pathfinding was setting the goal to the path next to the exit/entrance with goal.z set to the exit/entrance height. This is wrong when the path slopes up to the exit/entrance. Consequently the original pathfinding included a hack to allow the mechanic to enter the exit/entrance from the goal tile.

The changes in PR #4527 (commit f3cf23f) will ignore the relevant tile when the height is wrong, preventing the original hack from working. To fix this the height of paths sloping up was adjusted in the heuristic search ... which inadvertently broke pathfinding for other goals on such a sloped path (such as the start of a ride queue that slopes up).

To fix, set the goal to the ride exit/entrance itself, make the heuristic search aware of ride exits (code existed but was commented out; entrances are already there for rides without queues) and remove both the original hack and the (incorrect) heigh adjustment made in PR #4527.

Fixes issues #4626, #4629.
 2016-10-17 09:31:28 +02:00
Ted John d405e32c48 Merge pull request #4635 from LRFLEW/macos64 
Update Xcode Project to build x64 macOS Builds
 2016-10-17 07:59:08 +01:00
Ted John 55cae4a230 Fix compile errors 2016-10-17 00:03:32 +01:00
Ted John b64f8861f4 Merge branch 'stout-expanded-rendering-2' into render/night-lights 2016-10-16 23:40:59 +01:00
LRFLEW 0afc593fd3 Update Xcode Project to build x64 macOS Builds 2016-10-16 17:10:48 -05:00
Ted John dd3db116f7 Merge pull request #4606 from IntelOrca/refactor/scenario-sources 
Refactor scenario sources and scenario list to C++
 2016-10-16 22:27:34 +01:00
Hielke Morsink 8434258a62 Tile inspector fixes 
1. Collision typo (sxtra s)
2. Selection area from previous window session was being used
3. Add label and value for base height spinner for entrances
 2016-10-16 21:56:44 +01:00
Hielke Morsink da9fbf0562 Highlight all selected tiles for cluster tool 2016-10-16 21:19:05 +01:00
Ted John 00e907d007 Merge pull request #4414 from Broxzier/extended_tile_inspector 
Extended tile inspector
 2016-10-16 21:12:21 +01:00
Ted John 0c20b547f4 Fix #4625: Guest/peep hover text not rendered on x64 build 
A recent regression where inline string sprites were changed to be treated as intptr rather than uint32.
 2016-10-16 20:26:02 +01:00
Ted John b6a0890d97 Add string format debugging assistance 2016-10-16 20:24:32 +01:00
Ted John f680f84523 Update openrct2.sln 
VS keeps making this change, we will just have to let it be and not have x64 default platform.
 2016-10-16 20:22:46 +01:00
Ted John 5b9f7904ea Update dependencies for Windows and remove certificates 2016-10-16 16:11:33 +01:00
Ted John 9635fbaa77 Update openrct2.vcxproj.user 2016-10-16 11:07:39 +01:00
Ted John 70c26b470b Merge pull request #4624 from IntelOrca/build/win32-no-rct2 
Deliver no RCT2 builds for Win32
 2016-10-16 00:32:54 +01:00
Ted John a3df31a533 Enable high DPI for Win32 release builds 2016-10-16 00:08:13 +01:00
Ted John fb112ce779 Do not distribute openrct2.dll anymore 2016-10-16 00:06:58 +01:00