Xilmi
69b64a3241
Update ExplorationBehavior.cpp
...
Added missing bracked and changed indenting to make it less confusing.
2024-07-24 15:40:20 +02:00
Xilmi
34e4ab45ee
Fixed what merge-conflict-handling had broken.
...
Restored exploration-without relying on memory but with included whirlpool
2024-07-24 15:21:17 +02:00
Xilmi
b83a214763
Merge remote-tracking branch 'upstream/develop' into develop
2024-07-24 14:59:24 +02:00
Andrii Danylchenko
dbcd7677ac
Merge pull request #4313 from vcmi/nkai-whirlpool
...
NKAI: whirlpool
2024-07-24 00:03:11 +03:00
Xilmi
69efe9cfda
Merge remote-tracking branch 'upstream/develop' into develop
2024-07-22 20:15:40 +02:00
Ivan Savenko
37cf788079
Merge pull request #4317 from IvanSavenko/split_townhandler
...
Split CTownHandler into smaller chunks
2024-07-22 17:42:48 +03:00
Ivan Savenko
e99fb539c6
Merge pull request #4256 from IvanSavenko/changelog_initial
...
Initial version of 1.6 changelog
2024-07-22 17:42:02 +03:00
Ivan Savenko
e8aa6efbb9
Merge pull request #4261 from kaja47/shrinkage
...
Reduce size of Bonus struct from 320 bytes to 296 bytes.
2024-07-22 17:12:08 +03:00
K
c1e6bbddfe
Reduce size of Bonus struct from 320 bytes to 296 bytes.
...
- Internal enums were resized to occupy single byte.
- Duration bitmask uses 16 bit integer directly instead of std::bitset<11> which consumed 8 bytes.
- Fields shuffled to minimise padding and keep the most useful data on first 2 cache lines.
2024-07-22 14:59:31 +02:00
Ivan Savenko
69c3a6afd5
Merge pull request #4319 from Laserlicht/patch-4
...
fix exiting when bluetooth mouse is connected while running
2024-07-22 12:58:25 +03:00
Laserlicht
3f4368e3de
fix exiting when bluetooth mouse is connected while running
2024-07-22 02:02:30 +02:00
Ivan Savenko
71f0f86226
Initial version of 1.6 changelog, with all changes so far
2024-07-21 18:48:01 +00:00
Ivan Savenko
4aa73b40c9
Split CTownHandler into smaller chunks
2024-07-21 18:21:48 +00:00
Xilmi
6f9309696d
Merge remote-tracking branch 'upstream/develop' into develop
2024-07-21 19:06:14 +02:00
Andrii Danylchenko
683c363946
NKAI: whirlpool
2024-07-21 17:20:54 +03:00
Ivan Savenko
550540f8ab
Merge pull request #4316 from IvanSavenko/crashfixes
...
Crashfixes
2024-07-21 16:15:28 +03:00
Ivan Savenko
4533271692
Merge pull request #4312 from IvanSavenko/texthandler_split
...
Split CGeneralTextHandler file into 1 file per class form
2024-07-21 13:49:14 +03:00
Ivan Savenko
398111f8d7
Merge pull request #4212 from alkazandzhiev/alkazandzhiev/saveMultiPlayerNames
...
Save all human player names in the configuration
2024-07-21 11:20:25 +03:00
Xilmi
388d6e297f
Merge remote-tracking branch 'upstream/develop' into develop
2024-07-20 22:26:32 +02:00
Ivan Savenko
8a67a08bb9
Merge pull request #4308 from Alexander-Wilms/msvc-ci-remove-dumpbin-search
...
MSVC CI script: Don't run vswhere to find dumpbin.exe, since it is no…
2024-07-20 22:22:18 +03:00
Ivan Savenko
22e2450650
Merge pull request #4310 from SoundSSGood/endBattleConfirm-fix
...
Fixed regression from https://github.com/vcmi/vcmi/pull/4186
2024-07-20 22:20:46 +03:00
Xilmi
945de7c369
More warnings
...
Removed unused code
2024-07-20 21:12:43 +02:00
Xilmi
ed82e2bf4a
Warnings
...
Removed unused variable.
2024-07-20 21:02:39 +02:00
Ivan Savenko
31738e8f90
Always track already serialized pointers to avoid infinite recursion on
...
sending complex objects
2024-07-20 18:29:41 +00:00
Ivan Savenko
5b9130c288
Fixes broken player-coloring on animations (e.g. hero in battle)
2024-07-20 18:28:47 +00:00
Ivan Savenko
1c522c49b6
Fix possible crash on trying to move to invalid battlefield hexes
2024-07-20 18:28:13 +00:00
Xilmi
809163b705
Update SDLImage.cpp
...
Fixed crash
2024-07-20 16:10:29 +02: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
SoundSSGood
186c6098e8
Fix endBattleConfirm
2024-07-20 15:07:34 +03:00
Ivan Savenko
3c611ffa5b
Merge pull request #4307 from IvanSavenko/misc_fixes
...
Miscellaneous fixes
2024-07-20 12:56:10 +03:00
Ivan Savenko
08a6b859d2
Merge pull request #4304 from Laserlicht/quickspell-option
...
option to enable quickspell
2024-07-20 12:53:36 +03:00
Ivan Savenko
58c7afefd8
Merge pull request #4298 from Alexander-Wilms/vcmilauncher-forward-stdout-stderr
...
startExecutable(): Forward executable's output, so vcmiclient's stdou…
2024-07-20 12:51:32 +03:00
Ivan Savenko
d59a5dad7d
Merge pull request #4299 from Laserlicht/input_modi_detection
...
input mode detection
2024-07-20 12:51:08 +03:00
Ivan Savenko
34204d5898
Merge pull request #4305 from Laserlicht/fix_search
...
fix search in quick spell spellbook
2024-07-20 12:50:43 +03:00
Aleksandar Kazandzhiev
cde9bed5a6
Use std::vector::empty for non-zero size checking.
...
Use auto type for ocontainers iterations.
2024-07-20 12:16:13 +03:00
Ivan Savenko
2796931259
Fix credits scrolling
2024-07-20 08:28:35 +00:00
Alexander Wilms
8bca2fa643
MSVC CI script: Don't run vswhere to find dumpbin.exe, since it is not used
...
Just the search took 3 to 15 min
2024-07-20 00:04:28 +02:00
Xilmi
2bf7b3200b
Merge remote-tracking branch 'upstream/develop' into develop
2024-07-19 22:05:58 +02:00
Ivan Savenko
8d4f8dcf9c
Add unassigned by default hotkeys to show visitable or blocked tiles
2024-07-19 19:38:40 +00:00
Ivan Savenko
e862b9c868
Fix crash on opening creature window with bonuses that don't have icon
2024-07-19 19:37:22 +00:00
Ivan Savenko
75fd67a921
Fix mouse scroll not working in right-click popups
2024-07-19 19:36:05 +00:00
Ivan Savenko
1dec5e56a9
Fix cursor shadow option in battles
2024-07-19 19:35:39 +00:00
Andrii Danylchenko
3502e30fe5
Merge pull request #4296 from vcmi/build-take-into-account-7lvl-creatures
...
NKAI: take into account 7lvl creature cost when we consider what reso…
2024-07-19 21:34:25 +03:00
Laserlicht
598f1b0738
fix search in quick spell spellbook
2024-07-19 19:49:21 +02:00
Laserlicht
ee0cf58395
option to enable quickspell
2024-07-19 19:43:22 +02:00
Laserlicht
0e207e7f64
change naming
2024-07-19 17:58:23 +02:00
Laserlicht
994a065e29
change naming
2024-07-19 17:58:06 +02:00
Ivan Savenko
5ad1c35354
Merge pull request #4303 from IvanSavenko/savecompat_fix
...
Fix crash on loading saves made in 1.4/1.5
2024-07-19 17:17:54 +03:00
Xilmi
f0f40660c4
reverse getTotalArmyLoss()-change
...
Due to a recent fix in army-loss calculations this method should now work correctly the way it was.
2024-07-19 15:59:57 +02:00
Ivan Savenko
e0c6b6e3d0
Fix crash on loading saves made in 1.4/1.5
2024-07-19 13:57:06 +00:00
