Matt
b3b9a348c5
Apply review suggestions
2020-09-17 22:16:05 +03:00
Matt
38e03ae45d
Use the Formatter for News items
2020-09-17 22:14:36 +03:00
Matt
ccde06ab0f
Explicitly pass formatter arguments to ShowError and family
2020-09-17 22:14:36 +03:00
Matt
2639349925
Move storage into Formatter class and refactor usage
2020-09-17 22:14:36 +03:00
Michael Steenbeek
1982e8491b
Merge pull request #12667 from mwnciau/json-refactor
...
Migrate JSON library to JSON for Modern C++
2020-09-17 21:11:06 +02:00
OpenRCT2 git bot
27a7ca778f
Merge Localisation/master into OpenRCT2/develop
2020-09-17 04:04:39 +00:00
Richard Fine
b57ed85098
Fixes from review feedback
2020-09-16 21:24:35 -04:00
ζeh Matt
fc2773d68f
Merge pull request #12941 from ZehMatt/code-cleanup
...
Minor code cleanup
2020-09-16 23:38:57 +03:00
Michał Janiszewski
3af8462bb6
Update readme.md to make package list sorted
2020-09-16 20:18:54 +01:00
Michał Janiszewski
8479f133e9
Update OS requirements in readme.txt
2020-09-16 20:18:54 +01:00
Simon Jarrett
4d0f76837d
Update project readme
2020-09-16 20:18:54 +01:00
Simon Jarrett
f3aba68e46
Update project build files
2020-09-16 20:18:54 +01:00
Simon Jarrett
660c137958
Refactor Version to use new JSON library
2020-09-16 20:18:54 +01:00
Simon Jarrett
2c92c652e2
Refactor ObjectLoadError to use new JSON library
2020-09-16 20:18:54 +01:00
Simon Jarrett
57a57b0c02
Refactor Theme to use new JSON library
2020-09-16 20:18:54 +01:00
Simon Jarrett
12dfa74eef
Refactor CmdlineSprite to use new JSON library
2020-09-16 20:18:54 +01:00
Simon Jarrett
0c58dfa1b3
Refactor objects to use new JSON library
2020-09-16 20:18:53 +01:00
Simon Jarrett
97b44a7181
Refactor ObjectFactory to use new JSON library
...
- Removed a few try-catch blocks as this is now handled in Json::Read[...]
2020-09-16 20:18:53 +01:00
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
Matt
3eff713765
Remove unused Registration.hpp
2020-09-16 20:23:39 +03:00
Matt
16fc41e6bf
Always return unique_ptr for the IniReader/IniWriter interface
2020-09-16 20:23:39 +03:00
Matt
d0d5cc5179
Remove unused declarations
2020-09-16 20:23:34 +03:00
OpenRCT2 git bot
564cc7b635
Merge Localisation/master into OpenRCT2/develop
2020-09-16 04:04:36 +00:00
frutiemax
af591c834b
Part of #12097 : Use ScreenRect on gfx_fill_rect_inset (1) ( #12938 )
...
* Part of #12097 : Use ScreenRect on gfx_fill_rect_inset (1)
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-09-16 00:02:22 -03:00
rpstester
48f1335559
Add rpstester to list of Bug Fixes ( #12937 )
...
* Add rpstester to list of Bug Fixes
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2020-09-15 22:31:24 -03: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
Richard Fine
4f31ddaca4
Make menu data declarations local to the functions using them
2020-09-13 16:30:17 -04:00
Richard Fine
a51d8e4deb
Convert cheats menu to use new constexpr menu specification
2020-09-13 16:16:05 -04:00
Richard Fine
ce99928b81
Convert view menu to use new constexpr menu specification
2020-09-13 16:15:53 -04:00
Richard Fine
4a9974fda6
Introduce mechanism for configuring dropdown menu with static data
...
For menus with static content, provide a mechanism for building the menu items as a constexpr array, allowing developers to specify menus more concisely and to put the data into the .rodata section where it can be quickly copied through.
2020-09-13 16:15:28 -04: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