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
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
Ted John
529c744276
Use unique_ptr and shared_ptr for services in Context
2018-05-13 00:43:50 +01:00
Ted John
bece5e5429
Merge pull request #7431 from IntelOrca/refactor/use-shared-ptr-1
...
Use shared_ptr for long-life objects
2018-05-13 00:19:43 +01:00
Michał Janiszewski
af00a1de03
Use @IntelOrca's discord-rpc to fix discordapp/discord-rpc#134
2018-05-12 22:08:25 +02:00
Michał Janiszewski
a4750a635d
Update DiscordService for discord-rpc 3.3.0
2018-05-12 22:08:25 +02:00
Michał Janiszewski
9f8e1e7c9c
Use discord-rpc 3.3.0 on Travis
2018-05-12 22:08:25 +02:00
Michał Janiszewski
66d625086d
Update MSVC's libraries to v17, mostly to get discord-rpc 3.3.0
2018-05-12 22:08:25 +02:00
Michał Janiszewski
d284bcc4fe
Filter out spammy messages from gcov 8.1.0
...
gcov 8 outputs **a lot** (gigabytes) of messages like
```
test_tile_elements.dir/test/tests/TestData.cpp.gcno:'main' has arcs to entry block
test_tile_elements.dir/test/tests/TestData.cpp.gcno:'main' has arcs from exit block
test_tile_elements.dir/test/tests/TileElements.cpp.gcno:'main' has arcs to entry block
test_tile_elements.dir/test/tests/TileElements.cpp.gcno:'main' has arcs from exit block
test_tile_elements.dir/test/tests/TileElements.cpp.gcno:'_ZNK9__gnu_cxx13new_allocatorIcE8max_sizeEv' has arcs to entry block
test_tile_elements.dir/test/tests/TileElements.cpp.gcno:'_ZNK9__gnu_cxx13new_allocatorIcE8max_sizeEv' has arcs from exit block
test_tile_elements.dir/test/tests/TileElements.cpp.gcno:'_ZN9__gnu_cxx13new_allocatorIcE8allocateEjPKv' has arcs to entry block
test_tile_elements.dir/test/tests/TileElements.cpp.gcno:'_ZN9__gnu_cxx13new_allocatorIcE8allocateEjPKv' has arcs from exit block
```
which we cannot alleviate, but they overload Travis' log size of 4MiB
causing the jobs to get killed.
This will simply silence those messages.
2018-05-12 22:06:56 +02:00
OpenRCT2 git bot
c89e321f35
Merge Localisation/master into OpenRCT2/develop.
2018-05-12 04:00:50 +00:00
ZehMatt
cd0530d176
Fix use of missing function.
2018-05-11 23:03:19 +02:00
Ted John
9e72e51bab
Use std::unique_ptr for discord service
2018-05-11 20:39:00 +01:00
Ted John
768a6db5eb
Add todo for localisation service calls
2018-05-11 20:39:00 +01:00
Ted John
8eacc3582c
Remove PlainContext
2018-05-11 20:39:00 +01:00
Ted John
302fe00805
Always pass shared_ptr by reference
2018-05-11 20:39:00 +01:00
Ted John
d1cbf998a0
Do not return shared_ptr for LocalisationService
...
GetLocalisationService is currently used a lot, so remove overhead of shared_ptr copy.
2018-05-11 20:39:00 +01:00
Ted John
ad6ebd646c
Remove work around in TileElement test fixture
2018-05-11 20:39:00 +01:00
Ted John
7075f6ca25
Use correct language for scan-objects
2018-05-11 20:39:00 +01:00
Aaron van Geffen
238079ef7f
Update Xcode project for new LocalisationService.
2018-05-11 20:39:00 +01:00
