mirrors/OpenRCT2
2
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2024-08-30 14:06:07 +02:00
Code Issues Projects Releases Wiki Activity
14872 commits 9 branches 41 tags 335 MiB
Commit graph

14872 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aaron van Geffen
764c3d01b6 Fix the Xcode project's openrct2-cli target. 2018-05-22 17:36:17 +02:00
Aaron van Geffen
3ed6a25bbb
Fix park value regression from #7543. 2018-05-22 11:42:21 +02:00
Michael Steenbeek
d44d727fac
Merge pull request #7543 from AaronVanGeffen/refactor/park 
Create new Park class
 2018-05-21 10:17:38 +02:00
Ted John
080330070b Write file index even if there are no files 2018-05-20 18:40:06 +01:00
Ted John
efc14fe8b6 Do not create title sequences directory unnecessarily 2018-05-20 18:39:52 +01:00
Ted John
46300f216f Fix #7544: Freeze when starting headless server with no arguments 
Fixes #7313: Loading an invalid path with openrct2 produces results different than expected

Do not load title sequences in headless mode and prevent use of null audio mixer when ride music is stopped.
 2018-05-20 02:21:44 +01:00
Aaron van Geffen
bfa5bf6ecc Refactor procedural park methods into Park calls. 2018-05-19 20:21:18 +02:00
Hielke Morsink
72b66c6c9d
Merge pull request #7483 from oli414/new-new-offroad-staff 
Fix #7418: Staff walk off paths with a connection but no adjacent path
 2018-05-19 19:55:24 +02:00
Aaron van Geffen
c211ac5a7b Replace singleton Park with relevant Context call. 2018-05-19 19:51:47 +02:00
Michał Janiszewski
8b3cad5ca0 Ensure park_init is only called on constructed parks 2018-05-19 19:44:01 +02:00
Ted John
665f34326b Move week update for park to park class 2018-05-19 19:44:01 +02:00
Ted John
1db2a4986f Rename gTotalRideValue to gTotalRideValueForMoney 2018-05-19 19:44:01 +02:00
Ted John
5a7e34a267 Move park initialisation to park class 2018-05-19 19:44:01 +02:00
Ted John
8929e5533b Move more calculation and logic to park class 2018-05-19 19:44:01 +02:00
Ted John
b705e0ce7a Move update histories to park class 2018-05-19 19:44:01 +02:00
Ted John
1ab3863257 Move more park functions into class 2018-05-19 19:44:01 +02:00
Ted John
721dc00778 Move park_update into Park class. 
Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
 2018-05-19 19:44:01 +02:00
