2850 Commits

Author	SHA1	Message	Date
Mircea TheHonestCTO	0ee10c9213	Merge branch 'develop' into feature/nullkiller2	2025-11-15 17:15:46 +01:00
Ivan Savenko	81db5c7cf4	Merge pull request #6286 from GeorgeK1ng/backpack_sort ... Enable backpack sorting in both ways	2025-11-12 16:34:44 +02:00
Ivan Savenko	7cabae89e3	Merge pull request #6243 from Laserlicht/battleonly ... Battleonly mode	2025-11-06 14:33:44 +02:00
George King	6978d87a97	Make sonar happy	2025-11-06 10:07:48 +01:00
George King	b593bde66b	Fix names	2025-11-03 02:06:54 +01:00
George King	97c641900a	Remove space	2025-11-03 01:59:11 +01:00
George King	81b8486b00	Sort backpack artifacts in both directions	2025-11-03 01:56:41 +01:00
Laserlicht	743013a0d6	Merge branch 'develop' into battleonly	2025-11-02 20:31:28 +01:00
Ivan Savenko	bdafb47655	Do not activate Life Drain if unit is fully healed	2025-11-02 12:50:27 +02:00
Ivan Savenko	8e74797650	Remove hardcoded checks for Conflux and Inferno Grails	2025-11-01 23:20:16 +02:00
Andrej Dudenhefner	4f6a4c5053	Fix networkHandler is destroyed before networkServer leading to dangling context pointer crash	2025-11-01 12:40:10 +01:00
Mircea TheHonestCTO	00c93c7b6a	Merge branch 'develop' into feature/nullkiller2	2025-10-28 22:30:39 +01:00
Laserlicht	a6ea9be489	Merge branch 'develop' into battleonly	2025-10-28 14:42:27 +01:00
Ivan Savenko	dc9fd90f3e	Merge pull request #6211 from Laserlicht/text_edit ... Allowing editing town name	2025-10-28 15:33:50 +02:00
Laserlicht	a4d840f60f	code review	2025-10-28 13:30:51 +01:00
Laserlicht	c202d44179	Merge branch 'develop' into battleonly	2025-10-28 12:26:57 +01:00
Ivan Savenko	f9f4a8e9af	Add workaround for crash on attempt to use town portal map object	2025-10-27 19:40:24 +02:00
Laserlicht	48e2d43c97	colorize & bugfix	2025-10-26 01:02:51 +02:00
Laserlicht	05ea43438e	ui update	2025-10-25 21:44:13 +02:00
Laserlicht	134017a7cd	basic multiplayer support	2025-10-25 17:55:25 +02:00
Laserlicht	5a650a8f2f	Merge branch 'develop' into battleonly	2025-10-24 01:01:42 +02:00
Laserlicht	ed562e42ba	battleonly gui	2025-10-24 00:56:20 +02:00
Laserlicht	4d37fe631b	battle only basic implementation	2025-10-24 00:54:22 +02:00
Mircea TheHonestCTO	8a9b83bb14	Merge branch 'develop' into feature/nullkiller2	2025-10-19 21:17:45 +02:00
Ivan Savenko	7db19825f9	Merge pull request #6222 from Laserlicht/showincome ... Show daily income in popup	2025-10-19 08:35:58 +03:00
Michał Zaremba	3e486a779d	Fix incrementing conn and player IDs	2025-10-17 16:56:01 +02:00
Michał Zaremba	35543bef7a	Revert "Fix incrementing PlayerConnectionID" ... This reverts commit 48a683ae49.	2025-10-17 16:56:01 +02:00
Mircea TheHonestCTO	31cd821066	Merge branch 'develop' into feature/nullkiller2	2025-10-15 11:59:08 +02:00
Laserlicht	850617afb0	show income	2025-10-11 22:01:40 +02:00
Laserlicht	120213509d	netpacks for renaming	2025-10-05 02:46:19 +02:00
Mircea TheHonestCTO	d43accfd95	Merge branch 'develop' into feature/nullkiller2	2025-10-01 17:56:58 +02:00
Michał Zaremba	ea261ae48f	Rework handling some errors and uncought exceptions	2025-10-01 11:00:56 +02:00
Ivan Savenko	c469c6c31e	Merge pull request #6136 from Laserlicht/resource ... Configurable resources	2025-09-28 21:51:10 +03:00
Laserlicht	5da8a7a4dc	use resolveidentifier	2025-09-28 19:17:39 +02:00
Ivan Savenko	dc8d800c4f	Merge pull request #6063 from Opuszek/fix_draw_in_battle ... Fixes draw in a battle	2025-09-28 18:11:09 +03:00
Mircea TheHonestCTO	5c19f0aa7a	fix: cannot open saved games with extra dots in the name	2025-09-21 17:48:46 +02:00
Laserlicht	8ef97abc7d	replace hardcoded	2025-09-16 10:34:38 +02:00
Laserlicht	d808bd6412	introduce toResourceType	2025-09-15 00:08:18 +02:00
Laserlicht	a54a1f8b8d	replace RESOURCE_NAMES where possible	2025-09-14 20:43:53 +02:00
Laserlicht	75f965c93a	remove allresources	2025-09-14 15:29:14 +02:00
Mircea TheHonestCTO	faf16448c4	typo	2025-09-10 01:24:09 +02:00
Opuszek	8390f2f871	Review fix	2025-09-08 12:43:17 +02:00
Mircea TheHonestCTO	e67e6bcc68	Merge branch 'develop' into feature/nullkiller2	2025-09-07 17:35:33 +02:00
Opuszek	698fe70684	Fix battle result if a loser retreated/surrendered and the victor has no pernament unit left	2025-09-03 13:21:56 +02:00
Michał Zaremba	48a683ae49	Fix incrementing PlayerConnectionID	2025-09-02 22:37:32 +02:00
Opuszek	568fa41d72	Fix battle draw scenario	2025-09-01 17:11:44 +02:00
Mircea TheHonestCTO	5a8ffdeb8b	Merge branch 'develop' into feature/nullkiller2	2025-09-01 04:26:01 +02:00
Michał Zaremba	44557c3558	Fix PlayerConnectionID regression	2025-08-31 05:54:03 +02:00
Mircea TheHonestCTO	faedb7212b	Merge branch 'develop' into feature/nullkiller2	2025-08-20 01:50:35 +02:00
Ivan Savenko	9a66130c12	Merge pull request #5961 from Opuszek/rework_ballist_and_tower_target_acquisition ... Rework ballist and tower target acquisition	2025-08-18 22:17:07 +03:00