1764 Commits

Author	SHA1	Message	Date
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
SoundSSGood	ea7dd14d8b	client is able to erase artifact	2023-04-08 00:41:55 +03:00
Ivan Savenko	f3aed901fd	Merge pull request #1883 from rilian-la-te/fixup-healing-destination ... CGameHandler: fixup healing destination	2023-04-07 12:42:52 +03:00
nordsoft	b1d06b6141	Complete quick combat feature	2023-04-06 22:49:38 +04:00
nordsoft	e85593dbb3	Save & restore mana	2023-04-06 21:19:46 +04:00
nordsoft	3e28b58c80	Fixes	2023-04-06 19:59:22 +04:00
nordsoft	ece8a2a41f	Merge branch 'battle-dialog' into battle-dialog2 ... # Conflicts: # AI/BattleAI/BattleAI.h # AI/StupidAI/StupidAI.h # client/CPlayerInterface.cpp # client/CPlayerInterface.h # client/Client.cpp # client/NetPacksClient.cpp # client/battle/CBattleInterface.cpp # client/battle/CBattleInterface.h # client/battle/CBattleInterfaceClasses.cpp # client/battle/CBattleInterfaceClasses.h # config/schemas/settings.json # lib/CGameInterface.h # lib/IGameEventsReceiver.h # lib/NetPacks.h # lib/NetPacksLib.cpp # lib/battle/BattleInfo.cpp # server/CGameHandler.cpp # server/CQuery.h	2023-04-06 19:53:52 +04:00
nordsoft	ce3028bd73	Intermediate commit	2023-04-06 19:34:07 +04:00
Konstantin	dc7d0297a7	CGameHandler: fixup healing destination ... If it contains hex, not unit, server complains. Add actual unit there.	2023-04-06 00:21:21 +03:00
Konstantin	11b237a23c	vcmi: massive refactoring v1	2023-04-05 22:33:12 +03:00
Konstantin	e0715a76c8	vcmi: reduce CStack usage a little bit	2023-04-04 23:02:54 +03:00
Konstantin	e946ddcfeb	CGameHandler: obstacle trigger does not use CStack	2023-04-04 23:02:54 +03:00
Konstantin	4259d116e1	vcmi: move ServerSpellCastEnvironment in separate file ... In theory, it should not know about CGameHandler	2023-04-04 23:02:54 +03:00
Ivan Savenko	307065a633	Merge beta into develop	2023-04-04 16:06:20 +03:00
Ivan Savenko	c661419897	Merge pull request #1700 from rilian-la-te/resource-array ... Modernize resourceSet.	2023-04-02 20:12:45 +03:00
Ivan Savenko	2b1def4ef1	Merge pull request #1813 from Laserlicht/patch-1 ... hide messages from AI	2023-04-02 20:08:45 +03:00
Ivan Savenko	f471d1b23a	Merge pull request #1816 from krs0/feature/all_cheats_should_have_lotr_equivalent ... Added LotR alternatives for vcmiarmy and vcmiexp	2023-04-02 20:08:33 +03:00
Ivan Savenko	efbc5cf581	Merge pull request #1815 from IvanSavenko/beta_fixes ... Beta fixes	2023-04-02 20:02:41 +03:00
krs	28486a0b40	In the Silmarillion, Gandalf is referred to as "Olórin"	2023-04-02 10:58:20 +03:00
krs	7bec5bf606	Added LotR alternatives for vcmiarmy and vcmiexp	2023-04-02 10:58:20 +03:00
Ivan Savenko	63d0e437a9	Merge pull request #1820 from rilian-la-te/fix-magogs ... GGameHandler: fix spell-like attack targeting	2023-04-01 23:09:08 +03:00
Konstantin	05cc7fbf67	GGameHandler: fix spell-like attack targeting	2023-04-01 01:06:26 +03:00
Ivan Savenko	56e1866db9	Remove final path node when directly attacking guards	2023-03-31 23:18:45 +03:00
Ivan Savenko	820c9be61b	Use own resources when buying boat in allied shipyard	2023-03-31 23:18:45 +03:00
Michael	f7feeacc1f	hide messages from AI	2023-03-31 22:10:48 +02:00
Konstantin	6d17b9342d	ResourceSet: resolve .at troubles	2023-03-31 14:12:38 +03:00
Konstantin	d8a237ba46	vcmi: add getTrigger method to obstacles ... Fixes advanced remove obstacle spell	2023-03-31 01:01:26 +03:00
Konstantin	d5e2933bee	CGameHandler: slightly rework obstacle caster	2023-03-31 01:01:26 +03:00
Konstantin	53a6fb2836	CGameHandler: do not open-code toInfo ... There is an obstacle function which is doing exactly this.	2023-03-31 01:01:25 +03:00
Konstantin	f704a17e1a	vcmi: add a last hex setting ... I consider this behaviour as H3 bug, but this is H3. So, added a setting to disable this behaviour.	2023-03-31 01:01:25 +03:00
Konstantin	a8478a012b	vcmi: check long bridge by moat ... If moat is on GATE_BRIDGE hex, then it is a long bridge. No need to check town type.	2023-03-31 01:01:25 +03:00
Konstantin	aab5b47038	vcmi: setup moats using MoatAbility ... Setup moats using moat ability, need playtest for now. -3 to defence not added for now.	2023-03-31 01:01:25 +03:00
Ivan Savenko	46ccd65080	Removed largely unused signal handling, fixes build with musl c library	2023-03-30 14:56:13 +03:00
Konstantin	cd1730b1fb	vcmi: remove obstacle caster logic ... It is possible now to cast something via obstacle Immune creatures should not trigger an obstacle trigger now and should not reveal it.	2023-03-30 14:41:40 +03:00
Konstantin	5716925b47	NetPacks: change GiveBonus enum to enum class.	2023-03-30 12:41:17 +03:00
Ivan Savenko	484f0a175a	Blocked movement of war machines in tactics phase	2023-03-30 12:20:13 +03:00
Ivan Savenko	8a3e1b0230	Merge pull request #1789 from IvanSavenko/beta_fixes ... Fixes for 1.2 release	2023-03-30 00:09:51 +03:00
Ivan Savenko	3e1506dba3	Merge pull request #1767 from Adriankhl/fix_battle_thread_shutdown ... Properly shutdown battle thread	2023-03-29 14:40:15 +03:00
Ivan Savenko	0c7dae0913	Allow formation change while in hero exchange query	2023-03-28 19:12:35 +03:00
Ivan Savenko	b2f5042942	Merge pull request #1783 from vcmi/beta ... Merge beta -> develop	2023-03-27 21:21:25 +03:00
Ivan Savenko	11088100a0	Merge pull request #1782 from korli/haiku ... Haiku patch	2023-03-27 18:42:22 +03:00
Ivan Savenko	b875da108b	Merge pull request #1717 from SoundSSGood/backpack-limit-size ... Introducing backpack size limit functionality	2023-03-27 17:17:49 +03:00
Ivan Savenko	e3b5db0ade	Merge pull request #1778 from rilian-la-te/fix-obstacle-removal-mechanincs ... Fix landmines staying on battlefield after trigger	2023-03-27 17:17:14 +03:00
Konstantin	9a229d6e48	vcmi: really correct obstacle trigger ... Now obstacle trigger really matches H3	2023-03-27 16:11:17 +03:00
Jerome Duval	518f8d69e5	Haiku patch	2023-03-27 10:10:09 +02:00
Konstantin	5b50191af7	NetPacksLib: remove obstacle ACTIVATE* actions ... Actually these actions was not working anyway.	2023-03-26 22:59:34 +03:00
Adriankhl	21a4113fc1	Properly shutdown battle thread in CGameHandler destructor	2023-03-25 20:29:33 +01:00
Ivan Savenko	5288e3761e	Merge pull request #1764 from IvanSavenko/selectable_spellcaster ... Implemented support for multi-spell casters	2023-03-25 20:08:47 +02:00
Ivan Savenko	dc099b2a35	Implemented support for multi-spell casters	2023-03-25 00:48:14 +02:00
Ivan Savenko	970981cfc9	Show information on potential kills in attack tooltip	2023-03-24 17:18:47 +02:00
SoundSSGood	19096f39f0	Backpack limit. Amount of fixes.	2023-03-21 22:11:42 +02:00
Ivan Savenko	575fb29a22	Merge pull request #1534 from kambala-decapitator/pathfinder-fly ... fix movement cost with Fly	2023-03-21 14:32:56 +02:00
SoundSSGood	f0f9eecf97	Backpack limit part5. End of battle. Other stuff	2023-03-21 12:14:33 +02:00
SoundSSGood	9f8aa25297	Backpack limit part4 (Using cheats, buying)	2023-03-21 12:14:33 +02:00
SoundSSGood	e23766280f	Backpack limit part2 (Pick up, Dig up, Object rewards)	2023-03-21 12:14:33 +02:00
SoundSSGood	96e8a1f21c	Backpack limit part1 (move, disassemble)	2023-03-21 12:14:33 +02:00
SoundSSGood	72122fb433	CArtifact, CArtifactInstance, CCombinedArtifactInstance reorganization	2023-03-21 12:14:33 +02:00
Adriankhl	8d549bf030	Fix town portal query when it calls level up query	2023-03-20 16:08:18 +01:00
Andrey Filipenkov	aae9e70771	remove duplicate call ... already performed in CPathfinderHelper constructor	2023-03-20 11:35:19 +03:00
Ivan Savenko	a0e9e01b48	Renamed & reorganized all game mechanics settings names	2023-03-16 18:11:35 +02:00
Ivan Savenko	383387ef29	Integrated defaultMods into mod system	2023-03-16 17:55:09 +02:00
Konstantin	ebbc8cf208	vcmi: remove BLOCK_LUCK bonus ... To block a luck, just set both INDEPENDENT_MAX and INDEPENDENT_MIN to 0 of LUCK bonus	2023-03-16 16:46:42 +03:00
Konstantin	c07e74250b	vcmi: remove BLOCKS_MORALE bonus ... To block morale, just set INDEPENDENT_MAX and INDEPENDENT_MIN to 0, there is no need for separate bonus.	2023-03-16 16:46:42 +03:00
Konstantin	20a9332a3f	vcmi: translate wisdom ... Make wisdom as separate bonus. It will be enough for now. But next is should be done as IsLearnable for each spell.	2023-03-16 16:46:41 +03:00
Konstantin	64ad7558c6	vcmi: skill-agnostic artillery ... Now it should work for any creature and with any damage percentage.	2023-03-16 16:46:41 +03:00
Konstantin	9205ef2c91	vcmi: skill-agnostic ballistics ... Made ballistics by using spell action and more code is shared now.	2023-03-16 16:46:41 +03:00
Konstantin	84f53485e2	vcmi: skill-agnostic first aid ... Now first aid is passive battle spell, and skill just bumps specific spell power for this spell. Everything about healing is handled into Heal spell effect.	2023-03-16 16:46:41 +03:00
Konstantin	300a8a15ba	vcmi: remove estates bonus ... Now it is handled by GENERATE_RESOURCE::GOLD.	2023-03-16 16:46:41 +03:00
Konstantin	43f09dd2e4	vcmi: convert scholar to new bonus ... Convert scholar to new skill-agnostic bonus. Now works only for any school (not from specific). In all schools form identical to past's SECONDARY_SKILL_PREMY::SCHOLAR	2023-03-16 16:46:41 +03:00
Konstantin	4a89418ada	vcmi: replace SecondarySkillPremy:EAGLE_EYE ... Replace this bonus to new ArcaneIntuition bonus, which will work independently from the rest of skill bonuses. Proof of concept for other skills.	2023-03-16 16:46:41 +03:00
Konstantin	496c1def12	vcmi: remove FULL_HP_REGENERATION bonus ... Just set HP_REGENERATION to high number (in OH3 doubled stack health is sufficient)	2023-03-16 16:46:41 +03:00
Ivan Savenko	865f9f7d2b	Merge pull request #1511 from IvanSavenko/launcher_welcome_page ... Add welcome/setup page to Laucher	2023-03-16 15:04:49 +02:00
Ivan Savenko	2a2af34788	Merge pull request #1650 from SoundSSGood/arts-swap-regression-fix ... Arts swap regression fixed	2023-03-16 14:47:31 +02:00
Ivan Savenko	369e925af8	Loading of translation mods is now skipped on language mismatch	2023-03-14 16:02:16 +02:00
Konstantin	4c31db52be	vcmi: add artifact component to second grail msg	2023-03-11 21:41:57 +03:00
Konstantin	bc228a938a	vcmi: use enum class for EComponentType ... There is really no reason not to use it	2023-03-11 21:41:57 +03:00
Konstantin	716dd9a43b	vcmi: remove a bunch of duplicated showInfoDialog ... These methods duplicated in almost every map object Just replace it by one such method	2023-03-11 21:41:57 +03:00
Konstantin	8edba4fb06	vcmi: use MODAL by default ... Convert only some objects to AUTO, need futher testing than no non-adventure objects will not use AUTO or INFO	2023-03-11 21:41:57 +03:00
Konstantin	4617ce10e5	vcmi: allow showing more than one components in infobar ... Up to 8, AFAIK. So, we can show multi-reward in infobox now. One issue remain - cannot dynamically choose components size based on text size.	2023-03-11 21:41:57 +03:00
Konstantin	5366f9190e	vcmi: reduce boost::lexical_cast usage	2023-03-09 16:36:46 +03:00
SoundSSGood	e24eb6cc12	regression fixed	2023-03-08 17:20:38 +02:00
Ivan Savenko	7ef5163d9d	Merge pull request #1581 from IvanSavenko/map_render_rewrite ... Adventure Map - rendering rewrite	2023-03-05 19:51:07 +02:00
Ivan Savenko	5905dd6111	Grail digging check is now in library	2023-03-05 17:48:02 +02:00
Ivan Savenko	4501036a04	Basic version of hero movement on map. Removed old code.	2023-03-05 17:48:02 +02:00
Ivan Savenko	8b3309b47d	Fixed custom hero names text ID's	2023-03-05 17:39:27 +02:00
Andrey Filipenkov	fd56f86a84	introduce VCMI_MOBILE macro	2023-03-02 12:09:49 +03:00
Andrey Filipenkov	313d479d42	fix using JNI from server in single process build	2023-03-02 12:09:48 +03:00
Andrey Filipenkov	c4e7e91850	fix single process build for Android	2023-03-02 12:09:48 +03:00
Andrey Filipenkov	4c19d8794d	add option to compile AI code into libvcmi directly ... - used on Android by default - AI sources and libs are propagated to upper level with set(... PARENT_SCOPE)	2023-03-02 12:09:48 +03:00
Andrey Filipenkov	2a28109f2d	fix indentation	2023-03-02 12:09:47 +03:00
Andrey Filipenkov	970bd6ed34	adjust project for Android (except AI)	2023-03-02 12:09:47 +03:00
Andrii Danylchenko	9f55666931	rework netpacks to avoid double typeinfo	2023-02-13 20:26:39 +02:00
Andrii Danylchenko	8855829527	Andorid: remove server main	2023-02-13 20:26:39 +02:00
Andrii Danylchenko	14d27c788f	hide AI cheating message	2023-02-05 11:00:58 +02:00
Ivan Savenko	dbbbba5f2d	Fix typo	2023-02-02 13:25:55 +02:00
Ivan Savenko	f1ea88ae9a	Merge pull request #1505 from dydzio0614/cheats-improvements ... Cheats improvements	2023-02-02 12:21:19 +02:00
Ivan Savenko	57ee9a9bf3	Merge vcmi/beta into vcmi/develop	2023-01-29 18:21:55 +02:00
Dydzio	5b8e8e60fb	Change vcmiarmy handling a bit	2023-01-25 12:50:18 +01:00
Dydzio	3d9f04c6e0	Minor cheats code changes	2023-01-25 12:10:48 +01:00