mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 19:43:06 +01:00
Code Issues Releases Wiki Activity
14,392 Commits 8 Branches 59 Tags
c2c5afa62cfcaa5a22449efb6e4d5feb3f6aa031
Commit Graph

11029 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Michael Steenbeek
855baadd4c Remove incorrect sujeonggwa spelling 2018-03-29 14:31:17 +02:00
Michael Steenbeek
cfb5a6b39d Correct spelling of 'sujonkwa' 2018-03-29 13:00:01 +02:00
Michał Janiszewski
dcc834ae0a Mark ObjectJsonHelpers::GetFlags<T> as static 2018-03-28 23:45:48 +02:00
Ted John
742edd45da Update loading object images to use inclusive ranges 2018-03-28 22:26:13 +01:00
Gymnasiast
5eeecd82bd Remove fixes to vanilla objects (moved to JSON) 2018-03-28 22:41:57 +02:00
Ted John
b8ae3f5e91 Fix cookie json item name 2018-03-28 21:13:59 +01:00
Hielke Morsink
a2fe309be0 Merge pull request #7355 from Broxzier/fix/virtual-floor-zero-height 
Fix #7303 Visual glitch with virtual floor near map edges
 2018-03-28 12:48:39 +02:00
Hielke Morsink
8c23f16502 Merge pull request #7354 from Broxzier/fix/clip-height-assumes-order 
Fix clipheight assuming tile order
 2018-03-28 12:48:03 +02:00
Ted John
617c14b868 Do not overwrite car.flags 2018-03-27 22:36:31 +01:00
Michał Janiszewski
ce06550b8f Fix mismatched deleter in ~ImageTable() 2018-03-27 23:17:35 +02:00
Hielke Morsink
8adfd9a87c Fix #7303 Visual glitch with virtual floor near map edges 2018-03-27 23:09:41 +02:00
Ted John
808296e91f Change json shop names to OpenRCT2 names 2018-03-27 21:55:38 +01:00
Hielke Morsink
9f7d4f1bc4 Fix clipheight assuming tile order 
Instead of breaking the loop when running into an element that's above the clip height, only skip it - the next element may still be below the clip height.
The check for the first tile could be removed entirely. The screen gets cleared every frame when the clip height flag is set already.
 2018-03-27 22:17:58 +02:00
Michał Janiszewski
fa11f05dba Remove unused variable 2018-03-27 20:46:12 +02:00
Michał Janiszewski
c4d5920140 Fix catching of polymorphic exception 2018-03-27 20:45:02 +02:00
Gymnasiast
566af0c4f7 Remove residual usages of rideEntry->enabledTrackPieces 2018-03-27 20:40:50 +02:00
Duncan
1b2b020246 Merge pull request #7343 from ZehMatt/ga-stringbased 
Implement some game actions for naming things
 2018-03-27 18:55:28 +01:00
ZehMatt
bcbe6ecbff Remove unnecessary include 2018-03-27 16:29:56 +02:00