17129 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Xilmi	987a51cccb	Merge remote-tracking branch 'upstream/develop' into develop	2024-08-30 16:45:06 +02:00
Ivan Savenko	727cd2e9e1	Merge pull request #4539 from IvanSavenko/crashfix ... Crashfixes	2024-08-30 17:19:24 +03:00
Ivan Savenko	7f926fc30e	Merge pull request #4478 from Laserlicht/resource_generation ... generate assets to file	2024-08-30 15:36:51 +03:00
Ivan Savenko	82afab584c	Merge pull request #4526 from vcmi/docs-ios-manual-signing ... [docs][iOS] add one more ipa signing option	2024-08-30 15:28:54 +03:00
Ivan Savenko	c3e76f19e1	Add workaround for very common crash in BattleAI	2024-08-30 12:25:55 +00:00
Ivan Savenko	01697e4387	Fix player not being marked as defeated on losing all heroes and towns	2024-08-30 12:25:34 +00:00
Ivan Savenko	644d6f4529	Merge pull request #4507 from vcmi/fix-battle-ai ... Battle AI: fix firewall, fix haste spellcast evaluation for waits and…	2024-08-30 14:36:05 +03:00
Ivan Savenko	07ce8ae1ab	Merge pull request #4538 from kaja47/fix-crash-when-losing ... fix crash when computer player loses	2024-08-30 14:16:33 +03:00
K	ca12750dc3	fix crash when computer player loses ... Changing dwelling's owner to neutral accesses a PlayerState but neutrals don't have a PlayerState and that leads to crash.	2024-08-30 11:28:56 +02:00
Xilmi	dcec5637cd	Fix for defense-evaluation. ... Defense-evaluation didn't fill armyInvolvement but it was what created the score for it. So there was only score if it also included a HeroExchange.	2024-08-29 21:01:06 +02:00
Xilmi	b8dacfc0be	Update Nullkiller.cpp ... Fixed trade no longer working and changed log-output.	2024-08-29 20:49:01 +02:00
Xilmi	cc30675730	Merge remote-tracking branch 'upstream/develop' into develop	2024-08-29 17:10:20 +02:00
Ivan Savenko	9a5bee1eaf	Merge pull request #4532 from IvanSavenko/bugfixing ... Fixes for recent regressions	2024-08-29 17:16:31 +03:00
Ivan Savenko	d0b3bb95b2	Change gamestate initialization order - list of owned objects must be ... initialized before connecting towns with visiting heroes, but after generateion of starting heroes	2024-08-29 13:18:33 +00:00
Ivan Savenko	32ad9c1902	Change ordering of UI elements in main menu to fix hota 1.7 menu	2024-08-29 13:18:33 +00:00
Ivan Savenko	9a2d918360	Fixed mouse wheel in xbrz mode, use mouse position information if ... provided by SDL	2024-08-29 13:18:30 +00:00
Xilmi	aea05b3fb8	Merge remote-tracking branch 'upstream/develop' into develop	2024-08-29 14:42:37 +02:00
Laserlicht	c6f0f8de03	generate assets only when necessary	2024-08-29 00:37:39 +02:00
Laserlicht	f327224d45	remove original resource functionality	2024-08-28 23:44:31 +02:00
Ivan Savenko	247be94015	Merge pull request #4502 from IvanSavenko/town_building_config ... Moddable town buildings improvements	2024-08-28 17:56:49 +03:00
Ivan Savenko	4c84379110	Open thieves guild if building provides corresponding bonus	2024-08-28 14:04:47 +00:00
Ivan Savenko	408a632002	Deprecate artifact-related building types	2024-08-28 13:50:08 +00:00
Ivan Savenko	55fd7bd7aa	Thieves guild information level is now a bonus type	2024-08-28 13:50:07 +00:00
Ivan Savenko	a1a194d904	Allow replacing war machine if hero has a different machine in the slot	2024-08-28 13:49:42 +00:00
Ivan Savenko	8ef8ffa5c4	Implemented configurable blacksmith. Deprecated ballistaYard type	2024-08-28 13:49:42 +00:00
Ivan Savenko	175f6716d2	Merge pull request #4518 from IvanSavenko/new_turn_refactor ... Refactor new turn processing on server	2024-08-28 16:49:22 +03:00
Andrey Filipenkov	3e6f64d6b6	[docs][iOS] add one more ipa signing option	2024-08-28 16:12:20 +03:00
Ivan Savenko	462aea7e9a	Fix build	2024-08-28 13:12:11 +00:00
Ivan Savenko	d4ba7e12b0	Fix regressions	2024-08-28 13:03:45 +00:00
Ivan Savenko	e90d057296	Tweaks to fow reveal on new turn	2024-08-28 13:03:45 +00:00
Ivan Savenko	e5f1d60298	Add save compatibility	2024-08-28 13:03:44 +00:00
Ivan Savenko	37658478fa	Move timed events to NewTurnProcessor	2024-08-28 13:03:26 +00:00
Ivan Savenko	ce1e0b8875	Moved NewTurn pack generation to NewTurnProcessor	2024-08-28 13:03:24 +00:00
Ivan Savenko	10a9d777c7	Moved mana and movement points refresh to NewTurnProcessor	2024-08-28 13:03:15 +00:00
Ivan Savenko	c09c414f5a	Moved roll for week type to NewTurnProcessor	2024-08-28 13:03:15 +00:00
Ivan Savenko	020f1d1f46	Moved rumors generation to NewTurnProcessor	2024-08-28 13:03:15 +00:00
Ivan Savenko	691a1a666d	Moved most of town growth handling to NewTurnProcessor	2024-08-28 13:03:13 +00:00
Ivan Savenko	d49a61645c	All objects that can be owned by player now implement IOwnableObject	2024-08-28 12:51:28 +00:00
Ivan Savenko	a481f07daf	PlayerState now stores all objects owned by player	2024-08-28 12:51:27 +00:00
Ivan Savenko	0fd9dbf240	Unified income handling, added IOwnableObject interface	2024-08-28 12:40:44 +00:00
Ivan Savenko	189cb1c762	Moved most of daily income handling to a separate method	2024-08-28 12:40:44 +00:00
Ivan Savenko	58da447f43	Merge pull request #4523 from IvanSavenko/xbrz_fixes ... Xbrz fixes	2024-08-28 15:39:45 +03:00
Ivan Savenko	8371232d29	Merge pull request #4504 from Laserlicht/hota_bonus ... disintegrate bonus	2024-08-28 14:00:11 +03:00
Ivan Savenko	536134d396	Merge pull request #4522 from Laserlicht/fix_chart ... avoid zero size Y axis	2024-08-28 13:59:30 +03:00
Laserlicht	70190ea1fe	Merge branch 'develop' into resource_generation	2024-08-28 00:03:46 +02:00
Laserlicht	4704e92d98	adjust resource naming	2024-08-28 00:02:29 +02:00
Ivan Savenko	a2bac260e7	Fix images with custom scaling in xBRZ mode	2024-08-27 19:49:41 +00:00
Ivan Savenko	0bbc2bce33	Fix handling of transparency in xbrz and in images with non-cyan ... transparent color in unscaled mode	2024-08-27 19:44:11 +00:00
Laserlicht	d47271de6c	avoid zero size Y axis	2024-08-27 21:41:50 +02:00
Ivan Savenko	d3ed18ae2a	Merge pull request #4517 from rtissera/fix-debug-non-amd64-build ... Fix debug non-amd64 builds with CMake	2024-08-27 20:13:25 +03:00