mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 13:03:11 +01:00
Code Issues Releases Wiki Activity
14,629 Commits 8 Branches 59 Tags
8787cb4d074feba56642b145d347d42c85ff888b
Commit Graph

14629 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Ted John
35df72e61f Remove use of gCurrentLanguage 2018-05-11 20:39:00 +01:00
Ted John
7b28078da2 Remove use of gUseTrueTypeFont 2018-05-11 20:37:48 +01:00
Ted John
8681b4fac9 [wip] Create new localisation service 2018-05-11 20:37:48 +01:00
Michał Janiszewski
090c444353 Destroy context in TileElementWantsFootpathConnection::TearDownTestCase 
Not destroying the context might upset some compilers due to the order
of destruction of variables the context might still require.
 2018-05-11 20:37:48 +01:00
Ted John
466c465d44 Use unique_ptr and shared_ptr for IDrawingEngine 2018-05-11 20:37:48 +01:00
Ted John
7b610fd3c0 Use shared_ptr more for UiContext in relation to DrawingEngine 2018-05-11 20:37:48 +01:00
Ted John
7dc170ef85 Use shared_ptr for long-life objects 
Use unique_ptr and shared_ptr for IContext, IPlatformEnvironment, IUiContext, and IAudioContext.
 2018-05-11 20:37:48 +01:00
Michael Steenbeek
c7b40cec7c Merge pull request #6936 from AaronVanGeffen/widgets/cleanup-2 
Draw dropdown captions directly through widget
 2018-05-11 20:45:58 +02:00
Aaron van Geffen
afd1dee580 Leftover cleanup of unnecessarily setting widget types. 2018-05-11 19:39:51 +02:00
Aaron van Geffen
56b9f5ff16 Removed unused string from audio options. 2018-05-11 19:39:47 +02:00
Aaron van Geffen
5ecb2d951e Draw misc options' dropdown captions directly through widgets. 2018-05-11 19:39:47 +02:00
Aaron van Geffen
fe044477c2 Draw interface options' dropdown captions directly through widgets. 2018-05-11 19:39:47 +02:00
Aaron van Geffen
bf817d2312 Draw culture options' dropdown captions directly through widgets. 2018-05-11 19:39:47 +02:00
Aaron van Geffen
13f3fb3448 Draw audio options' dropdown captions directly through widgets. 2018-05-11 19:39:47 +02:00
Aaron van Geffen
adf3e55d9b Draw display options' dropdown captions directly through widgets. 2018-05-11 19:39:47 +02:00
Ted John
136ec256aa [ci skip] Update vscode cpp properties 2018-05-11 18:34:06 +01:00
Michał Janiszewski
ad0060f2b9 Use rapidjson with hack for GCC8 (#7503) 
To be removed once https://github.com/Tencent/rapidjson/issues/1205 is fixed
 2018-05-11 16:15:36 +02:00
Tomas Dittmann
cb162edcfe Fix #7331: Invention list crashes upon removing previously-enabled ride/stall entries 2018-05-11 13:28:56 +02:00
Michael Steenbeek
5284b67546 Merge pull request #6896 from rwjuk/flattd6 
Implement #1417: Allow saving flat ride designs to TD6
 2018-05-11 11:19:15 +02:00
Michael Steenbeek
83b76b37b0 Bump network version, update changelog 2018-05-11 11:18:52 +02:00
rwjuk
9a167bb9d3 Disable saving without scenery for flat rides 2018-05-10 20:54:53 +02:00
Richard Jenkins
41f0b181bf Display flat rides correctly in previews 2018-05-10 20:54:53 +02:00
rwjuk
066980a9d4 Initial implementation of track saving for flat rides 2018-05-10 20:54:53 +02:00
Michał Janiszewski
d658dbbb4e Add base-devel to Arch Dockerfile 
awk seems to be needed for gathering coverage, but is not available in the base system.

To avoid issues like this and previous systemd/udev missing, add whole base-devel package
 2018-05-10 15:32:39 +02:00
Michał Janiszewski
d15d5c6d6c Merge pull request #7501 from OpenRCT2/android-fix-zip 
Fix Android Zip changes
 2018-05-10 09:43:41 +02:00
Michael Steenbeek
83b4bcb068 Prepare tunnel door support 2018-05-10 09:39:33 +02:00
Michał Janiszewski
7a94a0ce6f Stop requesting Precise for Android jobs 2018-05-09 21:27:09 +02:00
Michał Janiszewski
d965553cae Fix Android Zip changes 2018-05-09 15:59:05 +02:00
Duncan
7b8507cb22 Merge pull request #7404 from OpenRCT2/peep 
Peep Refactor
 2018-05-08 20:22:39 +01:00
duncanspumpkin
27bed3522c Fix desync issue due to mistaken refactor 2018-05-08 19:21:15 +01:00