Laserlicht
bb2f016f49
text fixes
2024-11-30 00:41:09 +01:00
Ivan Savenko
df0c53af41
Merge pull request #4864 from Laserlicht/creature_window_rework
...
Creature window rework
2024-11-15 19:13:58 +02:00
Laserlicht
e73cb7f45b
Update client/windows/CCreatureWindow.cpp
...
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-11-13 20:03:20 +01:00
Ivan Savenko
e7bea6c3b8
Merge pull request #4852 from IvanSavenko/remove_vlc_entities_serialization
...
Remove remaining pointers to VLC entities from serializer
2024-11-06 22:01:11 +02:00
Laserlicht
988d36bd13
sorted
2024-11-02 15:46:20 +01:00
Laserlicht
74b4fbfceb
small fix
2024-11-02 15:19:39 +01:00
Laserlicht
0ab4b66026
better approach for scrollbar
2024-11-02 15:16:38 +01:00
Laserlicht
9009dffebd
add "other" for bonus display
2024-11-02 14:51:33 +01:00
Laserlicht
17ee363d8d
changed bonus source text pos
2024-11-02 14:37:21 +01:00
Laserlicht
5a72a65b31
add labels
2024-11-02 13:59:09 +01:00
Laserlicht
440e9a6575
assign colors for bonuses
2024-11-02 13:05:10 +01:00
Laserlicht
3038e5140a
add color frames; remove scrollbar
2024-11-01 19:02:51 +01:00
kodobi
2678665f67
Resolve merge conflict
2024-10-30 18:48:09 +01:00
kodobi
44f479be89
Merge branch 'vcmi:develop' into bugfix/fix-ballista-damage-range-display
2024-10-30 18:41:29 +01:00
kodobi
0a0692061d
Merge branch 'bugfix/fix-ballista-damage-range-display' of https://github.com/kodobi/vcmi into bugfix/fix-ballista-damage-range-display
2024-10-30 18:39:11 +01:00
kodobi
b82444ba43
Fix ballista damage range display
...
- Adjusted the displayed damage range of ballista to reflect the changes in hero/es attack skill like in OH3.
- Added checks to ensure the battle interface and relevant heroes are valid before calculating damage.
2024-10-30 18:35:35 +01:00
Ivan Savenko
d3af9f1c67
Removed pointer to VLC entity from CStackBasicDescriptor
2024-10-30 16:47:02 +00:00
Ivan Savenko
f12119f86c
Merge pull request #4812 from SoundSSGood/secSkillPlace
...
[Hota] SeafaringAcademy. Initial PR
2024-10-30 13:33:39 +02:00
kodobi
389f8b678b
Fix ballista damage range display
...
- Adjusted the displayed damage range of ballista to reflect the changes in hero/es attack skill like in OH3.
- Added checks to ensure the battle interface and relevant heroes are valid before calculating damage.
- Correctly retrieve the ballista status from the hero's war machine slot.
2024-10-29 20:44:31 +01:00
Ivan Savenko
72b0062ae3
Better integration of wog commanders translation
2024-10-26 14:21:05 +00:00
SoundSSGood
03b4733c64
CSecSkillPlace
2024-10-22 01:54:04 +03:00
SoundSSGood
573bb6abc6
CArtPlace now works with artifact ID
2024-10-20 12:56:54 +03:00
Ivan Savenko
10ad0fc760
Split CHeroHandler.cpp/.h into 1 file per class
...
All parts of CHeroHandler.cpp are now in lib/entities/hero
Adjusted includes to use new paths
No functionality changes
2024-10-13 14:01:09 +00:00
Ivan Savenko
8225eb454e
Added GameSettings to gamestate, potentially allowing to define game
...
settings per map (or in random map template)
2024-09-05 15:16:27 +00:00
Mike
3671079754
Added artifact description
2024-08-24 16:37:11 -07:00
Ivan Savenko
9fba3d97f1
Renamed & unified OBJECT_CONSTRUCTION macro set
2024-08-09 15:30:04 +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
Alexander Wilms
02e429e973
Fix typos using https://github.com/crate-ci/typos
...
Changes were reviewed manually
2024-06-24 03:47:19 +02:00
DjWarmonger
4949b98ed3
Merge pull request #3759 from Laserlicht/bio
...
Let's try this
2024-05-07 09:05:14 +02:00
Laserlicht
ab50bf9198
biography to description
2024-04-27 18:41:21 +02:00
SoundSSGood
25d2b468c3
CWindowWithArtifacts preparations
2024-04-23 16:06:58 +03:00
Laserlicht
e4b60baa3b
creature/town biography/description
2024-04-12 23:35:39 +02:00
Ivan Savenko
07d201502e
Refactoring of button class to prepare for configurable button
2024-02-29 13:57:25 +02:00
Ivan Savenko
6e629a6a5f
split getBonusLocalFirst into two distinct method:
...
- const method getFirstBonus that returns single matching bonusToString
- non-const method getLocalBonus that returns bonus from current node
2024-01-19 13:56:06 +02:00
Ivan Savenko
bd5682ecc3
Merge remote-tracking branch 'vcmi/master' into develop
2024-01-19 13:49:54 +02:00
Ivan Savenko
0d0d3d8c80
Renamed speed -> getMovementRange, remove misleading default parameter
2024-01-14 17:14:36 +02:00
Alexander Wilms
f3277b7953
Define each identifier in a dedicated statement
2024-01-10 00:22:23 +00:00
Ivan Savenko
a2f603ac02
Fixed some cases of illegal access to std::array::operator[]
2024-01-07 12:45:02 +02:00
Laserlicht
f0c97b344a
add duration + morale/luck
2023-12-23 16:07:12 +01:00
Ivan Savenko
10e50548e7
Converted Component class to use VariantIdentifier instead of int
2023-11-02 12:00:04 +02:00
SoundSSGood
3c5527a222
ArtifactLocation now use ID for artHolder identification part3
2023-10-29 17:46:13 +02:00
SoundSSGood
ab2f6abb87
ArtifactLocation now use ID for artHolder identification part2
2023-10-29 17:46:13 +02:00
Ivan Savenko
5523f05284
Moved ArtifactLocation to a separate file
2023-10-23 19:02:28 +03:00
Ivan Savenko
b88a8da4e8
Split off some netpack structures into separate files
2023-10-23 13:59:15 +03:00
Ivan Savenko
3880ea58b9
Merge branch 'josch/dos2unix' into develop
2023-10-22 18:39:03 +03:00
Ivan Savenko
ac925bb786
Renamed new types for consistency with code style
2023-10-22 16:55:19 +03:00
Ivan Savenko
b394158dc9
Bonus Source ID now uses metaidentifier
2023-10-22 16:55:18 +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
f8541d0ae4
Merge branch 'vcmi/master' into 'vcmi/develop'
2023-09-15 13:59:02 +03:00
Dydzio
56c969be4f
Fix commanders requirements for special skills to match WoG
2023-09-13 23:08:22 +02:00
