1762 Commits

Author	SHA1	Message	Date
Konstantin	a6de9097be	vcmi: rename HeroBonus.h to Bonus.h	2023-05-02 11:20:58 +03:00
Ivan Savenko	916b41d9a7	Merge pull request #2078 from IvanSavenko/shortcuts ... Basic shortcuts system	2023-05-01 21:45:52 +03:00
nordsoft	59bc9326e9	Remove excess pointer from market interface	2023-05-01 21:49:37 +04:00
Ivan Savenko	a654cc2391	Removed vstd::advance. Added vstd::next to handle similar cases.	2023-05-01 17:58:18 +03:00
Ivan Savenko	ac09f78c67	Merge pull request #2109 from IvanSavenko/server_fix ... Fix potential nullptr-to-reference conversion	2023-05-01 16:36:51 +03:00
Ivan Savenko	c7bee037d2	Fix potential nullptr-to-reference conversion	2023-05-01 14:44:52 +03:00
Ivan Savenko	4aa232a60a	Merge pull request #2055 from SoundSSGood/cartifactholder-rework ... Artifact related code refactoring part2 (client CArtifactHolder)	2023-05-01 02:33:08 +03:00
Konstantin	86f5d6de69	vcmi: modernize headers	2023-04-30 13:35:54 +03:00
Ivan Savenko	d985ac90d3	Merge master -> develop	2023-04-28 22:57:25 +03:00
Ivan Savenko	c55f52e84f	Fixed disabled special weeks	2023-04-28 16:54:00 +03:00
Konstantin P	b472c89276	vcmi: make some CStack properties private ... There is a getters for this properties already available	2023-04-27 20:58:49 +03:00
Ivan Savenko	fb739e7186	Merge beta -> develop	2023-04-26 22:48:08 +03:00
Ivan Savenko	9296306fa3	Merge pull request #2041 from IvanSavenko/bugfixing_for_hotfix ... Fixes for 1.2.1	2023-04-24 18:13:00 +03:00
Ivan Savenko	48abf46824	Merge pull request #2005 from IvanSavenko/advmap_refactor ... Refactoring of adventure map interface	2023-04-24 17:19:22 +03:00
Andrii Danylchenko	eff158a9a8	Fix killing hero with grail	2023-04-23 16:17:27 +03:00
SoundSSGood	c86af54ce1	arts move condition fix	2023-04-23 14:18:55 +03:00
Nordsoft91	a553a4aa66	Merge pull request #2030 from Nordsoft91/boats	2023-04-22 03:27:00 +04:00
Ivan Savenko	7db67a3101	int3 now has proper hasher function	2023-04-20 22:04:24 +03:00
nordsoft	de159df481	Rename boats	2023-04-20 21:20:51 +04:00
Ivan Savenko	9882c37ce3	Good morale can no longer happen after battle is over	2023-04-20 13:10:03 +03:00
Ivan Savenko	d9939f0918	Bad morale can no longer happen after waiting	2023-04-20 13:08:55 +03:00
Ivan Savenko	4bb4d7e7a5	Merge pull request #1989 from SoundSSGood/refactoring-arts-p1 ... Artifact related code refactoring part1 (initial)	2023-04-19 15:31:11 +03:00
nordsoft	0a28262c15	Merge remote-tracking branch 'upstream/develop' into boats ... # Conflicts: # AI/VCAI/Pathfinding/AINodeStorage.cpp	2023-04-19 02:22:19 +04:00
nordsoft	008db447e7	Minor changes	2023-04-19 02:11:24 +04:00
nordsoft	22da7a931d	Boat as bonus system node	2023-04-19 01:11:51 +04:00
nordsoft	1c66cd221d	Polish transport mechanics	2023-04-18 19:18:44 +04:00
nordsoft	3ff99a1a15	Mechanic for air and land transport	2023-04-18 18:33:28 +04:00
nordsoft	ddcdfb643a	Try to enable air/land movement	2023-04-18 17:36:42 +04:00
nordsoft	ed798b06da	Prepare transport enum	2023-04-18 13:04:49 +04:00
Konstantin	7a5775a9f9	vcmi: use std::optional	2023-04-17 00:43:13 +03:00
Konstantin	0d35606a44	vcmi: use std::variant	2023-04-17 00:43:13 +03:00
Ivan Savenko	e3ed728193	Merge pull request #1932 from rilian-la-te/proper-teleport ... VCMI: teleport redesign	2023-04-16 22:52:01 +03:00
SoundSSGood	9a838598a6	arts refactoring part1	2023-04-15 00:10:39 +03:00
Konstantin P	f11fa8f0c8	Teleport: can trigger obstacles now	2023-04-13 11:24:19 +03:00
Konstantin	bc1aad3b26	vcmi: remove deprecated CStack::getCreature() ... Function battle::Unit::unitType() does the same.	2023-04-13 11:24:19 +03:00
Ivan Savenko	506c3d29bc	Replaced vstd clamp with std version	2023-04-12 01:03:14 +03:00
Ivan Savenko	63b197b78a	Converted attributes to use c++17 functionality	2023-04-12 01:03:14 +03:00
Nordsoft91	3951bbb395	Merge pull request #1108 from Nordsoft91/battle-dialog ... [HDMod features] Quick combat	2023-04-11 21:18:04 +04:00
Ivan Savenko	dfa2e2a349	Merge beta into develop	2023-04-11 19:37:35 +03:00
nordsoft	8e77b833d9	Merge remote-tracking branch 'upstream/develop' into battle-dialog	2023-04-11 15:54:08 +04:00
Ivan Savenko	ff66592fad	Merge pull request #1882 from rilian-la-te/native-terrain-refactor ... Native terrain refactor	2023-04-11 02:14:37 +03:00
nordsoft	bfc75ccd39	Merge remote-tracking branch 'upstream/develop' into battle-dialog	2023-04-11 02:22:42 +04:00
Nordsoft91	ebd17c9e4a	Merge pull request #1928 from Nordsoft91/cast-reward ... Spell cast reward	2023-04-10 22:49:36 +04:00
Konstantin	fedf7d377c	vcmi: remove TFaction ... This is a huge change and will break save compatibility	2023-04-10 19:28:16 +03:00
Ivan Savenko	42b2be4bbb	Merge pull request #1908 from SoundSSGood/art-client-server-fixes ... Artifact related fixes	2023-04-10 18:26:49 +03:00
Konstantin	2eaecfd1ae	ObstacleCasterProxy: beta branch	2023-04-10 15:41:58 +03:00
nordsoft	464ad63749	Implement behavior	2023-04-10 05:46:45 +04:00
nordsoft	c0b90432cb	Change callback interface	2023-04-10 05:40:03 +04:00
nordsoft	e440343921	Bypass initial version of spell callback	2023-04-10 04:34:24 +04:00
SoundSSGood	e58be8e7f7	vcmiartifacts fixed	2023-04-08 12:28:53 +03:00