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

14493 Commits

Author SHA1 Message Date
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
Ted John 124fb0df90 Fix out of bounds error in window_editor_object_selection_scroll_mouseover 2018-04-09 17:46:43 +01:00
Michael Steenbeek 7ebd7f1194
Increase network version 2018-04-09 16:50:17 +02:00
Michael Steenbeek 92ba2dfb01 Make seatsInPairs default to true 2018-04-09 16:05:21 +02:00
Michael Steenbeek b0413231b3
Update changelog for #2611 [ci skip] 2018-04-09 09:33:11 +02:00
OpenRCT2 git bot 396a234c8a Merge Localisation/master into OpenRCT2/develop. 2018-04-09 04:00:27 +00:00
Ted John dea5d2754b Search ObjData recursively 
Enable recursive searching ObjData for Windows and non-Windows. This allows players to continue using sub directories for their official objects, e.g. WW and TT. There will be a slight performance hit if all objects are in a sub directory as a search is done for each official object that is loaded.
 2018-04-08 19:03:33 +01:00
Ted John 9dba4a87cc Fix #7389: Path items cannot be placed on sloped paths 
Handle isAllowedOnQueue and isAllowedOnSlope separately
 2018-04-08 18:46:01 +01:00
NathanZabriskie cc256997ef Opening the mini-map reverts the size of the land tool to 1x1, regardless of what was selected before. #7382 (#7387) 
* Opening the mini-map reverts the size of the land tool to 1x1, regardless of what was selected before. #7382
* Updated changelog and contributors
 2018-04-08 19:34:36 +02:00
Ted John bb423194c1 Update vscode cpp properties 2018-04-08 13:02:39 +01:00
Ted John c734738208 Fix AppVeyor builds 
Prepend chocolatey NSIS to %PATH% so system install is not used.
 2018-04-08 13:02:39 +01:00
Michael Steenbeek f98aae12f1 Fix building g2.dat if the path contains spaces/apostrophes (#7388) 2018-04-08 12:25:54 +01:00
Duncan 0ab3d0955c
Merge pull request #7310 from OpenRCT2/json-objects 
Add support for new JSON object format
 2018-04-08 10:45:55 +01:00
Ted John 4c9d047b52 Update android build to download objects 2018-04-06 10:45:08 +01:00
Ted John 06da0b2fb5 Update vscode cpp properties [ci skip] 2018-04-05 21:24:52 +01:00
OpenRCT2 git bot 57b8ea4a89 Merge Localisation/master into OpenRCT2/develop. 2018-04-05 04:00:41 +00:00
OpenRCT2 git bot 7d16d65283 Merge Localisation/master into OpenRCT2/develop. 2018-04-02 04:00:41 +00:00
OpenRCT2 git bot 738b256895 Merge Localisation/master into OpenRCT2/develop. 2018-04-01 04:00:34 +00:00
Michał Janiszewski 66d1fa2bc8 Fix MinGW header checks 2018-03-31 23:48:15 +02:00
Michał Janiszewski b26d484726 Fix remaining headers 2018-03-31 23:48:15 +02:00
Hielke Morsink b62017657b Fix header dependencies for openrct2-ui 2018-03-31 23:07:14 +02:00
Hielke Morsink a51462b0fd Include necessary files for compiling headers 
This commits works towards #7289. It includes files that it depends on, or forward declares types when possible. It may seem like this only increases compilation time, but before this commit they depended on the other includes of the source files that use them.
 2018-03-31 23:07:14 +02:00
Fusxfaranto 69bb1cdf82 Use STR_NONE over magic number, and conform to style guide 2018-03-31 10:54:41 +02:00
Fusxfaranto 74361dcf87 Add different titles for multiplayer window tabs (#2989) 2018-03-31 10:54:41 +02:00
Ted John 63e9275b60 Protect against unknown ride types 2018-03-30 16:58:12 +01:00
Ted John 375deb0c9f Include string not cstring 2018-03-30 16:53:55 +01:00
Hielke Morsink aa7fb35839 Remove use of 'using namespace' from headers 2018-03-30 17:14:10 +02:00
Michał Janiszewski 3b7864957a Cleanly shutdown in case of invalid g1.dat (#7361) 2018-03-30 15:38:22 +01:00
Michał Janiszewski 7443c66025 Fix validation of rct_ride_entry_vehicle for 32 bit builds 
Also enables packing only for testpaint
 2018-03-30 14:06:33 +02:00
Michał Janiszewski 64af3d25d4
Provide error message for older version of static_assert 2018-03-30 13:42:25 +02:00
Michał Janiszewski 4e44d6ef9c
Validate alignment of peep_loading_positions at compile time 2018-03-30 13:16:26 +02:00
deurklink e960b3f150 Increment network version (#7359) 
Both PRs #7343 and #7347 changed the network version from '1' to '2'.
 2018-03-29 21:20:26 +02:00
Ted John bb5b531f0c Use resize instead of push_back 2018-03-29 17:59:49 +01:00
Ted John bc5f253ce2 Update objects to latest v1.0 2018-03-29 17:56:03 +01:00
Michael Steenbeek 855baadd4c Remove incorrect sujeonggwa spelling 2018-03-29 14:31:17 +02:00
Michael Steenbeek 68545e22da Remove en-GB overrides for vanilla objects 2018-03-29 13:11:20 +02:00
Michael Steenbeek cfb5a6b39d Correct spelling of 'sujonkwa' 2018-03-29 13:00:01 +02:00
Ted John b163064f6c Update objects to v1.0 2018-03-28 23:15:32 +01:00
Michał Janiszewski dcc834ae0a
Mark ObjectJsonHelpers::GetFlags<T> as static 2018-03-28 23:45:48 +02:00