mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-04 13:42:55 +01:00
Code Issues Releases Wiki Activity
19,915 Commits 8 Branches 58 Tags
5f17554c25a0057274ce6666ef511dfdfdbe6e11
Commit Graph

19915 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Jarrett
5f17554c25 Refactor ObjectJsonHelpers 
Move functions in ObjectJsonHelpers to their relevant namespaces and classes
- Move ParseColour to Colour::FromString
- Move ParseCursor to Cursor::FromString
- Move LoadStrings to StringTable::ReadJson
- Move LoadImages to ImageTable::ReadJson
- Move ParseObjectEntry to Object::ParseObjectEntry
- Move GetString, etc. to Json::GetString, etc.
- Delete ObjectJsonHelpers .cpp and .h files
 2020-09-16 20:18:53 +01:00
Simon Jarrett
1b821c1059 Refactor ServerList to use new JSON library 2020-09-16 20:18:53 +01:00
Simon Jarrett
651a2951a1 Refactor NetworkUser to use new JSON library 
- Removed the ToJson(json_t) method
- The FromJson method expects to receive a JSON node of type object (as per added documentation)
- Unlike elsewhere, we need to use iterators for the Save() method to allow us to remove items from the array
 2020-09-16 20:18:53 +01:00
Simon Jarrett
de9a16404b Refactor NetworkServerAdvertiser to use new JSON library 
- the body.dump() calls throughout use the default indent parameter of -1 so will produce JSON with no whitespace
- OnRegistrationReponse must be passed a JSON node of type object
 2020-09-16 20:18:53 +01:00
Simon Jarrett
c655d47dd3 Refactor NetworkGroup to use new JSON library 2020-09-16 20:18:53 +01:00
Simon Jarrett
f1bcf20050 Refactor NetworkBase to use new JSON library 2020-09-16 20:18:52 +01:00
Simon Jarrett
324e94e6ce Fix #9088: refactor JSON code to use a more modern C++ library 
- Removed dependency on jansson
- Implemented nlohmann JSON for Modern C++
- Moved generic GetString, etc., helper functions out of ObjectJsonHelpers.hpp to Json.hpp
- Added GetEnum helper function
- Added AsObject and AsArray helper functions
- Removed GetStringArray, etc., helper functions as they're not needed with the better language features
- Added second GetFlags definition that allows specifying inverted flags - this is a bit cleaner than previous hacks
- Comments!
 2020-09-16 20:18:52 +01:00
Michael Steenbeek
3acbb92074 Merge pull request #12922 from Gymnasiast/LetItSnow2 2020-09-15 18:11:45 +02:00
Tulio Leao
c1729c8a87 Merge pull request #12858 from ju-pinheiro/network-strong-enums 
NETWORK_PERMISSION and NETWORK_AUTH replaced by strong enums
 2020-09-15 08:07:19 -03:00
Gymnasiast
a46a21973f Amend changelog; bump network version 2020-09-14 22:00:54 +02:00
Gymnasiast
ce325fdb9b Also set proper temperature when using weather cheat 2020-09-14 22:00:54 +02:00
Gymnasiast
ac985a8d61 Do not transition to snow for now 2020-09-14 22:00:54 +02:00
Brett
c9de4f49fe Add snow as a weather type 
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
 2020-09-14 21:58:00 +02:00
Gymnasiast
31d20cefb2 Rename rain to weather where appropriate 
Co-authored-by: Brett Penzer <brettpenzer123@live.co.uk>
 2020-09-14 21:57:54 +02:00
rpstester
f7348b1f06 Close #12389: Refactor PeepSittingSubState (#12908) 
* Refactor PeepSittingSubState

* Fix formatting
 2020-09-14 20:11:17 +01:00
frutiemax
2857f9d276 Part of #12097: Use ScreenRect on gfx_fill_rect_inset in Widget.cpp (#12906) 
* Part of #12097: Use ScreenRect on gfx_fill_rect_inset in Widget.cpp

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2020-09-14 08:44:50 -03:00
Michael Steenbeek
0fb307c12e Merge pull request #12921 from OpenRCT2/plugin/extras 
Add quadrants and scenario info to plugin API
 2020-09-13 20:37:53 +02:00
