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
Hielke Morsink
efded3e0d2
Always paint edges for tiles next to tiles that don't get drawn
...
This also makes it so that when a surface is cut off by the clip height, the neighbour tiles will draw the edges too, making the surface appear as a pit instead of a blank tile.
I've renamed some of the variables and added a few comments to make the code easier to understand. I've also left a todo comment for a future improvement - the current call isn't expensive so it won't become a bottleneck in the meantime.
2018-05-15 00:21:03 +02:00
Michael Steenbeek
fcf507e051
Spin off shop item stuff to separate files
2018-05-14 19:21:43 +02:00
Ted John
afdcff8f9a
Merge pull request #7512 from IntelOrca/feature/parkobj
...
Introduce parkobj and json object .png support
2018-05-14 18:08:54 +01:00
Hielke Morsink
a8e1c750eb
Bump network version
2018-05-14 15:47:35 +02:00
Hielke Morsink
9f0d820b7c
Use TileCoordsXYZD for wall locations
2018-05-14 12:36:45 +02:00
OpenRCT2 git bot
bd5b1376cb
Merge Localisation/master into OpenRCT2/develop.
2018-05-14 04:00:31 +00:00
Aaron van Geffen
8c3766288b
Address clang 6.0 compilation errors.
2018-05-13 23:22:40 +02:00
Ted John
20fdd46b96
Fix #7513 : OpenRCT2 freezes on shutdown ( #7514 )
...
Store drawing engine and painter inside Context so that it is disposed before Context.
2018-05-13 15:52:59 +01:00
Ted John
4e86d18dad
Support loading images from zip
2018-05-13 12:04:45 +01:00
Ted John
0f0bb021d6
Add support for raw images
2018-05-13 11:36:35 +01:00
Ted John
73a4d1400d
Read images with offsets
2018-05-13 11:36:35 +01:00
Ted John
580f1baff2
Get basic relative .png loading
2018-05-13 11:36:35 +01:00
Ted John
9aef466b9b
Fix bugs with zip and object manager changes
2018-05-13 11:36:35 +01:00
Ted John
23efe7f339
Load JSON from file or zip
2018-05-13 11:36:35 +01:00
Ted John
3278fd55dc
Merge pull request #7502 from IntelOrca/refactor/imaging
...
Refactor imaging and import
2018-05-13 11:28:13 +01:00
OpenRCT2 git bot
8787cb4d07
Merge Localisation/master into OpenRCT2/develop.
2018-05-13 04:00:28 +00:00
Ted John
3f71be51cc
Fix CreateS4, return new instance not nullptr
2018-05-13 01:30:02 +01:00
Aaron van Geffen
15c13137df
Add missing include.
2018-05-13 01:11:56 +01:00
Aaron van Geffen
2e91fc2c92
Update Xcode project for new image classes.
2018-05-13 01:11:56 +01:00
Ted John
44764874a3
Add test for ImageImporter
2018-05-13 01:11:56 +01:00
Ted John
f212894eb0
Fix clang builds
2018-05-13 01:11:56 +01:00
Ted John
428dd05dcf
Refactor ImageImporter
2018-05-13 01:11:56 +01:00
Ted John
bffbf5857d
Refactor image importer out into new class
2018-05-13 01:11:56 +01:00
Ted John
f0348dafb7
Fix MSVC warning
2018-05-13 01:11:56 +01:00
Ted John
7eb1703f36
Remove old bitmap code via UiContext
2018-05-13 01:11:56 +01:00
Ted John
229c50dff9
Add bitmap reading support
2018-05-13 01:11:56 +01:00
Ted John
ac3233b819
Change consumers to use new imaging API
2018-05-13 01:11:56 +01:00
Ted John
766997f15c
Develop new imaging code
2018-05-13 01:11:56 +01:00
Ted John
4552f6a405
Move Imaging to core
2018-05-13 01:11:56 +01:00
Ted John
4fa45abec9
Remove old C signatures in Imaging.h
2018-05-13 01:11:56 +01:00
Ted John
00278c6ca6
Merge pull request #7432 from IntelOrca/refactor/use-shared-ptr-2
...
Use shared_ptr for long-life objects (part 2)
2018-05-13 01:08:00 +01:00
Ted John
d7e93cec27
Prevent use of Context during ~Context
2018-05-13 00:43:56 +01:00
