Ivan Savenko
|
0acf8890ef
|
Merge pull request #3143 from IvanSavenko/metastring_refactor
Metastring refactor
|
2023-11-07 23:36:20 +02:00 |
|
Ivan Savenko
|
2835044282
|
Merge pull request #3159 from IvanSavenko/beta
Merge beta -> develop (rebased)
|
2023-11-07 22:49:29 +02:00 |
|
Ivan Savenko
|
748d70b191
|
Fix build
|
2023-11-07 22:47:11 +02:00 |
|
Ivan Savenko
|
09e42cd9df
|
Remove magic number
|
2023-11-07 22:47:11 +02:00 |
|
Ivan Savenko
|
5cd340ad85
|
Remove old code
|
2023-11-07 22:47:11 +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
|
01f70475ad
|
Missing change
|
2023-11-07 20:58:22 +01: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 |
|
nordsoft
|
870aeddad5
|
Serialize owner for abandoned mine
|
2023-11-07 20:11:24 +02:00 |
|
Ivan Savenko
|
2f3d14da5c
|
Show quest description only after visit
|
2023-11-06 20:37:17 +02:00 |
|
Ivan Savenko
|
d7d8177390
|
Show artifact description and icon on right click if UI tweaks are on
|
2023-11-06 20:37:17 +02:00 |
|
Ivan Savenko
|
c1c2119f3d
|
Show Seer Hut quest icon on right click. Fix broken tooltip.
|
2023-11-06 20:37:07 +02:00 |
|
Ivan Savenko
|
1ebb151b41
|
Show available creatures in owned dwellings on right-click
|
2023-11-06 20:37:07 +02: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 |
|
Ivan Savenko
|
2bf599bbee
|
Merge pull request #3119 from Nordsoft91/rmg-fix
Fix crash caused by duplicated delete
|
2023-11-05 17:09:52 +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 |
|
Ivan Savenko
|
5487f07d3b
|
added toEntity overload that accepts generic Services class
|
2023-11-04 17:04:53 +02:00 |
|
Andrii Danylchenko
|
d50ebd7d58
|
#3142 - fi custom campaign selection screen
|
2023-11-04 14:34:18 +02:00 |
|
Ivan Savenko
|
04aeea9b68
|
use toEnum instead of getNum for switch'es
|
2023-11-03 19:20:25 +02:00 |
|
Ivan Savenko
|
f1032063bc
|
Restore implicit conversion
|
2023-11-03 16:03:29 +02:00 |
|
Ivan Savenko
|
cac37df334
|
Remove unused constructor
|
2023-11-03 16:03:29 +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
|
3634fb2158
|
Remove int <=> Identifier comparisons
|
2023-11-03 16:03:29 +02:00 |
|
Ivan Savenko
|
885dce0c27
|
Replace static_cast's of Identifiers with getNum call
|
2023-11-03 16:03:29 +02:00 |
|
Ivan Savenko
|
8f25f1fd4b
|
Serialize identifiers without implicit conversion to int
|
2023-11-03 16:03:29 +02:00 |
|
Ivan Savenko
|
2b9c362d5b
|
Explicitly convert identifier to underlying enumeration
|
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
|
eea4cbf242
|
Merge pull request #3136 from IvanSavenko/fix_teleport
Fix crash on teleport cast
|
2023-11-03 15:49:55 +02:00 |
|
Ivan Savenko
|
02b4947db9
|
Fix build
|
2023-11-02 20:01:20 +02:00 |
|
Ivan Savenko
|
056ef00f74
|
Bugfixing
|
2023-11-02 13:52:58 +02:00 |
|
Ivan Savenko
|
f201e3019a
|
Fix crash on right-clicking rewardable objects with no hero selected
|
2023-11-02 12:00:05 +02:00 |
|
Ivan Savenko
|
10e50548e7
|
Converted Component class to use VariantIdentifier instead of int
|
2023-11-02 12:00:04 +02:00 |
|
Ivan Savenko
|
b42f073f0c
|
Stabilization
|
2023-11-01 18:26:57 +02:00 |
|
Ivan Savenko
|
e57276b7c5
|
Correctly initialize battleID for teleport action
|
2023-11-01 17:24:41 +02:00 |
|
Ivan Savenko
|
8346d71c98
|
Remove more subID access
|
2023-11-01 14:44:05 +02:00 |
|
Ivan Savenko
|
5cdbf408c7
|
Slightly simplified heroes initialization
|
2023-11-01 14:43:20 +02:00 |
|
Ivan Savenko
|
461c481ef3
|
Fix game startup
|
2023-11-01 14:43:20 +02:00 |
|
Ivan Savenko
|
cc30bdda04
|
Remove few more subID usages
|
2023-11-01 14:43:20 +02:00 |
|
Ivan Savenko
|
7a09646009
|
Cleaned up dwelling randomization
|
2023-11-01 14:43:20 +02:00 |
|
Ivan Savenko
|
dcb8f4fc7b
|
Moved object type randomization to object class
|
2023-11-01 14:43:20 +02:00 |
|
Ivan Savenko
|
03e1169781
|
Reduced number of accesses to CGObjectInstance::subID
|
2023-11-01 14:43:20 +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 |
|
Andrii Danylchenko
|
caffc8f3cd
|
Merge pull request #3122 from vcmi/fix-2993
#2993 - destruct battle info first when destructing CGameState
|
2023-10-31 21:43:55 +02:00 |
|
Andrii Danylchenko
|
25b64dd08b
|
Update lib/gameState/CGameState.cpp
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
|
2023-10-31 21:43:06 +02:00 |
|
Tomasz Zieliński
|
6e7b68d0e6
|
Unused variable, unused code
|
2023-10-30 21:33:49 +01:00 |
|
Tomasz Zieliński
|
80198f21d8
|
Revert "Fix unused variable"
This reverts commit c753a1fdf7.
|
2023-10-30 21:07:50 +01:00 |
|
Tomasz Zieliński
|
3b7b21bcc8
|
Fix unused variable
|
2023-10-30 21:07:14 +01:00 |
|
Tomasz Zieliński
|
c753a1fdf7
|
Fix unused variable
|
2023-10-30 20:59:13 +01:00 |
|