Ted John
0d6cde2cdb Create a Park class 2018-05-19 19:43:39 +02:00
Hielke Morsink
e3ba7e55eb
Bump network version 2018-05-19 19:35:58 +02:00
oli414
8c5b56dda1 Fix #7418: Staff walk off paths with a connection but no adjacent path 2018-05-19 15:46:08 +02:00
deurklink
996ca5a880 Fix #7528: Tab changing in park pricing window happens on mousedown instead of mouseup (#7542) 2018-05-19 14:57:05 +02:00
wolfreak99
8c9b56d0f2 Keep "Save track design" dropdown open (#7531) 2018-05-19 14:13:08 +02:00
ζeh Matt
ee56021067 Minor code cleanup. (#7538) 2018-05-18 22:50:57 +02:00
OpenRCT2 git bot
db4ddecdee Merge Localisation/master into OpenRCT2/develop. 2018-05-18 04:01:45 +00:00
Ted John
29fb1b7692 Fix #7534: Train/No.cars/Vehicles quantities frozen on custom or pre existing rides 2018-05-17 19:05:45 +01:00
OpenRCT2 git bot
4cb4c0bbef Merge Localisation/master into OpenRCT2/develop. 2018-05-17 04:01:32 +00:00
Ted John
34531f7afb
Fix signed/unsigned mismatch warnings (#7529) 
Unignore MSVC warning: C4245:
'conversion_type': conversion from 'type1' to 'type2', signed/unsigned mismatch
 2018-05-16 21:22:17 +01:00
Michał Janiszewski
a2ef4bd699
Exclude pre-formatted blocks from clang-format (#7520) 
[ci skip]
 2018-05-16 20:41:29 +02:00
Umdlye
94f005a839 Update cut-away view tooltip to reflect horizontal clipping feature (#7525) 2018-05-16 15:04:32 +02:00
Hielke Morsink
9cec47c6e6 Remove duplicated code (#7527) 
The same check is performed later on right before `edgeStyle` gets used.
 2018-05-16 15:03:58 +02:00
Michael Steenbeek
b371087e47
Update objects version to v1.0.2 2018-05-16 14:54:15 +02:00
OpenRCT2 git bot
1ec9ef5edd Merge Localisation/master into OpenRCT2/develop. 2018-05-16 04:00:40 +00:00
Ted John
3e322ec683 [ci skip] Remove superfluous slash in dockerfile 2018-05-15 23:22:34 +01:00
Michał Janiszewski
543efd8822 Fix #7497: openrct2-cli docker image is broken (#7524) 
Update openrct2-cli docker file for Ubuntu 18.04.
See https://github.com/OpenRCT2/OpenRCT2/pull/7523

Also includes a basic test to verify load-ability of produced binary.
 2018-05-15 23:11:24 +01:00
Michał Janiszewski
7ea308f969
Drop unneeded compiler options (#7526) 
We should be able to use `-gz` properly now and there's no need for
static libstdc++ as we're using the system's default version.
 2018-05-16 00:06:45 +02:00
Michał Janiszewski
2e7efdc180
Update Ubuntu docker images to Ubuntu 18.04 (#7523) 2018-05-15 23:14:00 +02:00
Duncan
174acdb68d
Merge pull request #7380 from blackhand1001/patch-3 
Fix guest/staff speed when they enter a ride from a sloped path
 2018-05-15 21:07:17 +01:00
Michał Janiszewski
859c7f8901 Add ICU package to docker images 
For upcoming https://github.com/OpenRCT2/OpenRCT2/pull/7385
 2018-05-15 21:08:44 +02:00
blackhand1001
c14056fd2a Fix guest/staff speed when they enter a ride from a sloped path 2018-05-15 16:56:33 +02:00
Hielke Morsink
c875f46847
Add missing issue number and full stop 2018-05-15 16:39:14 +02:00
Aaron van Geffen
829ac11bec
Merge pull request #7519 from IntelOrca/refactor/new-object-types-prep 
Refactor code around object types
 2018-05-15 15:10:16 +02:00
Aaron van Geffen
19442eb6c2
Merge pull request #7510 from Broxzier/feature/horizontal-clipping 
Horizontal Clipping
 2018-05-15 14:55:05 +02:00
Hielke Morsink
6c65c3d64d
Merge pull request #6774 from janisozaur/fixes 
Various code improvements
 2018-05-15 14:38:43 +02:00
Ted John
58241d33fc Use constant for max ride categories 2018-05-15 12:08:44 +01:00
Hielke Morsink
7f4663ffb8 Fix test-paint build 2018-05-15 12:55:29 +02:00
William Fu
aece198560 Fix #7341: Staff may auto-spawn on guests walking outside of paths 
Staff placement code has been modified to only count guests who are on path tiles.
If all guests in the park are off paths, then the park entrance is used as a fallback.
 2018-05-15 12:19:07 +02:00
Aaron van Geffen
59e682a835
Merge pull request #6807 from ZehMatt/ga-removewall 
Refactors GAME_COMMAND_REMOVE_WALL to a GameAction.
 2018-05-15 09:54:37 +02:00
Hielke Morsink
1721a397fc Fix drawing edges for surfaces with water 2018-05-15 01:41:54 +02:00
Ted John
6f00e6aafe Make ObjectRepositoryItem C++ 2018-05-15 00:36:35 +01:00
Ted John
f8271e93b0 Refactor code base to allow easy addition of new object types 2018-05-15 00:32:36 +01:00