Richard Fine
d21da12f9f Fix 11414: ‘Possible misuse of comma operator’ warnings (#12919) 
Fix the ‘possible misuse of comma operator’ warnings reported by XCode - the two original ones reported in #11414, plus one more in Util.cpp.
 2020-09-13 17:43:59 +01:00
Ted John
e79d4be5a5 Add quadrant and occupiedQuadrants to plugin API 2020-09-13 17:02:12 +01:00
Ted John
146a754001 Add plugin API for scenario and objective 2020-09-13 17:02:12 +01:00
Ted John
e5107141e9 Add plugin API for park flags 2020-09-13 15:00:09 +01:00
Michael Steenbeek
cf5b48a9dd Rename Rain.{cpp,h} to Weather.{cpp,h} (#12914) 2020-09-12 19:32:26 -03:00
Sadret
a9cd89d02e Fix #12912: Plugin: selectedCell of CustomListView (#12913) 2020-09-12 19:24:23 -03:00
Michael Steenbeek
12cc413732 Merge pull request #12344 from Ron4u/fixed-issue-12335 
Close #12335: Eliminate goto statement in footpath_chain_ride_queue()
 2020-09-12 18:10:33 +02:00
Gymnasiast
247de81e3b Apply requested fixes 2020-09-12 13:45:50 +02:00
Ron4u
5fe542dd25 fixed issue 12335 2020-09-12 13:18:00 +02:00
Ted John
eb18a5db81 Fix #12910: Plugin API: getRide sometimes returns null for valid IDs 2020-09-12 12:18:24 +02:00
Michael Steenbeek
ed9c785573 Merge pull request #12903 from tupaschoal/fix-12787-regressions 
Fix #12797 regressions
 2020-09-11 20:04:17 +02:00
Tulio Leao
917fb77f0e Revert regressed warning on window_install_track_paint 2020-09-10 21:19:53 -03:00
Tulio Leao
c2f42cd908 Fix #12901: Guest thoughts show up as guest actions or names 2020-09-10 21:18:42 -03:00
Tulio Leao
2f3d455b3a Merge pull request #12899 from Gymnasiast/refactor/c-style-casts 
Remove most remaining C-style casts
 2020-09-10 20:49:15 -03:00
Aaron van Geffen
c0e551056f Fix #12900: Garbled/distorted date lines in file browser (#12902) 
* Fix #12900: Garbled/distorted date lines in file browser
 2020-09-10 20:47:39 -03:00
ju-pinheiro
214620951f Close #12421: Refactor NETWORK_AUTH to use strong enum 
Replacing enum NETWORK_AUTH with enum class NetworkAuth.
 2020-09-10 19:32:28 -03:00
ju-pinheiro
20a8bbc322 Close #12420: Refactor NETWORK_PERMISSION to use strong enum 
First approach, instead of a bigger refactor to avoid the need of "static_cast".
 2020-09-10 19:32:27 -03:00
Tulio Leao
55f2eeb04d Favour constexpr function over macro on Crypt.CNG.cpp 2020-09-10 21:36:21 +02:00
Tulio Leao
720c17eea6 Cleanup c-style casts from Platform.Win32.cpp 2020-09-10 21:36:21 +02:00
Tulio Leao
e032ba091d Cleanup c-style casts from Shared.cpp 2020-09-10 21:36:21 +02:00
Tulio Leao
2a85374c6a Cleanup c-style casts from Windows.cpp 2020-09-10 21:36:21 +02:00
Tulio Leao
cf5f3da0df Cleanup c-style casts from Socket.cpp 2020-09-10 21:36:21 +02:00
Tulio Leao
fc59cb55a5 Cleanup c-style casts from Path.cpp 2020-09-10 21:36:21 +02:00
Tulio Leao
9d2a9d76d3 Cleanup c-style casts from String.cpp 2020-09-10 21:36:21 +02:00
Tulio Leao
5f47546392 Cleanup c-style casts from Http.WinHttp.cpp 2020-09-10 21:36:21 +02:00
Tulio Leao
5afe6407a1 Cleanup c-style casts from FileWatcher.cpp 2020-09-10 21:36:21 +02:00
Tulio Leao
5abbbf1357 Cleanup c-style casts from Crypt.CNG.cpp 2020-09-10 21:36:21 +02:00
Tulio Leao
cb7e190c8a Cleanup c-style casts from File.cpp 2020-09-10 21:36:21 +02:00
Tulio Leao
de58f0f7a0 Cleanup c-style casts from FileScanner.hpp 2020-09-10 21:36:21 +02:00
Gymnasiast
c83ddefe47 Convert remaining C-style casts to C++-style ones 2020-09-10 21:36:20 +02:00
Michał Janiszewski
d8ffec0ed7 Use correct count of research items when importing park 
Co-authored-by: Hielke Morsink <Broxzier@users.noreply.github.com>
Co-authored-by: Michael Steenbeek <Gymnasiast@users.noreply.github.com>
 2020-09-10 21:01:14 +02:00
Duncan
353c02b596 Add visitors for all scenery placement and removes (#12886) 
* Add visitors for all scenery placement and removes

This should allow greater flexibility for plugin developers

* Add CoordsXYZ visitor

* Increment plugin API version. Update changelog
 2020-09-10 15:15:46 -03:00
tellovishous
96945183f5 Add stroke to lowercase 'L' to differentiate from capital 'I' (#12890) 
The problem with many sans-serif fonts, such as those in RCT2, is that it can be difficult to tell between a lowercase L and an uppercase I, and can be visually ambiguous. What I've done is add a small stroke to the bottom of the lowercase L's so that it will stand out better when it's used next to capital I's.
 2020-09-10 20:07:12 +02:00