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

14431 Commits

Author SHA1 Message Date
Ted John 41b3a33af4
Merge pull request #7430 from IntelOrca/fix/scan-objects 
Fix scan objects and run before tests
 2018-04-22 22:11:03 +01:00
Michał Janiszewski 0b7fe2a71c Execute scan-objects on Travis 2018-04-22 22:42:20 +02:00
Hielke Morsink 30063984e6
Delete unused function arguments or mark them so (#7426) 
This aims to make future refactoring easier. The arguments are removed where possible, but kept and marked with C++17's [[maybe_unused]] where they could not be removed (e.g. when they are used as a callback, rather than called directly).

I've skipped the rides/<category>/* and peep/* source files, because the rides source files are mostly generated and have a ton of unused variables, and the peep source files are being refactored.
I've also skipped most of window/* source files, because most of the functions are used as callbacks and will be bulk-renamed at some point.
 2018-04-20 13:56:37 +02:00
Manuel Vögele 588e6f32c4 Rename vehicle_is_boat_on_water to better reflect the actual functionality (#7421) 
* Rename and refactor `vehicle_is_boat_on_water` to better reflect the actual functionality

New name is `vehicle_boat_is_location_accessible`

* Refactor `vehicle_boat_is_location_accessible` take `TileCoordsXYZ` as parameter
 2018-04-20 12:50:11 +01:00
Ted John 24b3df58db Use low importance for scan-objects in msbuild proj 2018-04-20 00:23:07 +01:00
Ted John 4ce4101ac5 Ensure correct language is used for scan-objects 2018-04-20 00:12:40 +01:00
Ted John edb9dc39ab Pass object repository as a dependency when loading objects 2018-04-19 23:51:05 +01:00
Ted John 6fc963b5d4 [ci skip] Update .gitignore 2018-04-19 22:37:34 +01:00
Ted John 4edb450594 Run scan-objects before the tests 2018-04-19 13:26:31 +01:00
Ted John 6526f9f6cb Fix scan-objects CLI action 
Ensure a context is available when objects are loaded.
 2018-04-19 13:26:19 +01:00
Hielke Morsink 2512e4959c
Merge pull request #7422 from Broxzier/fix/7402-path-connection-different-entrance-z 
Fix/7402 path connection different entrance z
 2018-04-18 12:35:34 +02:00
Michał Janiszewski 4d7d7500a1 Fix CMake for test_tile_elements 2018-04-17 20:43:49 +02:00
Hielke Morsink f661d48d90 Add tests for tile_element_wants_path_connection_towards 2018-04-17 20:43:49 +02:00
Hielke Morsink 99d8c83807 Fix #7402 Properly check for entrance location before disconnecting paths 2018-04-17 20:43:49 +02:00
Michał Janiszewski a1e0e63633
Fix Travis builds by using tagged discord-rpc version 2018-04-17 20:35:36 +02:00
Ted John efb9f8a006 Enable full debug information for MSVC 2018-04-17 17:41:04 +01:00
Aaron van Geffen 11207f9c41 Re-introduce zebra striping. 2018-04-16 22:11:53 +02:00
Aaron van Geffen 97d1c296a4 Increase row height for object load error window. 2018-04-16 22:11:53 +02:00
Manuel Vögele 7983bcc3a7 Add .editorconfig 2018-04-16 21:07:51 +02:00
Albert Morgese a3b04a67b2 Implement #1675: Auto-rotate shops to face footpaths 2018-04-16 20:02:46 +02:00
Ted John d0ad94bb5e
Merge pull request #7412 from IntelOrca/cmake/msvc 
Add basic support for MSVC to cmake scripts
 2018-04-14 22:30:57 +01:00
Manuel Vögele e4b42f58a5 Fix the order predicate for GameCommands 
This commit bumps the network stream version
 2018-04-14 22:47:41 +02:00
Ted John 0ea81d7df4 Enable warnings as errors 2018-04-14 17:50:32 +01:00
Ted John fc83f72fc6 Add a default / example CMakeSettings.json for VS 2018-04-13 21:56:58 +01:00
Gymnasiast 5d85ea1410 Add some missing issues to changelog [ci skip] 2018-04-13 21:22:33 +02:00
Ted John f24b1bdfa6 Enable curl, openssl and freetype libraries for msvc 2018-04-13 19:21:03 +01:00
woj1993 4b372120f1 Fix #6141: CSS50.dat is never loaded (#7357) 2018-04-13 11:29:31 +01:00
Gymnasiast 4c676e6000 Fix #6134: Scenarios incorrectly categorised when using Polish version of RCT2 2018-04-13 09:07:01 +02:00
Ted John 3b1be25620
Merge pull request #7398 from IntelOrca/enable-integration-tests 
Enable integration tests
 2018-04-12 23:32:39 +01:00
Ted John c59f342f2f Use correct SDL2 library in debug builds 2018-04-12 23:31:33 +01:00
Ted John b8d8d24d21 Get cmake working with msvc for basic game 2018-04-12 23:07:18 +01:00
Michał Janiszewski 36f86440d9 Perform install target on Travis/docker64 2018-04-12 22:06:42 +02:00
Michał Janiszewski effc8657aa Add install prefixes to Travis jobs 2018-04-12 22:06:42 +02:00
Michał Janiszewski 22c755f820 Fix tests on travis 2018-04-12 22:06:42 +02:00
Gymnasiast 60b864441a Fix encoding of scenario index names 2018-04-12 13:13:14 +02:00
Duncan 073d0f78cf
Merge pull request #7225 from duncanspumpkin/peep_update 
Refactor peep update
 2018-04-11 19:39:51 +01:00
duncanspumpkin c2c5afa62c Fix mistaken assignment 2018-04-11 18:58:48 +01:00
duncanspumpkin e4e514c743 Fix travis errors. Revert mistaken rename. 
Use enum where known

Remove unused cases
 2018-04-11 18:16:23 +01:00
duncanspumpkin e954865b49 Fix waypoints for json changes 2018-04-11 18:16:16 +01:00
duncanspumpkin 765500adfa Label offsets and functions 
Actually save before commiting

Label more peep vars.

Remove unread var

Further refactoring

Fix mistake in map element type
 2018-04-11 18:16:09 +01:00
duncanspumpkin a24c2672fd Label all peep ride sub states 
Add additional notes to function.

Perform exorcism on code base

Use vector for carArray
 2018-04-11 18:15:47 +01:00
duncanspumpkin 376c40f1d4 Make peep loading positions nicer 
Change name to waypoints. Rework
 2018-04-11 18:15:28 +01:00
duncanspumpkin c96c7b29df Breakup substate 1 add asserts 2018-04-11 18:13:19 +01:00
duncanspumpkin fc14f6e635 Refactor peep update ride sub state 0 2018-04-11 18:13:17 +01:00
Ted John 58306e8055 Set tests output directory to bin 
This is the easiest way to allow the tests to use the OpenRCT2 data for msbuild.
 2018-04-10 18:00:02 +01:00
Ted John 1cd88a1641
Fix #7367: 'invalid name for park' shown when opening a scenario (#7394) 
Apply extra changes from my own implementation of ParkSetNameAction
which re-introduces logging and calls the action directly from the UI
layer.
 2018-04-10 17:14:32 +01:00
Ted John 9a10de7442 Enable integration tests on CI 2018-04-10 13:28:26 +01:00
Ted John fe3c136083 Set no graphics for integration tests 2018-04-10 13:19:48 +01:00
Hielke Morsink dc673a64d8 Give context the ownership of repositories and the object manager (#7340) 
This makes them no longer a singleton, which fixes annoying behaviour when launching multiple contexts in one game session.
 2018-04-10 13:19:23 +01:00
Ted John 8fbe6e63d8 Add gtest include directory [ci skip] 
...to vscode cpp properties
 2018-04-10 12:25:56 +01:00