Ivan Savenko
|
6b81012f31
|
Use variant identifier in netpacks where applicable
|
2023-11-08 14:00:23 +02:00 |
|
Ivan Savenko
|
0b4fa20bdc
|
Merge pull request #3152 from SoundSSGood/CAltar-widget
Altar rework
|
2023-11-08 13:42:00 +02:00 |
|
SoundSSGood
|
41ee52d9d4
|
fix build & suggested changed
|
2023-11-08 01:51:13 +02:00 |
|
Ivan Savenko
|
86a3806bec
|
MetaString refactor to eliminate integer usage for identifiers
- entity names are now stored and serialized as text ID's
- added helper methods for convenience to get entities names to
metastring
|
2023-11-07 22:47:10 +02:00 |
|
Ivan Savenko
|
f4feaea177
|
Merge pull request #3141 from IvanSavenko/better_tooltips
Better tooltips
|
2023-11-07 22:46:02 +02:00 |
|
Tomasz Zieliński
|
c909bd766e
|
Merge remote-tracking branch 'origin/develop' into fix_rmg_teams
# Conflicts:
# lib/rmg/CMapGenOptions.cpp
# lib/rmg/CMapGenOptions.h
|
2023-11-07 20:54:04 +01:00 |
|
Ivan Savenko
|
f039b20653
|
Improvement for wandering monster tooltip/hover text:
- show Visions information only on right-click (H3 logic)
- show threat level only on right-click and only if UI tweaks are on
|
2023-11-06 20:37:07 +02:00 |
|
SoundSSGood
|
539b2e596d
|
adjusting the placement of artifact slots
|
2023-11-06 14:31:32 +02:00 |
|
SoundSSGood
|
75ebd954af
|
Creatures altar & Artifacts altar
|
2023-11-06 14:31:32 +02:00 |
|
SoundSSGood
|
9f9317a8a0
|
CTradeBase initial commit
|
2023-11-06 14:31:31 +02:00 |
|
SoundSSGood
|
fbe3e0fe12
|
CArtPlace preparation
|
2023-11-06 14:01:13 +02:00 |
|
Andrii Danylchenko
|
0927d3e3e8
|
Merge pull request #3145 from vcmi/fix-3142
#3142 - fi custom campaign selection screen
|
2023-11-05 11:12:58 +02:00 |
|
Andrii Danylchenko
|
060079cfc6
|
Merge pull request #3146 from vcmi/fix-3006
#3006 - fix starting move from teleport
|
2023-11-05 11:12:41 +02:00 |
|
Ivan Savenko
|
8dc5837395
|
Merge pull request #3144 from IvanSavenko/remove_identifier_implicit_int_conversion
Remove (some of) implicit conversions of Identifier to integer
|
2023-11-04 19:36:11 +02:00 |
|
Ivan Savenko
|
5487f07d3b
|
added toEntity overload that accepts generic Services class
|
2023-11-04 17:04:53 +02:00 |
|
Andrii Danylchenko
|
91c04f4718
|
#3006 - fix starting move from teleport
|
2023-11-04 15:43:08 +02:00 |
|
Andrii Danylchenko
|
d50ebd7d58
|
#3142 - fi custom campaign selection screen
|
2023-11-04 14:34:18 +02:00 |
|
Andrii Danylchenko
|
a8cc5e1d60
|
Merge pull request #3140 from vcmi/fix-3003
#3003 - fix hypnotize
|
2023-11-04 10:50:58 +02:00 |
|
Ivan Savenko
|
184f5a72cc
|
Use toEntity/toXXX methods in Identifier instead VLC objects access
|
2023-11-03 16:03:29 +02:00 |
|
Ivan Savenko
|
8d5fa41a19
|
Minor fixes
|
2023-11-03 16:03:29 +02:00 |
|
Ivan Savenko
|
87f6c7354b
|
Merge pull request #3139 from IvanSavenko/component_variant_identifier
Refactoring of Component class
|
2023-11-03 15:52:07 +02:00 |
|
Ivan Savenko
|
4a24da3804
|
Merge pull request #3114 from Laserlicht/fix-highscore
fix high scores screen
|
2023-11-03 15:51:37 +02:00 |
|
Ivan Savenko
|
7a254dd55f
|
Merge pull request #3135 from IvanSavenko/file_corruption_check
Ignore corrupted .def files
|
2023-11-03 15:49:43 +02:00 |
|
Andrii Danylchenko
|
3b27e07385
|
#3003 - fix hypnotize
|
2023-11-03 13:50:16 +02:00 |
|
Ivan Savenko
|
056ef00f74
|
Bugfixing
|
2023-11-02 13:52:58 +02:00 |
|
Ivan Savenko
|
10e50548e7
|
Converted Component class to use VariantIdentifier instead of int
|
2023-11-02 12:00:04 +02:00 |
|
Ivan Savenko
|
0376873cb3
|
Merge pull request #3125 from IvanSavenko/reduce_subid_usage
Reduce usage of CGObjectInstance::subID
|
2023-11-02 11:58:01 +02:00 |
|
Andrii Danylchenko
|
5cd16e5b27
|
Merge pull request #3124 from vcmi/fix-2977
#2977 - fix obstackle path deserialization
|
2023-11-01 15:27:14 +02:00 |
|
Ivan Savenko
|
8346d71c98
|
Remove more subID access
|
2023-11-01 14:44:05 +02:00 |
|
Ivan Savenko
|
7107b3202f
|
Merge pull request #3069 from SoundSSGood/artifact-location-id
ArtifactLocation now use ID for artHolder identification
|
2023-11-01 14:41:36 +02:00 |
|
Laserlicht
|
8a9f10ec3a
|
fix asset failures
|
2023-10-31 22:05:22 +01:00 |
|
Ivan Savenko
|
858ba22a27
|
Ignore corrupted .def files
|
2023-10-31 12:11:41 +02:00 |
|
Tomasz Zieliński
|
6e7b68d0e6
|
Unused variable, unused code
|
2023-10-30 21:33:49 +01:00 |
|
Tomasz Zieliński
|
e105b23a37
|
Merge remote-tracking branch 'origin/develop' into fix_rmg_teams
# Conflicts:
# Mods/vcmi/config/vcmi/rmg/heroes3/newcomers.JSON
# Mods/vcmi/config/vcmi/rmg/heroes3/southOfHell.JSON
# Mods/vcmi/config/vcmi/rmg/symmetric/2sm0k.JSON
# Mods/vcmi/config/vcmi/rmg/symmetric/2sm2i(2).JSON
# Mods/vcmi/config/vcmi/rmg/symmetric/3sb0b.JSON
# Mods/vcmi/config/vcmi/rmg/symmetric/3sb0c.JSON
# Mods/vcmi/config/vcmi/rmg/symmetric/5sb0a.JSON
# Mods/vcmi/config/vcmi/rmg/symmetric/5sb0b.JSON
# Mods/vcmi/config/vcmi/rmg/symmetric/7sb0b.JSON
# Mods/vcmi/config/vcmi/rmg/symmetric/7sb0c.JSON
# client/lobby/RandomMapTab.cpp
|
2023-10-30 20:08:13 +01:00 |
|
Tomasz Zieliński
|
f39edf9413
|
Update ally and enemy flags when selecting new template
|
2023-10-30 07:48:51 +01:00 |
|
Tomasz Zieliński
|
4f2cde018c
|
Fixed most of reported issues, removed unused code.
|
2023-10-29 21:25:39 +01:00 |
|
SoundSSGood
|
c2f658d638
|
Bulk move artifacts. id
|
2023-10-29 17:46:13 +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 |
|
SoundSSGood
|
61fc236d79
|
ArtifactLocation now use ID for artHolder identification part1
|
2023-10-29 17:46:13 +02:00 |
|
Andrii Danylchenko
|
73b89d4e84
|
#2977 - fix obstackle path deserialization
|
2023-10-29 16:07:00 +02:00 |
|
Alexander Wilms
|
5cbc75d3b7
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2023-10-29 13:35:37 +00:00 |
|
Alexander Wilms
|
e677164ed0
|
client/widgets/Buttons.h: Fix const reference
Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>
|
2023-10-29 13:34:19 +00:00 |
|
Alexander Wilms
|
5d7b83c10b
|
client/widgets/Buttons.cpp: Fix const reference
Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>
|
2023-10-29 13:34:19 +00:00 |
|
Alexander Wilms
|
466cdb9d2b
|
client/widgetsImages.{h,cpp}: implicit conversion loses integer precision: 'int' to 'uint8_t' (aka 'unsigned char')
|
2023-10-29 13:34:19 +00:00 |
|
Alexander Wilms
|
f1bb6b999c
|
client/widgets/Buttons.{h,cpp}: Pass expensive to copy object "callback" by reference to const.
|
2023-10-29 13:33:57 +00:00 |
|
Ivan Savenko
|
0169c65937
|
Merge pull request #3100 from IvanSavenko/split_net_packs
Split netpacks.h into multiple files
|
2023-10-29 13:46:40 +02:00 |
|
Tomasz Zieliński
|
368a185008
|
Cleaning up the code
|
2023-10-29 10:05:24 +01:00 |
|
Alexander Wilms
|
e4db6f2af8
|
CClient::removeGUI(): This function should be declared 'const'
|
2023-10-28 23:05:05 +00:00 |
|
Tomasz Zieliński
|
07dac8b6d4
|
Works more or less
|
2023-10-28 20:30:38 +02:00 |
|