Commit Graph

9723 Commits

Author SHA1 Message Date
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
Michał Janiszewski 46021ed2bf Fix self-assignment in ScenarioRepository 2016-10-17 11:59:10 +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
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
Ted John f051430ea3 Make release Win32 builds NO_RCT2 and Win32 sub system 2016-10-15 23:39:50 +01:00
Michał Janiszewski f87e60dbd4 Merge pull request #4622 from janisozaur/new-jobs
New Travis-CI jobs
2016-10-16 00:34:04 +02:00
Michał Janiszewski 9e229bcd45 Re-order Travis-CI jobs to improve concurrency 2016-10-16 00:24:12 +02:00
Michał Janiszewski f76c7d794c Make DISABLE_RCT2 imply FORCE32 2016-10-16 00:24:12 +02:00
Michał Janiszewski 2e4a5cd441 Fix mingw builds 2016-10-16 00:24:12 +02:00
Michał Janiszewski 17ab7a4879 Build 32 bit builds with mingw
Mostly because I don't want to update all the libs right now
2016-10-16 00:24:12 +02:00
Michał Janiszewski 8266c08215 Add docker64 entry to travis scripts 2016-10-16 00:24:11 +02:00
Michał Janiszewski 6c8c1a90fe Update travis jobs to use new default configuration 2016-10-16 00:24:11 +02:00
Michał Janiszewski 53ee6c2e28 Update CMake configuration to produce native, NO_RCT2 builds by default 2016-10-16 00:24:11 +02:00
Ted John 96b796a78c msbuild: Build x64 by default 2016-10-15 22:44:24 +01:00
Ted John f519bc6cad Fix bugs 2016-10-15 21:50:52 +01:00
Michał Janiszewski 00c47b8a04 Fix clang builds
Redeclaring the same typedef is not legal in C < 11, but a
forward-declaration works just fine for having a pointer to struct. No
changes needed in .cpp, as it includes the `typedef` from `object.h`
(via `scenario.h`).
2016-10-15 21:50:52 +01:00
LRFLEW f776527a2b Fix Warnings in Xcode 2016-10-15 21:50:52 +01:00
LRFLEW 75f72f8687 Update Xcode Project 2016-10-15 21:50:52 +01:00
Ted John babf261542 Refactor scenario list to C++ 2016-10-15 21:50:52 +01:00
Ted John b7f7af3123 Refactor scenario sources to C++ 2016-10-15 21:50:52 +01:00
Michał Janiszewski e8e1b702f6 Add 64 bit docker file with Arch Linux in it 2016-10-15 22:41:39 +02:00
Ted John 3b8ca9c480 Merge pull request #4618 from IntelOrca/fix/td4-loading
Fix TD4 loading / memory violation
2016-10-15 21:38:47 +01:00
Ted John 15b653e233 Fix track place colours for TD4, version 0 2016-10-15 21:25:29 +01:00
Ted John de341f1d86 Fix td6_reset_trailing_elements
Only one byte, 0xFF terminates the track elements rather than a track element with a type of 0xFF.
2016-10-15 20:57:29 +01:00
Michał Janiszewski 2c58543928 Fix unintialised variables in testpaint 2016-10-15 21:26:29 +02:00
Ted John 5708b2e749 Fix colours for TD4, version 0 designs 2016-10-15 18:56:51 +01:00
Ted John e1a5200332 Fix TD4, version 0 river rapids 2016-10-15 18:56:51 +01:00