mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
14,610 Commits 7 Branches 39 Tags 356 MiB
Commit Graph

14610 Commits

Author SHA1 Message Date
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
duncanspumpkin 6f21614a07 Convert heuristic search to TileCoords 2018-05-08 18:09:45 +01:00
duncanspumpkin 213abaf6e8 Convert path is thin to TileCoords 2018-05-08 17:50:43 +01:00
duncanspumpkin fc39c6c92c Revert incorrect comment find and replace 2018-05-08 17:45:40 +01:00
Olivier Wervers e6ef627fe2 Fix graphs skipping values of 0 2018-05-08 09:20:13 +02:00
Michael Steenbeek 907d318e1c
Make Ride Groups more C++-like 2018-05-07 20:18:06 +02:00
deurklink 0d332cdf68 Implement #7459: Allow opening and closing of parks that use no mone 2018-05-07 19:48:47 +02:00
Ted John 0df569f0e2
Merge pull request #7492 from IntelOrca/refactor/ziparchive 
Improve IZipArchive so that it is more C++
 2018-05-07 17:21:20 +01:00
Hielke Morsink 3c8a2ca55d
Merge pull request #7491 from martip23/CoveredRideHeightFix 
Iterate and check for each element's height for cover. Fixes #7405
 2018-05-07 13:44:35 +02:00
OpenRCT2 git bot 881f54b653 Merge Localisation/master into OpenRCT2/develop. 2018-05-07 04:00:43 +00:00
martip23 eaae453352 Updated changelog 2018-05-07 01:06:37 +02:00
martip23 aca3f1888e Add to contributors 2018-05-07 01:06:37 +02:00
martip23 f579c277c4 Iterate and check for each element's height for cover. Fixes #7405 2018-05-07 01:03:54 +02:00
duncanspumpkin 458b3710c7 Fix pathing getting the wrong tile 2018-05-06 21:34:48 +01:00
Ted John 2ea857a10e Improve IZipArchive so that it is more C++ 2018-05-06 17:46:45 +01:00
Michał Janiszewski 5d102fd40b Sync clang-format with OpenLoco 
- The formatting properties for JavaScript and ObjectiveC have been removed, since "Language: Cpp" is set.
- Remove CommentPragmas - its value doen't apply to our coding style.
- ForEachMacros have been replaced with entries for our own foreach loops.
- Includes age grouped together (unless there's a comment inbetween), with the 'main' include at the top, then local includes "", and finally system includes <>, with an empty line inbetween each group.
- Disable bin-packing of function arguments
- NamespaceIndentation set to 'None'.
- KeepEmptyLinesAtTheStartOfBlocks set to 'false'.
- IndentWrappedFunctionNames set to 'true'.
- Never allow short functions to be on a single line, and remove unnecessary rule for tab width since we don't use tabs.

These changes will need to be synced with OpenLoco.
 2018-05-05 14:46:35 +02:00
Michael Steenbeek ffa73981ac Copy CoordsDirectionDelta to Testpaint 2018-05-05 11:42:49 +01:00
Michael Steenbeek eb0a73cf96 Fix TileDirectionDelta definition in TestPaint 2018-05-05 11:42:48 +01:00
q-- ca6bf696b1 Fix incorrect comment for peep inital energy (#7479) 
Also use % 64 instead of & 0x3F for added clarity.

Removed the 63 + 65 = 128 from the comment since that's fairly obvious
if we're using decimal instead of hexadecimal numbers.

Closes #7384
 2018-05-05 11:42:47 +01:00
blackhand1001 a23f1e4b2c Add behavior for when a scenario has both less and more intense toggled on (#7401) 2018-05-05 11:42:46 +01:00