OpenRCT2 git bot
3df88895f7
Merge Localisation/master into OpenRCT2/develop.
2016-10-18 04:00:21 +00:00
Marijn van der Werf
a44745e2fa
Fix General/SegmentSupportHeightCalls
2016-10-17 23:12:54 +02:00
Marijn van der Werf
4f10555002
Move include to extern C
2016-10-17 21:43:31 +02:00
Jonathan Haas
e0a166d3a3
Reduce volume of toilet sound
2016-10-17 21:42:32 +02:00
Michał Janiszewski
262655e2e0
Validate access to functionNames
...
# Conflicts:
# test/testpaint/Printer.cpp
2016-10-17 21:42:03 +02:00
Marijn van der Werf
871857ee24
Use debug build for Travis testpaint
2016-10-17 21:30:01 +02:00
Marijn van der Werf
d7f27cff72
Fix GCC
2016-10-17 21:28:27 +02:00
Marijn van der Werf
8eac13b867
Run testpaint slightly more silent on Travis
2016-10-17 21:13:10 +02:00
Michał Janiszewski
5f422905b6
Allow testpaint's tests to pass a build
...
This will not pass a segfault, though.
2016-10-17 21:12:07 +02:00
Michał Janiszewski
a617342519
Make 32 build also do `testpaint` target
2016-10-17 21:12:07 +02:00
Marijn van der Werf
c150c968bf
Remove `printf` call
2016-10-17 20:04:24 +02:00
Marijn van der Werf
a93e12b5d9
Add silent mode
2016-10-17 20:04:13 +02:00
Marijn van der Werf
ed9f67cc46
Fix original call
2016-10-17 19:56:26 +02:00
Marijn van der Werf
58e5df75f0
Fix MSVC
2016-10-17 19:16:53 +02:00
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
LRFLEW
0afc593fd3
Update Xcode Project to build x64 macOS Builds
2016-10-16 17:10:48 -05:00