games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-22 22:13:35 +02:00
Code Issues Releases Activity
18,470 Commits 19 Branches 62 Tags 110 MiB
24669afee3
Commit Graph

84 Commits

Author SHA1 Message Date
Dydzio
1e9d089fd8 Fix shooting being priority action for dead creature hexes with targeting empty hexes enabled 2024-12-03 18:04:41 +01:00
Dydzio
50b412b35b Better handling of default cursor action for SPELL_LIKE_ATTACK 2024-09-22 21:14:24 +02:00
Dydzio
dc56047661 Add hex highlight for SPELL_LIKE_ATTACK in casting mode & minor cleanup 2024-09-22 20:38:49 +02:00
Dydzio
bb69ab1a1a Fix assert and condition for counting spell hexes 2024-09-22 18:25:18 +02:00
Dydzio
1a2d349267 Initial unconditionally working version 2024-09-22 15:07:44 +02:00
Ivan Savenko
2a05fbdd50 Unified handling of battle sides ID's 
- Replaced BattleSide namespace-enum with enum class
- Merged two different BattleSide enum's into one
- Merged BattlePerspective enum into BattleSide enum
- Changed all places that use integers to represent battle side to use
BattleSide enum
- Added BattleSideArray convenience wrapper for std::array that is
always 2-elements in size and allows access to its elements using
BattleSide enum
 2024-08-11 20:54:44 +00:00
Ivan Savenko
b7391f49f6 Merge branch 'vcmi/master' into 'vcmi/develop' 2024-08-05 10:36:10 +00:00
Ivan Savenko
434a2fb0fb Explicitly specify to use ranged or melee attack for damage estimation 2024-07-29 17:13:31 +00:00
Ivan Savenko
1aa391fdf8 Split CGeneralTextHandler file into 1 file per class form 
All text processing code is now located in lib/texts.
No changes other than code being moved around and adjustment of includes

Moved without changes:
Languages.h           -> texts/Languages.h
MetaString.*          -> texts/MetaString.*
TextOperations.*      -> texts/TextOperations.*

Split into parts:
CGeneralTextHandler.* -> texts/CGeneralTextHandler.*
                      -> texts/CLegacyConfigParser.*
                      -> texts/TextLocalizationContainer.*
                      -> texts/TextIdentifier.h
 2024-07-20 12:55:17 +00:00
Dydzio
6119898932 Add some useful comments 2024-07-15 09:39:22 +02:00
Dydzio
3836f132d3 Fix alternative actions to support more than 2 actions + simplify logic 2024-07-15 00:41:05 +02:00
Ivan Savenko
278e8ac65e Do not show preview for ranged retaliation - not implemented in lib 2024-05-10 19:51:36 +00:00
Ivan Savenko
d094a17298 Added simple damage preview for retaliations 2024-05-10 19:40:33 +00:00
Ivan Savenko
a9866bb5c6 Added RandomGeneratorUtil::nextItemWeighted convenience method 2024-01-31 00:17:40 +02:00
Ivan Savenko
24d25730ad Changed checks for null with checks for hasValue 2024-01-20 16:41:10 +02:00
Ivan Savenko
0d0d3d8c80 Renamed speed -> getMovementRange, remove misleading default parameter 2024-01-14 17:14:36 +02:00
Ivan Savenko
85de3143ff Fixed Genie spellcasting logic to account for spell immunities 2023-12-24 01:13:19 +02:00
Ivan Savenko
e21e3f8386 Do not display "Spell Cancelled" message on right-click when no stack is 
active
 2023-11-27 14:09:08 +02:00
Andrii Danylchenko
3b27e07385 #3003 - fix hypnotize 2023-11-03 13:50:16 +02:00
Ivan Savenko
3880ea58b9 Merge branch 'josch/dos2unix' into develop 2023-10-22 18:39:03 +03:00
Ivan Savenko
77facf9387 Implement missing functions, fixes linking errors 2023-10-22 16:54:56 +03:00
Johannes Schauer Marin Rodrigues
a1a5bc28c2
convert line endings from CRLF (Windows) to LF (Linux/Unix) 
Mixed line endings cause problems when exporting patches with
git-format-patch and then trying to "git am" a patch with mixed and
non-matching line endings. In such a situation git will fail to apply
the patch.

