Ivan Savenko
54fefd34c7
Merge pull request #3618 from IvanSavenko/json_refactor
...
Json refactor
2024-02-26 15:42:17 +02:00
Ivan Savenko
2549f62661
Added missing field to schema
2024-02-26 14:57:23 +02:00
Ivan Savenko
57eece233b
Ignore BOM at the start of json file
2024-02-26 12:55:49 +02:00
Ivan Savenko
f86708bf37
Fix json5 parsing
2024-02-26 12:55:49 +02:00
Ivan Savenko
5901bf2190
Replace old 'defFile' format with animationFile
2024-02-26 12:55:49 +02:00
Ivan Savenko
c90fb47c23
Converted json validator into a class
2024-02-26 12:55:49 +02:00
Ivan Savenko
d2844a5eeb
Cleared up code
2024-02-26 12:55:49 +02:00
Ivan Savenko
08deae4186
Moved static methods outside of vcmi namespace
2024-02-26 12:55:49 +02:00
Ivan Savenko
757f77378d
Remove unused code
2024-02-26 12:55:49 +02:00
Ivan Savenko
29860848a5
Cleanup
2024-02-26 12:55:49 +02:00
Ivan Savenko
18bbccd167
Unify formatting
2024-02-26 12:55:49 +02:00
Ivan Savenko
2632ab04f5
Partial support for json5
2024-02-26 12:55:49 +02:00
Ivan Savenko
41493d6f67
Implemented 'strict' json support
2024-02-26 12:55:49 +02:00
Ivan Savenko
d1c274f93f
Replaced vector of strings with simple bool for flag
2024-02-26 12:55:49 +02:00
Ivan Savenko
922966dcf8
Renamed JsonNode::meta to more logical modScope. Member is now private
2024-02-26 12:55:49 +02:00
Ivan Savenko
e73516b7d1
Simplified template magic in JsonNode
2024-02-26 12:55:49 +02:00
Ivan Savenko
08a27663f9
Reworked JsonNode constructors to more logical form
2024-02-26 12:55:49 +02:00
Ivan Savenko
54796c7c56
Rename toJson to toString/toCompactString for consistency
2024-02-26 12:55:49 +02:00
Ivan Savenko
a2b8eaf7fb
Do not escape '/' when writing json
2024-02-26 12:55:49 +02:00
Ivan Savenko
25146bfa93
Replace custom class with string_view
2024-02-26 12:55:49 +02:00
Ivan Savenko
ca9a16e30e
Partially updated schema validation to draft v6
2024-02-26 12:55:49 +02:00
Ivan Savenko
cda6899ee2
Merge pull request #3640 from IvanSavenko/fix_thread_race
...
Fix thread race
2024-02-25 21:03:41 +02:00
Ivan Savenko
bc9e961252
Better checks for incoming data
2024-02-25 20:05:52 +02:00
Ivan Savenko
6901945b6e
Fix possible thread race on sending packet from two threads
2024-02-25 20:05:28 +02:00
Ivan Savenko
8647abb94b
Merge pull request #3629 from IvanSavenko/ui_generation
...
Unify graphical primitives elements
2024-02-25 15:02:06 +02:00
Ivan Savenko
7b6b64894c
Merge pull request #3624 from IvanSavenko/fix_crash
...
Fix crash on using heal in SPELL_AFTER_ATTACK bonus
2024-02-25 15:01:32 +02:00
Ivan Savenko
7c843ff0f7
Merge pull request #3627 from IvanSavenko/random_town_names
...
Town names randomization fix
2024-02-25 15:01:22 +02:00
Ivan Savenko
b2be1fe75d
Merge pull request #3633 from Alexander-Wilms/appstream-1.0
...
Update metainfo to conform to AppStream 1.0 spec
2024-02-25 15:00:55 +02:00
Ivan Savenko
8b3f558113
Merge pull request #3634 from Laserlicht/fw_rules
...
firewall rules for client
2024-02-25 15:00:34 +02:00
Tomasz Zieliński
af0207470d
- Increased minimal obstacle density on surface
...
- Decreased minimal obstacle density in the underground
2024-02-25 12:25:23 +01:00
Tomasz Zieliński
2e8801084d
Clean up RMG logs
2024-02-25 11:40:01 +01:00
Laserlicht
a79f1f45f6
firewall rules for client
2024-02-24 15:51:36 +01:00
Alexander Wilms
73a1a188d9
Update metainfo to conform to AppStream 1.0 spec
2024-02-23 19:26:38 +01:00
Ivan Savenko
5053500965
Fix json formatting
2024-02-19 18:02:44 +02:00
Ivan Savenko
8d86216332
Merge pull request #3626 from Alexander-Wilms/float-comparison
...
Fix float comparison
2024-02-19 17:19:53 +02:00
Ivan Savenko
bd901cb001
Replaced lines in settings with primitives
2024-02-19 16:55:07 +02:00
Ivan Savenko
82eea1abc1
Remove unused variable
2024-02-19 16:49:59 +02:00
Ivan Savenko
c513dc1bc7
Fix code style & formatting
2024-02-19 15:59:55 +02:00
Ivan Savenko
7c221e2327
Merge pull request #3628 from IvanSavenko/fix_network_crash
...
Fix network crash
2024-02-19 15:51:35 +02:00
Ivan Savenko
779625415f
Guard against concurrent writes on same asio::socket instance
2024-02-19 13:47:06 +02:00
Ivan Savenko
f620a07389
Add protocol validation
2024-02-19 13:46:07 +02:00
Ivan Savenko
81e44711a2
Remove no longer needed workaround
2024-02-19 13:45:50 +02:00
Ivan Savenko
fe918de2df
Remove invalid assertion
2024-02-19 00:36:21 +02:00
Ivan Savenko
fc252bb9eb
Random town names are now guaranteed to be unique on the map
2024-02-19 00:36:08 +02:00
Ivan Savenko
10b35ceecb
Replaced assertions with exceptions for invalid input in RNG
2024-02-19 00:35:21 +02:00
Alexander Wilms
06a56a0ec3
Try to fix compilation error:
...
/home/runner/work/vcmi/vcmi/test/../Global.h:700:36: error: no matching function for call to 'max'
const Floating relativeEpsilon = std::max(std::abs(left), std::abs(right)) * epsilon;
^~~~~~~~
/home/runner/work/vcmi/vcmi/test/JsonComparer.cpp:48:16: note: in instantiation of function template specialization 'vstd::isAlmostEqual<double, int>' requested here
return vstd::isAlmostEqual(value.Float(), 0);
^
2024-02-18 23:32:12 +01:00
Alexander Wilms
fc1e9f70f9
Fix float comparison
2024-02-18 23:16:11 +01:00
Ivan Savenko
ef8ff00973
Unified common primitive-based UI elements
2024-02-18 22:15:31 +02:00
Ivan Savenko
14e3c762c0
Fix slot selection in markets
2024-02-18 21:18:55 +02:00
Ivan Savenko
8b60275a6e
Hero exchange in town is now activated by clicking on hero portrait
2024-02-18 21:02:24 +02:00
