mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 08:12:53 +01:00
Code Issues Releases Wiki Activity
14,422 Commits 8 Branches 58 Tags
6526f9f6cb891036cfbbc0eda0102b46bef845aa
Commit Graph

14422 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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