1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Commit Graph

13732 Commits

Author SHA1 Message Date
SoundSSGood
e1a9763ae4 fix test, throwing exception fix 2023-11-09 12:38:50 +02:00
SoundSSGood
57e3abc548 ask assemble regression fixed 2023-11-08 21:59:55 +02:00
SoundSSGood
ce3d407396 artifacts swap optimization 2023-11-08 21:58:48 +02:00
Ivan Savenko
8aea2be0db
Merge pull request #3155 from IvanSavenko/netpack_fixes
Use variant identifier in netpacks where applicable
2023-11-08 15:27:22 +02:00
Ivan Savenko
32a2e540d3 Fix build 2023-11-08 14:00:23 +02:00
Ivan Savenko
6b81012f31 Use variant identifier in netpacks where applicable 2023-11-08 14:00:23 +02:00
Ivan Savenko
63e99a32d7
Merge pull request #3157 from IvanSavenko/switch_rng
Use minstd_rand instead of mt19937 to avoid save game bloat
2023-11-08 13:42:22 +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
bdc83bb1b8
Add description why minstd has been chosen 2023-11-07 23:48:12 +02:00
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
Ivan Savenko
083e75e80e
Merge pull request #2372 from vcmi/fix_rmg_teams
Fix teams on random maps
2023-11-07 22:45:51 +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
Dydzio
aa96a53f37 Fix comment 2023-11-07 20:11:18 +02:00
Dydzio
66110d7bac Fix commanders levelup bonus to match WoG 2023-11-07 20:10:55 +02:00
nordsoft
e82df8c726 Better solution 2023-11-07 20:10:07 +02:00
nordsoft
f10416be06 Do not show entries without name 2023-11-07 20:09:41 +02:00
Ivan Savenko
3fe10f9c7b
Merge pull request #3154 from gamestales/gamestales/3151-windows-build-symlinks
#3151-windows-build-symlinks
2023-11-07 12:13:08 +02:00
Ivan Savenko
414c25ea49
Use minstd_rand instead of mt19937 to avoid save game bloat 2023-11-06 23:35:28 +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
gamestales-com
afc0d8665a #3151-windows-build-symlinks 2023-11-06 15:57:39 +01: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
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
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
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