15068 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tomasz Zieliński	74bd6d6075	Editor save & load template works	2024-02-29 20:05:20 +01:00
Ivan Savenko	ce44f581fb	Merge pull request #3648 from IvanSavenko/fix_json_from_const_char ... Add additional constructor to JsonNode from const char *	2024-02-29 19:22:14 +02:00
Ivan Savenko	d5a96a122a	Add additional constructor to JsonNode from const char * ... Fixes an issue where due to implicit conversion JsonNode(bool) will be called instead of expected JsonNode(std::string)	2024-02-29 17:33:00 +02:00
Ivan Savenko	22f23ba6f8	Restore previously disabled functionality	2024-02-29 16:47:44 +02:00
Ivan Savenko	ddb2acb9c2	Code cleanup	2024-02-29 15:39:13 +02:00
Ivan Savenko	a2b51323b1	Fix json format	2024-02-29 14:20:11 +02:00
Tomasz Zieliński	b7320bbc8a	Cleanup	2024-02-29 13:04:48 +01:00
Ivan Savenko	20008cd5a5	Replaced premade buttons on hero screen with generated ones	2024-02-29 13:57:25 +02:00
Ivan Savenko	e89835779b	Replaced custom buttons in options window with runtime-generated ones	2024-02-29 13:57:25 +02:00
Ivan Savenko	0051ffa7a9	Implemented configurable buttons. Replaced 'animateLonelyFrame' logic.	2024-02-29 13:57:25 +02:00
Ivan Savenko	07d201502e	Refactoring of button class to prepare for configurable button	2024-02-29 13:57:25 +02:00
Ivan Savenko	850af00303	Merge pull request #3641 from IvanSavenko/messagebox_refactor ... Messagebox code refactor	2024-02-29 13:57:06 +02:00
Tomasz Zieliński	2c32c770f7	First version that works in lobby	2024-02-29 12:45:08 +01:00
Laserlicht	37f621abbd	fix visiting objects other than town	2024-02-28 23:13:51 +01:00
Laserlicht	b0b3b9bb84	fix castle replay	2024-02-28 22:26:53 +01:00
Ivan Savenko	658747d342	Code cleanup	2024-02-27 14:45:15 +02:00
Ivan Savenko	99cb1df91d	Fixes for positioning on popups with components	2024-02-27 13:15:16 +02:00
Ivan Savenko	93b3cb3af5	Better size & positioning of infoboxes	2024-02-26 22:04:30 +02:00
Ivan Savenko	ec159f2fdd	Fixed bad line breaks in starting faction description popup	2024-02-26 22:04:02 +02:00
Ivan Savenko	4b4dedeab9	Code formatting	2024-02-26 18:53:12 +02:00
Ivan Savenko	e6b339448f	Refactoring & deduplication of infowindow code	2024-02-26 18:32:15 +02:00
Ivan Savenko	658cc14cd0	Removed direct usage of SDL_Surface in info windows	2024-02-26 15:49:27 +02:00
Ivan Savenko	5419df1140	Removed no longer used class	2024-02-26 15:49:27 +02:00
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