This commit runs the dos2unix tools on the remaining files with CRLF
(\r\n) line endings to convert them to line-feeds (\n) only.

Files that are Windows specific like *.vcxproj and *.props files were
not converted.

Closes: #3073
 2023-10-19 16:23:21 +02:00
Ivan Savenko
e8453916cf Merge remote-tracking branch 'vcmi/beta' into develop 2023-09-08 18:49:06 +03:00
Ivan Savenko
d7fb2bcf83 Show message on cancelling spell in combat 2023-09-06 21:54:26 +03:00
Ivan Savenko
41210c1dbf Client-side support for multiple battles 2023-09-06 16:03:47 +03:00
Konstantin
e554a2766d BattleActions: do not pass unnecessary targetStack 
It was unused for everything except teleport, so pass it only wher we
attempt to teleport.

Reworking sacrifice is out of scope from beta
 2023-08-31 23:44:00 +03:00
Ivan Savenko
695a51d8c8 Merge remote-tracking branch 'vcmi/beta' into develop 2023-08-28 21:19:53 +03:00
Dydzio
cba9ddd66a
Update client/battle/BattleActionsController.cpp 
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
 2023-08-27 23:01:04 +02:00
Dydzio
e1eb245565 Better default stack action handling + "F shortcut" mode fixes 2023-08-27 17:33:10 +02:00
Ivan Savenko
013417fb7e Code cleanup 2023-08-21 17:55:49 +03:00
Ivan Savenko
1bf6bbd9b6 Significantly simplified threading model in battles 2023-07-18 19:55:59 +03:00
Ivan Savenko
ec55ec76b6 Show cursor (including attack direction) when swiping in battle 2023-06-05 19:20:18 +03:00
Ivan Savenko
b20109c830 Test version of swipe gesture for in-combat attacks 2023-06-05 19:20:08 +03:00
Ivan Savenko
1cec6918a0 Fix spellcast cancelation in battle 2023-06-05 19:20:06 +03:00
Ivan Savenko
ad3e54e6c0 Reduced usage of topWindow() method 2023-05-16 21:57:45 +03:00
Ivan Savenko
e2ef136003 Renamed "Int" -> "Window" in WindowHandler API 2023-05-16 19:10:22 +03:00
Ivan Savenko
7838190ef4 Moved window stack management from GuiHandler to new class 2023-05-16 19:10:21 +03:00
Konstantin
05eccbc2bb vcmi: split bonus to enumerator and HeroBonus.h 2023-05-03 18:01:06 +03:00
Konstantin
fbc05c70ac vcmi: camelCase methods of new classes 
Also use EGameSettings for clamping morale and luck
 2023-05-02 12:09:13 +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
krs
e348193f7e Tactics movement is limited to movement range 2023-04-26 21:56:20 +04: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
Ivan Savenko
44b83b2e11 Merge master -> develop 2023-04-14 16:51:35 +03:00
Ivan Savenko
1978e6f8e8 Do not show unit information on dead creatures 2023-04-13 21:16:55 +03:00
Konstantin P
384ee99834 vcmi: configurable teleport v2 
1. Redesign wall and teleport penalty using shortest path
This will avoid OH3 exploits with teleport inside walls

2. Teleport is now configurable
 2023-04-13 11:24:19 +03:00
Konstantin
8397bd91fb BattleActionsController: do not pass unused caster 
This is unused, so, remove this parameter to prepare for teleport action
 2023-04-13 11:24:19 +03:00
Ivan Savenko
dfa2e2a349 Merge beta into develop 2023-04-11 19:37:35 +03:00
Ivan Savenko
02c9a3f3d8 Correctly reset UI on aborting Clone/Sacrifice 2023-04-10 14:33:24 +03:00
krs
dab07bdef9 Now unit range is shown in Tactics phase as well 
A new parameter: isActiveStack was needed in battleGetAvailableHexes, so that we show the propper Tactics range.
 2023-04-08 20:39:59 +03:00
nordsoft
52b53ab307 Feature and setting implemented 2023-04-08 01:49:59 +04:00