Tomasz Zieliński
7ce3553a6d
Fix race condition when placing object at teh shore
2024-02-04 08:56:21 +01:00
Tomasz Zieliński
6528124c1e
Do not fill water zone with obstacles
2024-02-04 08:55:51 +01:00
Ivan Savenko
7dee24edae
Cleanup
2024-02-03 23:30:16 +02:00
Dydzio
365fedc7e8
Merge branch 'develop' into sod-fly
2024-02-03 20:40:32 +01:00
Ivan Savenko
80fc2bb695
Merge remote-tracking branch 'vcmi/develop' into lobby
2024-02-03 21:11:34 +02:00
DjWarmonger
c09d577a24
Merge pull request #3590 from vcmi/penrose_tiling
...
Positive opionions, no issues found.
2024-02-03 20:00:46 +01:00
Ivan Savenko
bd4c7e3ac0
Added LobbyPrepareStartGame pack to replace old workarounds
2024-02-03 19:57:23 +02:00
Ivan Savenko
2c2bec791c
Fixes and cleanup of game client network shutdown and restart
2024-02-03 19:27:04 +02:00
Tomasz Zieliński
b7df6064cd
Add random map description and display it in RMG menu
2024-02-03 16:23:56 +01:00
Tomasz Zieliński
e6f0afd586
Tweaking parameters, cleanup
2024-02-02 15:50:33 +01:00
Ivan Savenko
f97ffd8e9a
Better handling of disconnects, code cleanup
2024-02-02 15:32:06 +02:00
Tomasz Zieliński
178f960533
First working version
2024-02-02 14:27:32 +01:00
Ivan Savenko
03fcfe3392
Use std::byte in serializer
2024-02-02 13:09:12 +02:00
Tomasz Zieliński
9f7c986621
First version that compiles successfully
2024-02-02 10:37:08 +01:00
Ivan Savenko
29c0989849
Use std::byte to manage network data
2024-02-02 02:02:09 +02:00
Ivan Savenko
58ee72f684
Merge pull request #3588 from IvanSavenko/fix_regressions
...
Fix regressions
2024-02-01 22:27:52 +02:00
Ivan Savenko
7247038458
Merge pull request #3574 from SoundSSGood/altar-fixes
...
Artifacts altar related fixes
2024-02-01 22:27:41 +02:00
Ivan Savenko
b25d4d76a7
Fix Grail digging success message
2024-02-01 18:22:11 +02:00
Ivan Savenko
e66a982c96
Fix backpack availability check in Grail digging
2024-02-01 18:21:54 +02:00
SoundSSGood
a42b60feb9
suggested changes
2024-02-01 13:28:08 +02:00
Ivan Savenko
290cc1510b
Added text container with map translations to campaign state
...
Fixes missing translations for heroes names customized on maps after
their transfer to next scenario
2024-01-31 20:01:24 +02:00
Ivan Savenko
5c5fb523a4
Implemented transfer of artifacts held by non-transferred heroes
2024-01-31 19:32:59 +02:00
Ivan Savenko
6d0803dab6
Fixed decompression of slayer.h3c from french version from gog.com
2024-01-31 16:41:42 +02:00
Ivan Savenko
049c352511
Added loss condition "lose part of Angelic Alliance" to Yog campaign
2024-01-31 12:52:16 +02:00
Ivan Savenko
709d05205d
Yog will now receive Angelic Alliance in his campaign
2024-01-31 12:42:02 +02:00
Ivan Savenko
2e4895766a
Implemented tracking of objects destroyed by players
2024-01-31 01:37:33 +02:00
Ivan Savenko
ccea7fc1fb
Yog will now only get Attack or Defence on leveling up
2024-01-31 00:18:10 +02:00
Ivan Savenko
a9866bb5c6
Added RandomGeneratorUtil::nextItemWeighted convenience method
2024-01-31 00:17:40 +02:00
Ivan Savenko
7992144763
Gem class is now Sorceress
2024-01-30 23:34:27 +02:00
Ivan Savenko
3abc26e789
Moved checks for campaign heroes to CGHeroInstance class
2024-01-30 23:33:58 +02:00
Ivan Savenko
c5c46a7c9a
Implemented connecting to server via proxy
2024-01-30 21:31:41 +02:00
Tomasz Zieliński
c5aa31f46a
First sketch
2024-01-30 18:04:15 +01:00
SoundSSGood
c6ca6ad835
sacrifice routine
2024-01-27 23:01:57 +02:00
SoundSSGood
652f009181
arts altar - arts holder
2024-01-27 15:28:21 +02:00
Ivan Savenko
eaca128c99
Code cleanup
2024-01-26 19:15:57 +02:00
Ivan Savenko
322c5faf63
Merge remote-tracking branch 'vcmi/develop' into lobby
2024-01-26 16:52:23 +02:00
Ivan Savenko
388ca6e776
Added list of active accounts and rooms to UI. Added room creation logic
2024-01-26 16:32:36 +02:00
Ivan Savenko
4d0c0f10a9
Merge pull request #3530 from Laserlicht/tavern
...
Invite hero
2024-01-26 13:12:55 +02:00
Ivan Savenko
2a193effcc
Merge branch 'master' into 'develop'
2024-01-25 16:23:13 +02:00
Tomasz Zieliński
a2e0742ffb
Fix invalid logic which made AI not attack guards
2024-01-24 13:45:05 +02:00
Ivan Savenko
702fc8077d
Fix possible crash on invalid spell
2024-01-24 13:43:35 +02:00
Tomasz Zieliński
dbf53d78ba
Fix invalid logic which made AI not attack guards
2024-01-24 06:20:46 +01:00
Tomasz Zieliński
5836e390f1
Do not place zone guards adjacent to 3rd zone
2024-01-23 13:45:35 +02:00
Ivan Savenko
b51e58cddc
Merge pull request #3544 from vcmi/fix_leaky_connections
...
Do not place zone guards adjacent to 3rd zone
2024-01-23 13:39:11 +02:00
Ivan Savenko
f83a004b54
Added workaround to prevent multithreaded access to bonus system in RMG
2024-01-23 00:49:18 +02:00
Ivan Savenko
284273379e
Merge pull request #3536 from IvanSavenko/serialization_refactor
...
Refactoring of serialization versioning handling
2024-01-22 19:49:24 +02:00
Tomasz Zieliński
b3adb9e554
Do not place zone guards adjacent to 3rd zone
2024-01-22 09:27:30 +01:00
Laserlicht
0a4b5dbe10
code review
2024-01-21 18:12:46 +01:00
Ivan Savenko
9f3655c41b
Minor code cleanup
2024-01-20 23:26:04 +02:00
Ivan Savenko
fc4ae3bd8c
Merge remote-tracking branch 'vcmi/develop' into lobby
2024-01-20 23:01:49 +02:00
Andrii Danylchenko
0c1664dbe7
NKAI: various AI fixes after tests in headless
2024-01-20 22:55:30 +02:00
Ivan Savenko
0c07384293
Refactoring of serialization versioning handling
...
- Removed 'version' field from serialize() method
- Handler classes - Binary(De)Serializer now have 'version' field
- Serialization versioning now uses named enum
Save compatibility with 1.4.X saves should be intact
2024-01-20 20:34:51 +02:00
Ivan Savenko
6b760089a4
Merge pull request #3473 from IvanSavenko/const_lib
...
[1.5] Remove non-const global variables from library
2024-01-20 19:22:46 +02:00
Laserlicht
883ea23495
moved to gameconfig
2024-01-20 17:54:15 +01:00
Ivan Savenko
8e8d42bfa2
Try to simplify / cleanup code to localize crash
2024-01-20 18:40:03 +02:00
Ivan Savenko
912262e826
Avoid crash on invalid artifact in bank config
2024-01-20 18:17:23 +02:00
Ivan Savenko
24d25730ad
Changed checks for null with checks for hasValue
2024-01-20 16:41:10 +02:00
Ivan Savenko
31b04780c9
Added hasValue method to identifiers
2024-01-20 16:40:51 +02:00
Laserlicht
4813179abb
Invite hero setting
2024-01-20 01:24:34 +01:00
Laserlicht
346beea49c
invite hero backend
2024-01-20 01:09:55 +01:00
Ivan Savenko
baa73f5433
Code cleanup
2024-01-20 00:26:25 +02:00
Ivan Savenko
709905b1a0
Simplified networking API
2024-01-19 23:52:28 +02:00
Ivan Savenko
80e960bc8e
Finalized new TCP networking API
2024-01-19 23:52:28 +02:00
Ivan Savenko
47f72af556
Client-side update, adapted and fixed login and chat
2024-01-19 23:49:59 +02:00
Ivan Savenko
4271fb3c95
Extension of lobby server functionality
...
Support for:
- listing of active players
- listing of active rooms
- joining and leaving rooms
- placeholder support for multiple chat rooms
- proxy connections
- invites into private rooms
(only lobby server side for now, client and match server need work)
2024-01-19 23:49:59 +02:00
Ivan Savenko
461bca73f3
Minor cleanup - move reinterpret_cast to jsonNode
2024-01-19 23:49:59 +02:00
Ivan Savenko
55b504792e
Implemented basic version of login window and persistent connection on
...
client
2024-01-19 23:49:59 +02:00
Ivan Savenko
78b7d9e726
Replaced open port check with server crash check
2024-01-19 23:49:59 +02:00
Ivan Savenko
aa7ecea683
Switch turn timers handling to boost asio timer
2024-01-19 23:49:59 +02:00
Ivan Savenko
a50cdbda0c
Added timer functionality to NetworkServer
...
Might not be related to networking strictly speaking, but useful to have
functionality for network thread
2024-01-19 23:49:59 +02:00
Ivan Savenko
c9765a52ff
Do not accept connections into ongoing game
2024-01-19 23:49:59 +02:00
Ivan Savenko
22f0ca67c6
Fix connection to game lobby & map load
2024-01-19 23:49:59 +02:00
Ivan Savenko
0a1153e1c6
Switch client-server communication to new API
2024-01-19 23:49:59 +02:00
Ivan Savenko
de5227142b
Implemented message receiving / broadcasting
2024-01-19 23:49:59 +02:00
Ivan Savenko
07fb313765
Implemented loading of latest messages on joining chat
2024-01-19 23:49:59 +02:00
Ivan Savenko
f10b6df989
Implemented messages sending and storing in database
2024-01-19 23:49:59 +02:00
Ivan Savenko
dff9cf39c0
Implemented connection handling
2024-01-19 23:49:59 +02:00
Ivan Savenko
c2c43602ea
Initial version of global lobby server available in client
2024-01-19 23:49:59 +02:00
Ivan Savenko
d04241b10a
Code cleanup
2024-01-19 23:02:00 +02:00
Ivan Savenko
1f7e53a609
Code style fixes
2024-01-19 21:21:23 +02:00
Ivan Savenko
339fad6e27
Merge pull request #3528 from vcmi/master
...
Merge master -> develop
2024-01-19 21:19:20 +02:00
Ivan Savenko
aa02d5787a
Better solution for rmg crash fix
2024-01-19 17:26:51 +02:00
Ivan Savenko
789c96d9b0
Fixed binding lambda to a reference to a temporary on stack
2024-01-19 16:17:59 +02:00
Ivan Savenko
e50f586d8b
Stabilization
2024-01-19 14:21:13 +02:00
Ivan Savenko
ffd604c114
Removed unnecessary access to IHandler::objects
2024-01-19 13:56:06 +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
496c13b34a
Stabilization
2024-01-19 13:56:06 +02:00
Ivan Savenko
9af7c63a26
Fix build
2024-01-19 13:56:05 +02:00
Ivan Savenko
ea1f05d15a
Stabilization
2024-01-19 13:55:22 +02:00
Ivan Savenko
60ffb81b33
Replaced remaining placeholder code with callbacks
2024-01-19 13:55:22 +02:00
Ivan Savenko
e67e4430ba
Removed most of non-const static fields in lib. Reduced header includes.
2024-01-19 13:55:22 +02:00
Ivan Savenko
a15366f5a5
Make IObjectInterface::cb non-static
2024-01-19 13:55:21 +02:00
Ivan Savenko
c37ce05d06
Attempt to make constant bonus system nodes (CCreature / CArtifact)
...
fully constant
2024-01-19 13:54:49 +02:00
Ivan Savenko
2c4cad7d9c
Slight simplification of bonus system node class
2024-01-19 13:54:49 +02:00
Ivan Savenko
d5c4478816
Remove most of non-const access to VLC entities
2024-01-19 13:54:49 +02:00
Ivan Savenko
bd5682ecc3
Merge remote-tracking branch 'vcmi/master' into develop
2024-01-19 13:49:54 +02:00
Dydzio
ad8d57f7a4
Merge branch 'beta' into sod-fly
2024-01-18 20:42:22 +01:00
Dydzio
440b468e27
Some partial success on getting fly to work similarly to SoD
2024-01-18 20:42:08 +01:00
Ivan Savenko
c31d52bff6
Added new bonus icon
2024-01-18 17:18:13 +02:00
Ivan Savenko
3e8f110482
Merge pull request #3515 from SoundSSGood/backpack-statusbar
...
Backpack statusbar
2024-01-18 16:05:42 +02:00
Ivan Savenko
b698b6e79d
Merge pull request #3512 from Alexander-Wilms/use-auto-with-template-factory-functions-for-smart-pointers
...
Use auto with template factory functions for smart pointers
2024-01-18 16:05:05 +02:00
Ivan Savenko
9025744cc5
Merge pull request #3510 from Alexander-Wilms/remove-semicolons-from-macros
...
Remove trailing semicolons from more macros
2024-01-18 16:03:55 +02:00
Ivan Savenko
b1bd44de1e
Merge pull request #3298 from vcmi/random_prison_distributor
...
Fixes to hero / prison distribution
2024-01-18 16:03:08 +02:00
SoundSSGood
8d4b74b441
Assembling in backpack fixed
2024-01-18 12:49:08 +02:00
Alexander Wilms
b364f707cd
Fix issues introduced by automated replacement of redundant types
2024-01-17 20:12:57 +00:00
Alexander Wilms
7a1cee1a60
Fix error: 'auto' not allowed in non-static struct member
2024-01-17 14:49:28 +00:00
Alexander Wilms
57c51b62fd
Fix CGameHandler.cpp:1026:4: error: function 'getAllowedSpells' with deduced return type cannot be used before it is defined
2024-01-17 14:41:53 +00:00
Alexander Wilms
271eeca11b
Fix BattleEvaluator.cpp:286:32: error: function 'battleGetAllObstacles' with deduced return type cannot be used before it is defined
2024-01-17 14:41:47 +00:00
Alexander Wilms
f08c6d1ce9
Fix issues created by type replacement script
2024-01-17 14:33:02 +00:00
Alexander Wilms
73019c204d
Replace redundant types with auto for the lvalues of template factory functions for smart pointers
...
grep -r --include \*.h --include \*.cpp "= std::" * | grep -v auto | grep -Po ".*[^ ]+ [^ ]+ [^ ]*[ ]*=.*;" | grep -v "auto\|int\|char\|bool\|float|\double\|for\|if\|googletest\|fuzzylite\|size_t\|using\|return" | grep -v double | grep -v si64 | grep -v si32 | grep -v ui32 | grep \< | grep -v float | tr -d '\t' | grep -v assert > redundant_types.txt
import re
with open("redundant_types.txt") as f:
for line in f:
line = line.strip()
path = line.split(":", 1)[0]
original_code = ":".join(line.split(":")[1:]).strip()
print()
print(path)
print(original_code)
prefix = "auto "
if original_code.startswith("static"):
static = True
else:
static = False
cpp_type = " ".join(original_code.split("=")[0].strip().split(" ")[0:-1])
print(cpp_type)
if static:
new_code = "static auto "+ " ".join(original_code.split(" ")[2:])
else:
new_code = "auto "+ " ".join(original_code.split(" ")[1:])
print(new_code)
if True:
with open(path, "r") as f:
filedata = f.read()
filedata = filedata.replace(original_code, new_code)
with open(path, "w") as f:
f.write(filedata)
2024-01-17 12:50:00 +00:00
DjWarmonger
4f28cd42b7
Update lib/rmg/modificators/PrisonHeroPlacer.h
...
Co-authored-by: Alexander Wilms <Alexander-Wilms@users.noreply.github.com>
2024-01-17 10:11:55 +01:00
DjWarmonger
91a20c2bfd
Update lib/rmg/CMapGenerator.h
...
Co-authored-by: Alexander Wilms <Alexander-Wilms@users.noreply.github.com>
2024-01-17 10:11:50 +01:00
Tomasz Zieliński
66efb07e52
More
2024-01-17 07:45:53 +01:00
Tomasz Zieliński
a568a9b3fb
Fix lambda capture
2024-01-17 07:26:51 +01:00
Tomasz Zieliński
253f1dc7e6
Refactor duplicated code as suggested by SonarCloud
2024-01-17 07:18:14 +01:00
Alexander Wilms
558ead41fe
Add missing semicolon after macro usage
2024-01-16 20:18:18 +00:00
Ivan Savenko
bf62e47481
Merge pull request #3505 from IvanSavenko/bugfixing
...
[1.4.3] Bugfixing
2024-01-16 22:00:11 +02:00
Alexander Wilms
ccac73fb69
Remove trailing semicolons from more macros
2024-01-16 19:46:21 +00:00
Ivan Savenko
723a95f770
Add assertions to detect invalid calls
2024-01-16 21:12:57 +02:00
Alexander Wilms
cca08e29da
Remove duplicate semicolons
2024-01-16 19:02:39 +00:00
Tomasz Zieliński
afc9bd908c
Unused capture
2024-01-16 17:38:36 +01:00
Tomasz Zieliński
aa5bb27d20
Style
2024-01-16 17:16:15 +01:00
Tomasz Zieliński
71844d4d92
Unban artifacts if RMG fails to place Seer Hut (unlikely)
2024-01-16 17:15:35 +01:00
Ivan Savenko
1194419884
Added option to allow self-casting
2024-01-16 15:13:00 +02:00
Ivan Savenko
c3012105e2
Fix duplicated hero in Song for the Father campaign
2024-01-16 14:45:38 +02:00
Ivan Savenko
bdd649a3be
Merge pull request #3502 from IvanSavenko/campaign_localization_fix
...
Fixed missing translation strings on loading campaign save
2024-01-16 11:49:25 +02:00
Ivan Savenko
c839b397e8
Block self-casting, e.g. Archangels can't resurrect themselves
2024-01-15 23:16:53 +02:00
Ivan Savenko
6e5da6c158
Fixed Coronius specialty applying from two locations in code
2024-01-15 23:16:53 +02:00
Ivan Savenko
c21913f661
Fixed initialization of move points and mana for dismissed heroes
2024-01-15 23:16:48 +02:00
Ivan Savenko
2265890f69
Better detection of invalid mod data to avoid crash and notify modders
2024-01-15 18:19:21 +02:00
Ivan Savenko
a32ef673f7
Merge pull request #3482 from IvanSavenko/extend_hota_bonuses
...
Extend hota bonuses
2024-01-15 13:47:13 +02:00
Ivan Savenko
c7897300c0
Fixed missing translation strings on loading campaign save
...
- campaign header now contains text container and stores campaign texts
- map header now contains text container instead of inheriting it
- moved text container registration logic to a wraper class
- fixed registration of copied text containers (from copied map header)
2024-01-15 13:10:25 +02:00
Ivan Savenko
a582cb554e
Merge pull request #3500 from IvanSavenko/fix_dendroid_bind
...
[1.4.3] Fix handling of Dendroid's Bind ability
2024-01-15 12:02:06 +02:00
Ivan Savenko
b4a1a755a4
Merge pull request #3498 from IvanSavenko/simturns_pathfinder
...
[1.4.3] Fixes for simultaneous turns
2024-01-15 12:00:54 +02:00
Ivan Savenko
8400c27251
Merge pull request #3491 from IvanSavenko/change_default_driver
...
Change default SDL driver name from opengl to empty (autoselection)
2024-01-15 11:57:42 +02:00
Tomasz Zieliński
0273d9c36b
Remove unused variable
2024-01-15 07:59:50 +01:00
Tomasz Zieliński
285bafdbf4
Do not ban heroes in Prisons, they might be rehired after they are defeated.
...
Restore hero to pool if Prison fails to be placed.
2024-01-15 07:41:29 +01:00
Tomasz Zieliński
ee6c331bad
Merge remote-tracking branch 'origin/beta' into random_prison_distributor
2024-01-14 21:56:49 +01:00
DjWarmonger
19765e0e01
Merge pull request #3480 from IvanSavenko/rmg_ban_starting_heroes
...
Ban starting heroes in RMG
2024-01-14 21:56:16 +01:00
Ivan Savenko
0d0d3d8c80
Renamed speed -> getMovementRange, remove misleading default parameter
2024-01-14 17:14:36 +02:00
Ivan Savenko
fd499e318d
Review suggestion
2024-01-14 15:36:29 +02:00
Ivan Savenko
b08462d555
Change default SDL driver name from opengl to empty (autoselection)
2024-01-14 14:29:13 +02:00
Tomasz Zieliński
3e623565a2
Fix redundant class
2024-01-13 21:39:17 +01:00
Tomasz Zieliński
3aa67b3e5f
Merge remote-tracking branch 'origin/beta' into random_prison_distributor
2024-01-13 21:02:08 +01:00
Ivan Savenko
8303ce5d13
Added option to ignore guards in pathfinder
...
Used for simturns contact detection, by default disabled for player
pathfinding
2024-01-13 19:44:37 +02:00
Ivan Savenko
fc6a9924ee
FIRST_STRIKE now supports ranged / melee subtypes, BLOCKS_RETALIATION
...
will properly block FIRST_STRIKE
2024-01-13 16:54:06 +02:00
Ivan Savenko
bb670cfb82
Merged accurate shot bonus into death stare bonus
2024-01-13 15:55:07 +02:00
Ivan Savenko
ca2df49fbb
Block usage of preselected starting heroes for prisons in RMG
2024-01-13 14:08:36 +02:00
Ivan Savenko
f6e0f46040
Merge pull request #3467 from dydzio0614/hota-fixes
...
Fix HotA creature abilities (add bonuses allowing implementing them)
2024-01-12 21:55:18 +02:00
M
9ee526d202
Fixes from code review
2024-01-11 21:10:22 +01:00
Dydzio
250b1b69a8
Update accurate shot translation handling
...
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-01-10 23:57:29 +01:00
M
7bf273e01c
Extract revenge calculation to separate method
2024-01-10 22:56:26 +01:00
M
815fa26fb3
Change nix rounding, revert assert comment
2024-01-10 22:18:53 +01:00
Ivan Savenko
206b4a0588
Merge pull request #3454 from IvanSavenko/mod_debug
...
Better error-reporting for modding system errors
2024-01-10 15:50:17 +02:00
Alexander Wilms
5e9f98b15c
Resolve intentionality issues
2024-01-10 00:23:24 +00:00
Alexander Wilms
f3277b7953
Define each identifier in a dedicated statement
2024-01-10 00:22:23 +00:00
M
67f18729fa
REVENGE bonus that matches HotA haspid ability
2024-01-09 19:10:43 +01:00
Ivan Savenko
eae3d806db
Merge pull request #3460 from Laserlicht/changedate_sort
...
add sort for changedate
2024-01-09 12:43:01 +02:00
Dydzio
dbba1164ef
Fix floating point rounding for 5 attack points and unupgraded nix
2024-01-08 20:50:37 +01:00
Ivan Savenko
6c8a587ac9
Better diagnostics of ID requests that require type, such as addInfo
2024-01-08 21:32:10 +02:00
Dydzio
675f9b11fa
Add ENEMY_ATTACK_REDUCTION bonus - fixes HotA Nix
2024-01-08 19:37:04 +01:00
Ivan Savenko
18227cba00
Implemented better error-reporting for issues commonly encountered by
...
modders
2024-01-07 22:35:22 +02:00
Dydzio
3c95f92c59
Update documentation
2024-01-07 21:22:10 +01:00
Ivan Savenko
ae79c5e953
Merge pull request #3397 from Laserlicht/cheat_allow
...
option for disabling cheats
2024-01-07 21:42:02 +02:00
Laserlicht
8b262e49a6
add sort for changedate
2024-01-07 20:17:44 +01:00
Dydzio
bb925e4cb0
First version of sea witch / sorceress ability
2024-01-07 19:27:32 +01:00
Ivan Savenko
a2f603ac02
Fixed some cases of illegal access to std::array::operator[]
2024-01-07 12:45:02 +02:00
Ivan Savenko
cf47fbb729
Merge pull request #3435 from IvanSavenko/bugfixing
...
[1.4.3] Bugfixing
2024-01-06 13:06:07 +02:00
Ivan Savenko
1519de60bf
Remove excessive logging on using Recanter's Cloak in siege of Tower
2024-01-05 18:31:07 +02:00
Ivan Savenko
51b7de4b98
Fix double off-by-one bug with CREATURE_GROWTH bonus
2024-01-05 16:57:44 +02:00
Ivan Savenko
480a0f19c0
Fix missing modded spells in magic guilds for h3m maps
2024-01-05 16:47:23 +02:00
Ivan Savenko
4b5b99aba3
Fix handling of invalid creature damage range (min > max)
2024-01-05 16:12:02 +02:00
Ivan Savenko
fbdceb4f71
Fix crash on using two mods that add battlefield with same identifier
2024-01-05 15:58:25 +02:00
Ivan Savenko
2d8692c142
Throw "resource not found" instead of crashing on invalid query
2024-01-04 23:58:28 +02:00
Ivan Savenko
edb2ecd751
Fix possible overflow errors on leveling up beyond int64_t limit
...
- added separate giveExperience method instead of weird changePrimSkill
- experience is now always used in form of int64_t
- max supported level reduced from 201 to 197 to fit into int64_t
- fixed undefined behavior in experience calculation
2024-01-04 23:57:36 +02:00
Ivan Savenko
ceea341bb0
Fix crash on attempt to dereference invalid subtype in bonus
2024-01-04 23:54:35 +02:00
Ivan Savenko
63a2ed7cf8
Replace vector[] with range-checking vector.at()
2024-01-04 23:52:57 +02:00
Ivan Savenko
3b66701ffe
Ignore illegal 'index' entries in mods
2024-01-04 23:52:01 +02:00
Ivan Savenko
ef5686634d
Removed no longer used code
2024-01-04 23:48:58 +02:00
Ivan Savenko
55bd164f1c
Unified identifiers to entity conversion code
2024-01-04 23:47:44 +02:00
Dydzio
7283a4861e
Initial version of ACCURATE_SHOT implementation
2024-01-04 22:27:51 +01:00
Joakim Thorén
30b851da7c
Merge branch 'develop' of https://github.com/vcmi/vcmi into windows_mingw_cmake_presets
2024-01-01 22:53:19 +01:00
Dydzio
fbd988df42
Bit better documentation wording
2024-01-01 21:19:25 +01:00
Dydzio
7cf7543747
Configurable ferocity bonus
2024-01-01 21:16:38 +01:00
Dydzio
898b8f3c71
Add initial version of Ferocity ability (for Ayssids)
2024-01-01 19:58:32 +01:00
Joakim Thorén
8846fba1fc
Fixes compilation error "ResourceSet.h:33:21: error: function 'ResourceSet::ResourceSet()' definition is marked dllimport" when building with g++ 12.1.0
2023-12-30 00:29:31 +01:00
Laserlicht
cb9c4bbaf0
unlimited replay option
2023-12-28 20:48:19 +01:00
Laserlicht
a3e27b859e
extra option tab
2023-12-28 19:41:01 +01:00
Joakim Thorén
01f602ab92
Fixes warning about usage of unused variable
2023-12-27 22:25:29 +01:00
Laserlicht
207b5a2ed0
backwards compatibility
2023-12-27 20:44:32 +01:00
Laserlicht
c471b626a2
code review
2023-12-27 15:26:08 +01:00
Laserlicht
fc4827c89c
option for allowing cheats
2023-12-27 14:39:35 +01:00
Ivan Savenko
bb6179d05e
Merge pull request #3391 from vcmi/master
...
Merge master -> develop
2023-12-25 13:00:17 +02:00
Ivan Savenko
4835a1f695
Fix possible crash on abandoned mine with no valid resources
2023-12-24 22:05:47 +02:00
Ivan Savenko
e77651d3f3
Merge pull request #3377 from dydzio0614/commander-skills-fix
...
Commander skills fix
2023-12-24 13:33:48 +02:00
Ivan Savenko
2b495a9679
Merge pull request #3379 from IvanSavenko/fix_genie_spellcasting
...
Fix genie spellcasting
2023-12-24 13:29:05 +02:00
Ivan Savenko
5fe5d81729
Merge pull request #3376 from IvanSavenko/uninitialized_fixes
...
Fix uninitialized memory access
2023-12-24 13:19:17 +02:00
Tomasz Zieliński
ebf2055afc
- Unban hero if related Prison is destroyed during map generation
...
- Move prison counter to PrisonHeroPlacer
2023-12-24 09:36:26 +01:00
Andrey Filipenkov
3074f8cb89
fix typo
2023-12-24 09:58:48 +03:00
Tomasz Zieliński
b0f0e9caa8
Merge remote-tracking branch 'origin/beta' into random_prison_distributor
2023-12-24 06:46:18 +01:00
Ivan Savenko
85de3143ff
Fixed Genie spellcasting logic to account for spell immunities
2023-12-24 01:13:19 +02:00
Ivan Savenko
08a4b67cd7
Merge pull request #3372 from IvanSavenko/bugfixing
...
[1.4.2] Bugfixing
2023-12-23 22:05:39 +02:00
Ivan Savenko
3e9133995f
Fix uninitialized member
2023-12-23 21:31:29 +02:00
Ivan Savenko
7732f39556
Fix potential uninitialized access - setupSteps depends on not yet
...
initialized members
2023-12-23 21:31:17 +02:00
Dydzio
9e9849b741
Fix commander ability accumulation, change commander ability bonus
2023-12-23 20:16:29 +01:00
Ivan Savenko
72980a3909
Fix crash on accessing jsonnode with different type in release builds
2023-12-23 18:12:18 +02:00
Ivan Savenko
ec5fcb3e7c
Do not ignore 'canRefuse' flag for select mode 'first' and 'random'
2023-12-23 00:35:51 +02:00
Ivan Savenko
20ede710c2
Merge pull request #3362 from IvanSavenko/terrain_decorations
...
Terrain decorations level
2023-12-22 23:39:32 +02:00
Ivan Savenko
bbbf676d38
spaces -> tabs
2023-12-22 23:22:33 +02:00
Ivan Savenko
9bf1e72a19
Merge pull request #3346 from IvanSavenko/better_timers
...
[1.4.2] Better timers
2023-12-22 23:19:20 +02:00
Ivan Savenko
fe5918ebf5
Clients will now switch to turn options when host does so
2023-12-22 18:40:28 +02:00
Ivan Savenko
da9c0feebc
Reworked timer widget to show timers for all players
2023-12-22 18:40:28 +02:00
Ivan Savenko
8916ae7bcd
Fix water generation, try to improve decoration level a bit
2023-12-22 18:35:38 +02:00
Ivan Savenko
19e851ddff
Implemented configurable level of decorations for terrains
2023-12-22 17:41:30 +02:00
Ivan Savenko
c8d024ae11
Merge pull request #3354 from dydzio0614/antimagic-garrison
...
Add missing antimagic functionality to antimagic garrisons
2023-12-22 16:33:39 +02:00
Ivan Savenko
48a8826aa1
Merge pull request #3308 from vcmi/improve_treasure_placement
...
Improve treasure placement
2023-12-22 16:32:59 +02:00
Ivan Savenko
4ed283a357
Merge pull request #3359 from IvanSavenko/crashfixes
...
Crashfixes
2023-12-22 15:17:59 +02:00
Ivan Savenko
ec89e7fa62
Move UNLIMITED_MOVEMENT bonus to very end of the list
2023-12-22 14:20:32 +02:00
Ivan Savenko
171044359d
Fixed crash on connection to 1.4.1 game
2023-12-22 14:03:05 +02:00
Ivan Savenko
31cef2e7d7
Attempt to fix crash on rewardable configuration
2023-12-22 14:03:05 +02:00
Dydzio
39c3db04f3
Add missing antimagic functionality to antimagic garrisons
2023-12-21 18:09:33 +01:00
Tomasz Zieliński
f9e5d73014
Missed optimization case
2023-12-21 17:56:21 +01:00
Tomasz Zieliński
d6336d7c45
Reverted change that seems to cause regression
2023-12-21 17:55:08 +01:00
Ivan Savenko
27d2fc0a13
Merge pull request #3186 from SoundSSGood/quick-backpack-part1
...
Quick backpack window
2023-12-21 17:10:15 +02:00
Tomasz Zieliński
d4216a9191
Fixed routing roads behind Sub Gates, Monoliths and Mines
2023-12-21 13:22:23 +01:00
Tomasz Zieliński
d5f9de5beb
Definitive solution for Corpse
2023-12-21 12:29:45 +01:00
Tomasz Zieliński
e22f6dd07e
Fix for choosing most specific templates. Also seems to fix the Prisons.
2023-12-21 09:58:39 +01:00
SoundSSGood
e5c532beb4
gesture for quick backpack window
2023-12-20 16:55:38 +02:00
Dydzio
fe39faf36c
Add UNTIL_OWN_ATTACK bonus duration and use for berserk
2023-12-19 19:52:40 +01:00
SoundSSGood
5099b52a4f
Quick backpack. Spells on scrolls view
2023-12-19 19:01:56 +02:00
Tomasz Zieliński
ad82eff225
Final and perfect treasue nd obstacle density
2023-12-19 09:24:43 +01:00
Tomasz Zieliński
916aedb13c
Obvious fix
2023-12-19 09:24:01 +01:00
Tomasz Zieliński
bbb3e701ab
Reverted incorrect logic. Likely the fix for hota Prison.
2023-12-18 17:18:13 +01:00
Tomasz Zieliński
9b12f54972
Compile fix
2023-12-18 14:49:05 +01:00
Tomasz Zieliński
7f7df93e12
Style fix
2023-12-18 14:25:07 +01:00
Tomasz Zieliński
80ea1826d3
Style fix
2023-12-18 14:02:55 +01:00
Tomasz Zieliński
038bcd32f6
Lightweight int3 hash function
2023-12-18 13:55:54 +01:00
Tomasz Zieliński
c701d42781
Multiple optimizations to avoid copying and allocating tiles for rmg::Area
2023-12-18 13:52:03 +01:00
Ivan Savenko
f40e711721
Merge pull request #3340 from IvanSavenko/crashfixes3
...
Crashfixes
2023-12-18 13:40:13 +02:00
Ivan Savenko
3f089cce78
Merge pull request #3341 from IvanSavenko/fix_extraction_progress
...
Fix extraction progress display for mod installation
2023-12-18 13:34:37 +02:00
Ivan Savenko
44a79c1ff4
Merge pull request #3327 from Laserlicht/datetime
...
date time format
2023-12-18 13:21:01 +02:00
Tomasz Zieliński
985a2682ae
Place Monoliths at max distance in Junction zone
2023-12-18 11:12:52 +01:00
Tomasz Zieliński
bd5361a108
Possible fix to https://github.com/vcmi/vcmi/issues/3334
2023-12-18 10:55:40 +01:00
Tomasz Zieliński
24f74875ef
Do not fractalize tiles near the edge of the map to avoid paths adjacent to map edge
2023-12-18 08:14:48 +01:00
Ivan Savenko
74dedc4cc5
Converted ZipArchive namespace into stateful class
2023-12-18 00:33:32 +02:00
Ivan Savenko
acc09ee51a
Merge pull request #3266 from Laserlicht/puzzle_cheat
...
implement missing OH3/HDmod cheats
2023-12-17 22:16:22 +02:00
Ivan Savenko
496bca1a59
Attempt to track down mystery crash on Android
2023-12-17 20:09:28 +02:00
Ivan Savenko
6a357aaea6
Fix empty names for mods without set name (e.g. core mod)
2023-12-17 19:44:45 +02:00
Ivan Savenko
84d9078bd9
Throw exception instead of failing with SIGSEGV
2023-12-17 19:44:45 +02:00
Ivan Savenko
dd88220b7c
Fixed potentially uninitialized class member
2023-12-17 19:44:45 +02:00
Laserlicht
9299eaed36
code review
2023-12-16 21:10:27 +01:00
Laserlicht
d91aa8baca
fix russia
2023-12-16 19:26:41 +01:00
Laserlicht
56562ad8dc
date time format
2023-12-16 18:57:38 +01:00
Ivan Savenko
b6cc26f853
Fix build
2023-12-16 14:29:49 +02:00
Ivan Savenko
d187309eed
Fixed typo - different type was used to select ID and subID
2023-12-16 13:46:29 +02:00
Ivan Savenko
1acab80fdc
Use unique_ptr instead of raw pointers to attempt to fix crash on free
2023-12-16 13:46:29 +02:00
Ivan Savenko
aadfde27bc
Throw exception instead of crash on accessing non-existing setting
2023-12-16 13:46:29 +02:00
Ivan Savenko
9ff00d75dc
Do not crash if Scholar is not a rewardable object
2023-12-16 13:46:29 +02:00
Tomasz Zieliński
339627731c
Fixes
2023-12-15 18:26:59 +01:00
kirby1
5888a20920
Add OpenBSD defines
2023-12-14 10:29:42 +03:00
Tomasz Zieliński
99870be24c
Tiny optimizations to avoid copies
2023-12-13 22:20:23 +01:00
Tomasz Zieliński
d31789e745
Extra cache for search area
2023-12-13 22:13:42 +01:00
Tomasz Zieliński
bfea30e318
Optimization tweaks
2023-12-13 22:12:16 +01:00
Tomasz Zieliński
8602a14e6f
Minor optimizations
2023-12-13 22:10:39 +01:00
Tomasz Zieliński
b9193ecb73
Do not calculate area for invalid positions
2023-12-13 22:06:47 +01:00
Ivan Savenko
3bd85d417e
Avoid crash on invalid building identifier
2023-12-13 17:23:45 +02:00
Ivan Savenko
664da58d4f
Use MetaString in place of boost::format to avoid exceptions
2023-12-13 17:23:40 +02:00
Ivan Savenko
337e090ee9
Avoid crash in case if Witch Hut or Shrine is not a rewardable object
2023-12-13 16:52:44 +02:00
Tomasz Zieliński
2d3b8ee866
Increased amount of generated treasure piles without increasing density
2023-12-12 12:50:27 +01:00
Tomasz Zieliński
e5f60f063c
- Check full object area for minimum distance requirement
...
- Add option to optimize both for max distance and custom weight
2023-12-12 07:40:54 +01:00
Ivan Savenko
9385ae76c2
Fix reading of dimensions of h3 map objects
2023-12-11 21:15:46 +02:00
Ivan Savenko
543ee597b8
Fix localization-related error messages
2023-12-11 18:23:52 +02:00
Ivan Savenko
a3786f3357
Merge pull request #3304 from IvanSavenko/handle_unknown_objects
...
Handle unknown objects
2023-12-11 18:23:28 +02:00
Ivan Savenko
afff10aab0
Merge pull request #3303 from IvanSavenko/artifact_randomization_fix
...
Remove allowed artifacts list from arthandler
2023-12-11 18:23:19 +02:00
Ivan Savenko
828077c18b
Added special object "nothing" to handle unknown map objects on some
...
custom maps
2023-12-11 17:25:19 +02:00
Ivan Savenko
7ffe014d6b
Remove allowed artifacts list from arthandler
...
1. Handlers should not contain non-const game state data
2. This field was duplicating same field in CMap
3. Due to removal of VLC serialization, this field is not updated on map
load leading to issues with artifact randomization
2023-12-11 15:06:04 +02:00
Tomasz Zieliński
493acd9b75
One little fix for inconsistent indexes
2023-12-11 08:28:53 +01:00
Tomasz Zieliński
109139c913
Build fix
2023-12-11 08:27:57 +01:00
Tomasz Zieliński
8a93b1083f
Merge remote-tracking branch 'origin/beta' into random_prison_distributor
2023-12-11 07:49:43 +01:00
Tomasz Zieliński
8fe6a103cd
- Move Hero / Prison distribution to separate modificator
...
- Protect rolling and banning hero with mutex
2023-12-11 07:37:23 +01:00
Ivan Savenko
6fe8ed7a03
Merge pull request #3127 from vcmi/fix_random_object_templates
...
Use the object templates with least terrains allowed
2023-12-10 23:11:20 +02:00
Ivan Savenko
fa11b52a6c
Merge pull request #3287 from vcmi/fix_template_validation
...
Fix template validation
2023-12-10 22:47:23 +02:00
Ivan Savenko
933598dd91
Merge pull request #3273 from vcmi/fix_passable_hero
...
Fix passable hero
2023-12-10 22:45:33 +02:00
Ivan Savenko
8bf05a8f77
Merge pull request #3272 from vcmi/fix_rmg_monoliths
...
Fix rmg monoliths
2023-12-10 22:44:05 +02:00
Ivan Savenko
a1a317aef4
Merge pull request #3280 from IvanSavenko/hotfix
...
[1.4.1] Hotfixes
2023-12-10 22:43:05 +02:00
Ivan Savenko
7187ba2d79
Fix crash on visiting Seer Hut with no reward
2023-12-10 19:48:44 +02:00
Ivan Savenko
b62e801530
Fix uninitialized variable in Seer Huts
2023-12-10 19:48:27 +02:00
Ivan Savenko
65721123a1
Partial fix for Coronius specialty bug
2023-12-10 19:17:58 +02:00
Ivan Savenko
c0572b061a
Fix compile on FreeBSD
2023-12-10 19:17:24 +02:00
Ivan Savenko
3b6d3dee69
Slayer spell should only affect creatures with KING bonus
2023-12-10 19:17:09 +02:00
Andrii Danylchenko
48f0da1fdc
#3290 - skip bad teleports (exit in rocks)
2023-12-10 18:38:54 +02:00
Ivan Savenko
999db2ed78
Avoid boost::format that throws exception on invalid format string
2023-12-10 16:37:58 +02:00
Ivan Savenko
ee7bd87b8d
Fix crash on losing mission-critical hero in battle
2023-12-10 16:14:01 +02:00
Tomasz Zieliński
d0e100c1bb
Fix unused variable
2023-12-10 09:50:25 +01:00
Tomasz Zieliński
91ebac3c2e
Fix incorrect check
2023-12-10 09:46:20 +01:00
Ivan Savenko
2de7a3939a
Fix text identifier for generic signs without custom text
2023-12-09 18:09:57 +02:00
Ivan Savenko
2261298d09
Revert U-turns block. Actually possible in H3 and has unintended side
...
effects
2023-12-09 18:09:38 +02:00
Ivan Savenko
df78c9c6f1
Added workaround for crashes with outdated mods
2023-12-09 18:08:22 +02:00
Tomasz Zieliński
d15e9f886c
Cleanup
2023-12-09 15:35:32 +01:00
Tomasz Zieliński
134f78113e
Remove unneccessary code
2023-12-09 15:20:11 +01:00
Tomasz Zieliński
cef25cca03
Fix for starting hero being passable
2023-12-09 14:59:09 +01:00
Tomasz Zieliński
0f23dde85d
Fixed crash due to incorrect monolith id scopes
2023-12-09 14:25:03 +01:00
Laserlicht
a24e78a210
real unlimited movement (like in OH3)
2023-12-09 13:42:09 +01:00
Laserlicht
4bad88f141
implement luck and morale cheats from OH3
2023-12-08 19:20:53 +01:00
Ivan Savenko
c9de10ea74
Merge pull request #3259 from vcmi/fix_corpse
...
Fix corpse
2023-12-07 23:55:07 +02:00
Ivan Savenko
500f945222
Update lib/mapObjectConstructors/AObjectTypeHandler.cpp
2023-12-07 22:48:51 +02:00
Tomasz Zieliński
c316087950
Distribute objects among zones in random order
2023-12-07 17:41:41 +01:00
Tomasz Zieliński
7fa01a3497
Fix for randomly banning or exceeding limits of zone objects
2023-12-07 17:41:09 +01:00
Ivan Savenko
edbe25b33a
Updated layout and localizations
2023-12-07 16:36:44 +02:00
Tomasz Zieliński
f17d8babc5
Do not route road through the Corpse
2023-12-07 12:57:39 +01:00
Ivan Savenko
653304b004
Implemented accumulating timers, rename creature timer to unit timer
2023-12-07 13:57:16 +02:00
Tomasz Zieliński
5ad682048f
Fix
2023-12-06 21:47:20 +01:00
Tomasz Zieliński
69ff1734b0
Use reference
2023-12-06 21:05:27 +01:00
Tomasz Zieliński
6cd19b81dd
Working fir for Corpse issue:
...
- Do not place guard next to blockVis object, if possible
- Do not place two blockVis objects next to each other
2023-12-06 20:49:28 +01:00
Tomasz Zieliński
03fa75c51e
Some refactoring, commiting current state after tests
2023-12-06 09:49:41 +01:00
Ivan Savenko
cd5d6a8f77
Fix loading of artifact ID for "transport item" victory condition
2023-12-03 19:45:18 +02:00
Ivan Savenko
a1f4748bbc
Fix socket shutdown
2023-12-03 19:44:58 +02:00
Ivan Savenko
773071fee3
Fix AI movement through wandering monsters
2023-12-03 15:58:44 +02:00
Ivan Savenko
be9c7f2099
Merge pull request #3239 from IvanSavenko/pathfinder_fixes
...
Pathfinder fixes
2023-12-02 12:20:44 +02:00
Ivan Savenko
a7d6068bf6
Do not ignore block-visit objects when computing guardian locations
2023-11-28 19:32:03 +02:00
Ivan Savenko
37d81e916e
Fix creature appearance on hota maps
2023-11-28 19:31:38 +02:00
Ivan Savenko
0d6bd0c60a
Fix assertion failure in RMG
2023-11-28 16:37:21 +02:00
Ivan Savenko
9277761da5
Do not allow building boat if there is already boat with hero in it
2023-11-28 15:49:03 +02:00
Ivan Savenko
8cbc2c01ad
Do not allow moving through most of visitable objects
2023-11-28 12:32:24 +02:00
Ivan Savenko
faead7739a
Do not allow U-turns while flying. Works fine, but poor representation in
...
UI
2023-11-28 12:32:24 +02:00
Ivan Savenko
5d16f035d7
Workaround for crash on winning the game
2023-11-27 14:09:08 +02:00
Ivan Savenko
ee46fc806a
Add workaround to loading old map format
2023-11-27 14:09:08 +02:00
Ivan Savenko
f2e7791326
Fix crash on Earthquake cast
2023-11-27 14:09:08 +02:00
Ivan Savenko
0cf490e2c3
Remove custom move constructor. Fixes serialization of visitation status
2023-11-27 14:08:49 +02:00
Ivan Savenko
e00d871082
Fix few more warnings on game start
2023-11-27 14:08:49 +02:00
Ivan Savenko
68de34e508
Workaround for starting map with invalid witch huts
2023-11-27 14:08:49 +02:00
Ivan Savenko
560a1231a6
Fix loading of maps with Grail or Diplomat Suit placed on map
2023-11-27 14:08:49 +02:00
Ivan Savenko
2c8d0338ba
Fix error messages in log on map start
2023-11-27 14:08:49 +02:00
Ivan Savenko
6730ec64d5
Fix loading of preset artifacts and creatures on some custom maps
2023-11-26 00:41:49 +02:00
Ivan Savenko
3f60c1b0b3
Remove excessive logging
2023-11-26 00:41:15 +02:00
Ivan Savenko
364977ef40
More meaningful exception messages
2023-11-22 19:11:40 +02:00
Ivan Savenko
e979fb7056
Better fix for allowed heroes in h3m - allow all heroes from mods
2023-11-22 19:11:22 +02:00
Ivan Savenko
f643fff5eb
Merge pull request #3214 from IvanSavenko/bugfixing2
...
Bugfixing
2023-11-21 22:51:31 +02:00
Ivan Savenko
d3d5b67b22
Merge pull request #3207 from IvanSavenko/skill_selection_fix
...
Reworked and fixed selection of secondary skills on levelup
2023-11-21 21:35:06 +02:00
Ivan Savenko
9d298f42c3
Do not allow special spells such as Titan Bolt as a reward
2023-11-21 21:22:17 +02:00
Ivan Savenko
07e7d6cc14
Do not allow fleeing from cities without fort
2023-11-21 20:32:07 +02:00
Ivan Savenko
e96cde291a
Fix generation of additional monolith types for RMG
2023-11-21 18:32:07 +02:00
Ivan Savenko
d0e320723c
Remove no longer relevant assertion
2023-11-21 18:31:43 +02:00
Ivan Savenko
83ca09f483
Fix loading of allowed heroes from h3m maps
2023-11-21 17:23:46 +02:00
Ivan Savenko
d58ea6f28d
Fix keymaster visitation status tracking
2023-11-21 16:38:09 +02:00
Ivan Savenko
a4d5c4917b
Limit resources to 1000 000 000 to prevent overflow
2023-11-20 20:50:37 +02:00
Ivan Savenko
842d66afbc
Fix crash on battlefield deserialization
2023-11-20 19:57:07 +02:00
Ivan Savenko
71825fcc4e
Fix crash on artifact movement
2023-11-20 19:56:55 +02:00
Ivan Savenko
e9ac8c67c1
Reworked and fixed selection of secondary skills:
...
- Fixed off-by-one error when checking for obligatory skills
- If both wisdom and magic school must be offered in the same slot, magic
school will be correctly offered on next levelup
- Obligatory skill can now be proposed for upgrade
- Obligatory skills are now offered using hero class weight instead of
simple random
- If hero has multiple skills not available to his class game will
select random skill instead of first one
- Moved storage of random seed to server instead of mutable member
2023-11-20 18:46:24 +02:00
Ivan Savenko
ff6260e5c5
Merge pull request #3195 from IvanSavenko/identifier_string_serialization
...
Serialize Identifiers that can be added by mods as strings
2023-11-20 14:07:24 +02:00
Ivan Savenko
aaefc07182
Merge pull request #3198 from IvanSavenko/ai_optimize
...
AI optimizations
2023-11-20 14:06:25 +02:00
Ivan Savenko
225a1040f4
Merge pull request #3204 from IvanSavenko/fix_campaign_startup
...
Fix format of custom win/loss conditions for h3 campaigns
2023-11-20 14:06:16 +02:00
Ivan Savenko
a143fa9ac8
Merge pull request #3202 from IvanSavenko/mod_dependencies_check_fix
...
Always convert mod ID to lower case before using it
2023-11-20 14:06:06 +02:00
Ivan Savenko
07990644b5
Merge pull request #3191 from Laserlicht/touch-introduction
...
Touch introduction
2023-11-20 14:05:47 +02:00
Ivan Savenko
f7ef474201
Fix format of custom win/loss conditions for h3 campaigns
2023-11-19 23:59:49 +02:00
Ivan Savenko
c717bb5504
Always convert mod ID to lower case before using it
2023-11-19 20:44:28 +02:00
Ivan Savenko
cc71651ee4
Show proper error message if player attempts to load save with missing
...
identifiers instead of silent crash to main menu
2023-11-19 19:30:55 +02:00
Ivan Savenko
b58301849b
Pass functor via reference to avoid costly copies
2023-11-18 19:43:11 +02:00
Ivan Savenko
f5a64a0ac5
Call cheap to compute conditions before costly conditions
2023-11-18 19:42:45 +02:00
Ivan Savenko
3ac80e1f09
Avoid costly std vector construction
2023-11-18 19:42:02 +02:00
Ivan Savenko
54480c6209
Fixed Building ID serialization to use string
2023-11-17 22:12:11 +02:00
Ivan Savenko
c872f8418f
Implemented serialization of MapObjectSubID, refactoring of related code
2023-11-17 21:18:34 +02:00
Ivan Savenko
9f906ff1d2
Remove pointer to CGObjectInstance from map header
2023-11-17 16:39:15 +02:00
Ivan Savenko
f53a53051b
Fixed map startup
2023-11-17 16:19:07 +02:00
Ivan Savenko
f9e6d1467f
Do not select random towns as starting faction for player
2023-11-17 15:57:46 +02:00
Ivan Savenko
843e97349a
Identifiers that can be added by mods are now serialized as string
2023-11-17 00:48:55 +02:00
Ivan Savenko
c0e54b338a
Merge pull request #3190 from gamestales/gamestales/962-map-object-morale-description
...
Use arraytxt for object bonus description
2023-11-16 17:28:09 +02:00
Ivan Savenko
d71b0b6952
Merge pull request #3179 from vcmi/fix-3173
...
#3173 - fix trap crash on random hero
2023-11-16 17:27:13 +02:00
Ivan Savenko
76956cfe3a
Merge pull request #3188 from IvanSavenko/remove_identifier_implicit_int_conversion2
...
Remove implicit conversion of identifier to integer
2023-11-16 17:26:32 +02:00
Ivan Savenko
de02507fff
Merge pull request #3193 from IvanSavenko/warn_mod_dependencies
...
Show message about mods that failed to load on opening main menu
2023-11-16 17:26:19 +02:00
Laserlicht
2cfbcd067b
videos
2023-11-16 02:58:43 +01:00
Ivan Savenko
d1a4e84255
Show message about mods that failed to load on opening main menu
2023-11-15 17:57:40 +02:00
Ivan Savenko
0705604129
Merge pull request #3185 from IvanSavenko/memleak_fix
...
Memory leak fixes
2023-11-15 16:00:38 +02:00
Ivan Savenko
59b2cbe4d2
Fix regressions
2023-11-15 15:57:03 +02:00
Ivan Savenko
52050d0ef1
Fix build
2023-11-15 15:55:19 +02:00
Ivan Savenko
6cb1f6ff11
Remove all remaining implicit conversion in lib
2023-11-15 15:55:19 +02:00
Ivan Savenko
96c81be68e
Win/loss conditions now use VariantIdentifier. Removed non-implemented
...
options
2023-11-15 15:55:19 +02:00
Ivan Savenko
13763cad8e
Remove few more implicit conversions
2023-11-15 15:55:19 +02:00
Ivan Savenko
34338f4eaa
Remove few more implicit conversions
2023-11-15 15:55:19 +02:00
Ivan Savenko
abad4b01ce
Remove explicit convesion to int in operators
2023-11-15 15:55:19 +02:00
Ivan Savenko
10e110320b
Remove std::vector<boo> from Json Serializer, simplify affected code
2023-11-15 15:55:18 +02:00
Ivan Savenko
0842f5afee
Removed remaining usages of std::vector<bool>
2023-11-15 15:55:18 +02:00
gamestales-com
faea00a7e1
Use arraytxt for object bonus description
2023-11-15 14:32:40 +01:00
Ivan Savenko
a9f868b379
Merge pull request #3166 from IvanSavenko/simturns_ui
...
UI for Simturns
2023-11-15 14:10:57 +02:00
DjWarmonger
ad9acd4b5e
Merge pull request #3131 from vcmi/improve_subterranean_gates
...
More tolerance for Subterranean Gates placement
2023-11-15 09:23:21 +01:00
Ivan Savenko
8392125b04
Disable experimental simturns AI option by default
2023-11-13 19:51:14 +02:00
Ivan Savenko
7d54f6a9c0
Implemented basic support for plural forms in translations
2023-11-13 19:06:56 +02:00
Ivan Savenko
301ac2457a
Cleanup
2023-11-13 17:48:55 +02:00
Ivan Savenko
d4496c81f9
Fix memory leaks in library
2023-11-13 16:27:15 +02:00
Ivan Savenko
a6f37b7cd7
Fixed few more memory leaks in client
2023-11-13 16:27:15 +02:00
Ivan Savenko
20ef3a69e7
Fix most of memleaks discovered by valgrind
2023-11-13 16:27:15 +02:00
Ivan Savenko
1192dbff15
Merge pull request #3180 from IvanSavenko/bugfixing
...
Fixes for miscellaneous accumulated issues
2023-11-13 16:26:33 +02:00
Ivan Savenko
c6f9434c8e
Merge pull request #3170 from gamestales/gamestales/2903-morale-description-1442
...
#2903-morale-description-#1442
2023-11-13 01:53:29 +02:00
Ivan Savenko
9c9127be7d
Fix tooltip for spell scrolls on adventure map
2023-11-13 00:08:14 +02:00
Ivan Savenko
bc51d9c772
Merge pull request #3161 from SoundSSGood/art-swap-optimization
...
Artifacts swap optimization
2023-11-12 19:37:25 +02:00
Ivan Savenko
35ee8c1397
Only apply normal mana regen for retreated heroes in taverns (h3 logic)
2023-11-12 19:30:33 +02:00
Ivan Savenko
bbd3312705
Fix randomization of heroes in campaigns
2023-11-12 19:18:17 +02:00
Ivan Savenko
1d430d0328
Fix initialization order of Seer Huts and Creatures - Seer Hut might be
...
initialized before creature that its quest is linked to
2023-11-12 19:18:00 +02:00
Ivan Savenko
071fb97b33
Fix tooltip of visited banks after leaving some troops for banks with
...
creatures as reward
2023-11-12 17:50:52 +02:00
Ivan Savenko
7b92e23f3f
Fix crash on right-clicking some visited configurable objects
2023-11-12 16:55:42 +02:00
Andrii Danylchenko
142d0083d5
#3173 - fix trap crash on random hero
2023-11-12 16:14:06 +02:00
Ivan Savenko
5c810df36f
Reorganized types registration code
2023-11-11 00:39:08 +02:00
gamestales-com
a574f18e69
#2903-morale-description-#1442
2023-11-10 15:58:19 +01:00
Ivan Savenko
4a7fa9bf8c
Simplified CTypeList class
2023-11-08 22:05:36 +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
eb167d94a6
Mod compatibility check is now in a separate class and not part of
...
ModHandler
2023-11-08 21:27:05 +02:00
Ivan Savenko
a61ceaf2a7
Serialization version bump
2023-11-08 21:27:05 +02:00
Ivan Savenko
ed66fc2fb3
Minor optimization of map startup time
2023-11-08 21:27:05 +02:00
Ivan Savenko
4e654a7e6e
Better names
2023-11-08 21:27:05 +02:00
Ivan Savenko
0691dfef3b
Moved stateful artifact randomization logic to gamestate from handler
2023-11-08 21:27:05 +02:00
Ivan Savenko
34c012d119
Serialization version bump
2023-11-08 21:27:05 +02:00
Ivan Savenko
2cc8b5baeb
Fix map startup
2023-11-08 21:27:05 +02:00
Ivan Savenko
54103813dd
Remove no longer used serialization methods
2023-11-08 21:27:05 +02:00
Ivan Savenko
c7676bde53
Serialize Enitity classes by their ID
2023-11-08 21:27:05 +02:00
Ivan Savenko
f8a7f6e5a7
Remove remaining boost::mpl usages
2023-11-08 21:27:05 +02:00
Ivan Savenko
ad3c870fb6
Remove serialization of VLC, remove unused code
2023-11-08 21:27:05 +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
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
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
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
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
5e36ef92c7
Support for "selectAll" reward
2023-10-31 18:21:50 +01:00
Tomasz Zieliński
29f023eaa5
More tolerance for Subterranean Gates placement
2023-10-31 16:04:21 +01:00
Tomasz Zieliński
6625831cf6
Use the object templates with least terrains allowed.
2023-10-31 09:07:53 +01: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
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
5962e5c0e0
Fix infinite loop
2023-10-30 19:47:59 +01:00
Tomasz Zieliński
ec0bf05163
Rename "cpu" parameter to correct "humans"
2023-10-30 17:21:03 +01:00
Ivan Savenko
29a78c14a2
Merge pull request #3113 from Alexander-Wilms/develop
...
Fix small issues
2023-10-30 11:02:28 +02: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
Andrii Danylchenko
1418e6884e
Merge pull request #2847 from vcmi/trap-1912
...
#1912 trap, exception on adding duplicating hero
2023-10-29 19:24:47 +02:00
SoundSSGood
7e6ab5e87b
fix test & fix build & suggested changes
2023-10-29 17:46:14 +02: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
Ivan Savenko
207968ced3
Merge pull request #3116 from IvanSavenko/bonus_fixes
...
Bonuses fixes
2023-10-29 16:32:48 +02:00
Alexander Wilms
5cbc75d3b7
Merge remote-tracking branch 'upstream/develop' into develop
2023-10-29 13:35:37 +00:00
Ivan Savenko
e2cffd4c7b
Merge pull request #3118 from rilian-la-te/glamor-slight-bonus-fixes
...
Small bonus fixes
2023-10-29 15:23:07 +02:00
Ivan Savenko
3016014543
Merge pull request #3110 from IvanSavenko/mod_compat_fix
...
Mod compatibility fixes
2023-10-29 14:30:04 +02:00
Ivan Savenko
be5505690d
Apply suggestions from code review
...
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2023-10-29 13:47:56 +02:00
Ivan Savenko
cc5bc40103
Merge pull request #3105 from IvanSavenko/fix_conflicts
...
Fix handling of conflicting mods by game client
2023-10-29 13:47:04 +02: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
Andrii Danylchenko
b579ca8a33
#1912 trap, exception on adding duplicating hero
2023-10-29 11:03:37 +02:00
Andrii Danylchenko
4d6d64837f
#2993 - destruct battle info first when destruction CGameState
2023-10-29 09:41:22 +02:00
nordsoft
35e7fbb366
Fix crash cause by duplicated delete
2023-10-28 22:22:30 +02:00
Tomasz Zieliński
07dac8b6d4
Works more or less
2023-10-28 20:30:38 +02:00
Konstantin
df07b27129
parseSelector: fix anyOf and noneOf
2023-10-28 18:35:59 +03:00
Ivan Savenko
36eacf99d5
Cleanup
2023-10-28 17:58:08 +03:00
Ivan Savenko
4ba8014573
Added subtype for SPELL_DURATION
2023-10-28 17:57:56 +03:00
Ivan Savenko
1e0ea5f1f0
documented NEGATIVE_EFFECTS_IMMUNITY, fixed subtype loading
2023-10-28 17:56:11 +03:00
Ivan Savenko
1459006916
Added separate bonus for native terrain check
2023-10-28 17:54:58 +03:00
Alexander Wilms
3d8dd35d43
lib/NetPacksLib.cpp: Directly assign to the "std::optional", without dereferencing it.
...
Assigning to an optional should directly target the optional
2023-10-28 10:15:50 +00:00
Alexander Wilms
703ab677ba
lib/mapObjects/IMarket.cpp: Show error message about failed dynamic_cast() even if cast object is nullptr
2023-10-27 23:43:39 +00:00
Alexander Wilms
03835236fb
lib/mapObjects/CGPandoraBox.cpp: Identical sub-expressions on both sides of operator "||".
...
Identical expressions should not be used on both sides of a binary operator
2023-10-27 23:40:55 +00:00
Alexander Wilms
860f6150aa
lib/mapObjects/IMarket.cpp: Forming reference to null pointer
...
Null pointers should not be dereferenced
2023-10-27 23:34:11 +00:00
Alexander Wilms
f01ec55d21
Use the "nullptr" literal.
...
"nullptr" should be used to denote the null pointer
2023-10-27 18:18:59 +00:00
Alexander Wilms
70acf987b4
lib/BasicTypes.cpp: Remove the unary minus operator or change the expression's underlying type.
...
Unary minus should not be applied to an unsigned expression
2023-10-27 14:47:09 +00:00
Alexander Wilms
2b21001743
lib/rmg/RoadPlacer.cpp: Remove "e" from this "throw" statement to rethrow the original exception.
...
The original exception object should be rethrown
2023-10-27 14:35:03 +00:00
Ivan Savenko
feae8b6ae4
Do not allow loading new objects into another mod namespace
2023-10-26 15:32:46 +03:00
Ivan Savenko
6337b0d3b9
Fix potential crash on loading mod with invalid handler name
2023-10-26 15:32:13 +03:00
Tomasz Zieliński
36911d1e0a
Merge remote-tracking branch 'origin/develop' into fix_rmg_teams
...
# Conflicts:
# client/lobby/RandomMapTab.cpp
2023-10-26 10:31:41 +02:00
nordsoft
b6b75beb29
Fixes for map editor
...
1) fix owner serialization for hero placeholder
2) fix roads/rivers layout
3) fix lasso
2023-10-24 23:58:26 +02:00
Ivan Savenko
c202f58a15
Account for conflicts (and reverse-conflicts) when loading mods
2023-10-24 14:01:20 +03:00
Ivan Savenko
5cbf5031ea
move SetStackEffect to a separate file
2023-10-24 01:27:52 +03:00
Ivan Savenko
77780e0de5
Fix crash on accessing "any" spellschool via bonus system
2023-10-23 22:28:36 +03: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
d1d4db26e0
Moved existing files to new directory
2023-10-22 22:20:36 +03:00
Ivan Savenko
3880ea58b9
Merge branch 'josch/dos2unix' into develop
2023-10-22 18:39:03 +03:00
Ivan Savenko
3867e512f7
Merge pull request #3064 from IvanSavenko/bonus_metaidentifier
...
Type-safe bonus system
2023-10-22 18:34:12 +03:00
Ivan Savenko
b0a67a66e4
Merge pull request #3092 from IvanSavenko/compatibility_mods
...
Better support for compatibility mods
2023-10-22 18:02:45 +03:00
Ivan Savenko
8df39c43a0
Fix game loading
2023-10-22 17:04:14 +03:00
Ivan Savenko
a5f0429691
Merge pull request #3083 from Nordsoft91/editor-improvements-1.4
...
Redesign map editor rendering
2023-10-22 16:56:39 +03:00
Ivan Savenko
4f47555977
Split OBJECT bonus source into OBJECT_TYPE and OBJECT_INSTANCE
2023-10-22 16:55:19 +03:00
Ivan Savenko
ac925bb786
Renamed new types for consistency with code style
2023-10-22 16:55:19 +03:00
Ivan Savenko
31cf3442af
Update docs
2023-10-22 16:55:19 +03:00
Ivan Savenko
36a1d6c415
Removed remaining integer bonus subtypes from configs
2023-10-22 16:55:19 +03:00
Ivan Savenko
e54ba7b977
Implement loading of bonus source type
2023-10-22 16:55:19 +03:00
Ivan Savenko
3b010d9596
Renamed MetaIdentifier to VariantIdentifier
2023-10-22 16:55:19 +03:00
Ivan Savenko
80e6485965
MetaIdentifier now uses std::variant internally
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
Ivan Savenko
77facf9387
Implement missing functions, fixes linking errors
2023-10-22 16:54:56 +03:00
Ivan Savenko
910ad50417
Fix client & server compilation
2023-10-22 16:54:48 +03:00
Ivan Savenko
0a10fc30b8
(lib) Bonus subtype is now stored as metaidentifier that can store any
...
other identifier inside it
2023-10-22 16:54:43 +03:00
Ivan Savenko
7e034814c1
Partially revert "Translation" type changes to avoid breaking mods
2023-10-22 16:51:08 +03:00
Ivan Savenko
454ba44ac5
Merge pull request #2988 from IvanSavenko/configurable_extensions
...
Extension of configurable object functionality
2023-10-22 16:24:47 +03:00
Ivan Savenko
8752551786
Merge pull request #3086 from Laserlicht/show_random
...
show random maps
2023-10-22 12:29:31 +03:00
Ivan Savenko
adf58fa834
Hide not installed translation mods to languages other than selected one
2023-10-22 00:07:21 +03:00
Ivan Savenko
b50ebba1ba
Added mod type "Compatibility" that is hidden in launcher
2023-10-21 23:55:20 +03:00
Ivan Savenko
b2c336de0d
JsonNode now uses std::variant internally. Fixes crash on deserialize
2023-10-21 20:41:58 +03:00
Laserlicht
0eba0ee686
show random maps
2023-10-21 02:12:34 +02:00
Ivan Savenko
1c4a142849
Fix remaining TODO's
2023-10-21 00:44:57 +03:00
nordsoft
b9a660f6c3
Redesign map editor rendering
2023-10-20 01:25:06 +02:00
Nordsoft91
d03b75696a
Merge pull request #3067 from Nordsoft91/editor-improvements-1.4
...
Add hero placeholder properties
2023-10-19 22:23:58 +02: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
4c0eabf20c
Show guards preview for visited banks on right click
2023-10-19 15:41:59 +03:00
Ivan Savenko
01920bb74e
Fix treasure chests
2023-10-19 15:41:41 +03:00
Ivan Savenko
8f4791914e
Show content preview only for Witch Huts / Shrines / Tree
2023-10-19 15:17:58 +03:00
Ivan Savenko
e0f6b582f5
Display object description only on right-click
2023-10-19 14:36:11 +03:00
Ivan Savenko
530c70c282
Added object descriptions present in H3
2023-10-19 13:34:15 +03:00
Ivan Savenko
901fd77699
Fix Cover of Darkness
2023-10-18 18:04:01 +03:00
Ivan Savenko
8f33fdcd83
Allow learning banned spell from Scholars (H3 logic)
2023-10-18 17:38:40 +03:00
Ivan Savenko
ce480c8c84
Fixed Scholar handling
2023-10-18 17:14:22 +03:00
Ivan Savenko
f7718628dc
Merge pull request #3074 from Nordsoft91/quests
...
Fix warnings about empty kill target
2023-10-18 12:34:44 +03:00
nordsoft
966ffe4377
Fix warnings about empty kill target
2023-10-18 00:13:32 +02:00
Alexandre Detiste
15e45f966c
typos found by lintian
2023-10-17 22:06:08 +02:00
Ivan Savenko
48eba6c362
Fix Witch Hut messages to match H3
2023-10-17 16:52:57 +03:00
Ivan Savenko
eedaa63f5f
Hnadling of Shrine messages now matches H3
2023-10-17 16:35:34 +03:00
Ivan Savenko
927ce4e60e
Improvements to rewardable objects popups
2023-10-16 23:55:37 +03:00
Nordsoft91
1ffc246c8b
Merge pull request #3051 from Laserlicht/name_change
...
possibility to change name in lobby
2023-10-16 22:28:31 +02:00
nordsoft
f6d7755c6a
Add hero placeholder properties
2023-10-16 22:24:12 +02:00
Ivan Savenko
850d0ff8eb
Show (mostly) correct messages in Shrines
2023-10-16 18:16:15 +03:00
Nordsoft91
02c1425939
Merge pull request #3046 from Nordsoft91/editor-improvements-1.4
...
Add map editor zoom and objects lock functionality
2023-10-16 01:22:18 +02:00
Ivan Savenko
0ea44520fd
Fix build
2023-10-16 00:12:39 +03:00
Ivan Savenko
e10de0594e
Scholar is now configurable object (partial)
2023-10-16 00:12:39 +03:00
Ivan Savenko
bb05c2dea5
Implemented configurable shrine
2023-10-16 00:12:39 +03:00
Ivan Savenko
dd841bdaa7
Use enum instead of mix of bool's and int's for tile reveal
2023-10-16 00:12:38 +03:00
Ivan Savenko
98fd939ed6
Cartographer/Observatory is now configurable object
2023-10-16 00:12:38 +03:00
Ivan Savenko
f3ed589e35
Use same fow radius calculation as in H3
2023-10-16 00:12:38 +03:00
Ivan Savenko
a3b2354481
Implemented visit mode "limiter". Fixed h3m variable loading
2023-10-16 00:12:38 +03:00
Ivan Savenko
fd01a25352
Implemented basic version of configurable Witch Hut
2023-10-16 00:12:38 +03:00
Ivan Savenko
79b7518b0e
Unified Json randomization logic for all entity types
2023-10-16 00:12:38 +03:00
Ivan Savenko
aa0b064154
Fixed randomization of artifacts on some custom maps
2023-10-16 00:12:38 +03:00
nordsoft
4651893b48
Fix hota quests
2023-10-14 00:15:15 +02:00
nordsoft
5f52e6b35e
Revert "Auxiliary commit to revert individual files from 2bf8cdc9f525099348439c700af0466955f01b30"
...
This reverts commit d9952495391f7ac77dd32dcf33f487e146b3655b.
2023-10-13 23:35:37 +02:00
Laserlicht
0c6b1ca3c8
possibility to change name
2023-10-13 23:04:35 +02:00
nordsoft
55900ceb66
Add portraits delegate
2023-10-13 20:15:29 +02:00
nordsoft
2bf8cdc9f5
Hota-related bugs were fixed
2023-10-13 12:52:45 +02:00
nordsoft
fbf5492fd9
Remove unnecessary virtuals
2023-10-12 13:30:01 +02:00
nordsoft
74a90cde5d
Fix hero level limiter
2023-10-12 12:52:01 +02:00
nordsoft
14b030d2eb
Support hota quest gates
2023-10-11 23:15:24 +02:00
nordsoft
7ccd4cdcb2
Refactor quests progress
2023-10-11 21:10:42 +02:00
nordsoft
22c9eecd7d
Fix mistake
2023-10-11 08:54:54 +02:00
nordsoft
2b88e6941c
Fix mana limiter
2023-10-11 01:43:24 +02:00
nordsoft
6093f042dd
Text container fix
2023-10-11 01:26:07 +02:00
nordsoft
8335fffaea
Fix rumors
2023-10-11 00:58:32 +02:00
nordsoft
5b10b457cf
Fix code review suggestions
2023-10-11 00:47:19 +02:00
nordsoft
62c4e8a98d
Fix compiling
2023-10-10 23:44:29 +02:00
nordsoft
31d71ddd25
Minor fixes in text
2023-10-10 23:44:29 +02:00
nordsoft
5eeda3cd25
Quests mostly work
2023-10-10 23:44:29 +02:00
nordsoft
d2d64dbddd
Bugfixes
2023-10-10 23:44:29 +02:00
nordsoft
bb238f9b72
New quests work
2023-10-10 23:44:29 +02:00
nordsoft
63bdfb8ff6
New quests implemented
2023-10-10 23:44:29 +02:00
nordsoft
1460541ee5
New limiter based quests
2023-10-10 23:44:29 +02:00
nordsoft
b7568a160c
Fixes
2023-10-10 23:44:29 +02:00
nordsoft
6a7b23c007
Additional properties for limiter
2023-10-10 23:44:28 +02:00
nordsoft
937a8d63c7
Check for artifacts copies in limiter
2023-10-10 23:44:28 +02:00
nordsoft
0cf3205e15
Fix quest regressions
2023-10-10 23:44:28 +02:00
nordsoft
d7d435dcb7
Add game pause
2023-10-08 16:03:57 +02:00
Nordsoft91
1c4bbf1078
Merge pull request #3012 from Nordsoft91/fixes
2023-10-08 12:11:32 +02:00
nordsoft
043f54698b
Fix translations in map editor / fix crash on game end
2023-10-05 23:34:29 +02:00
SoundSSGood
bcce4c68e5
Artifacts placement fixed
2023-10-05 15:17:02 +03:00
Ivan Savenko
b75a67ef7c
Merge pull request #2973 from IvanSavenko/identifier_explicit_constructor
...
Improvements to type safety of Identifier class
2023-10-05 00:33:07 +03:00
Ivan Savenko
037efdf5fc
Improvements to type safety of Identifier class
...
- Constructor of Identifier from integer is now explicit
- Lobby hero/town selection now uses Identifiers instead of int's
- Removed serialization workaround for hero portraits
- Added dummy objects for custom heroes portraits for ID resolver to use
- HeroInstance now stores portrait ID only in case of custom portrait
- Fixed loading of campaign heroes portraits on RoE maps
2023-10-04 18:05:23 +03:00
Ivan Savenko
39a92cdde3
Add query for dwellings dialog
2023-10-04 17:47:12 +03:00
Ivan Savenko
898733eed7
Added Query to track visit duration for Taverns and Markets
2023-10-04 17:47:12 +03:00
Andrii Danylchenko
20a944c551
Merge pull request #2884 from vcmi/nkai-air-water-walking
...
NKAI: water and air walking
2023-10-03 21:46:35 +03:00
Laserlicht
ec8580b99e
Merge branch 'develop' into patch-4map_overview_rework
2023-10-02 21:03:16 +02:00
Nordsoft91
80be1e9f4c
Merge pull request #2981 from Nordsoft91/rmg-template
...
Select random object template instead of first
2023-10-02 20:42:39 +02:00
Nordsoft91
c57d5545c2
Merge pull request #2971 from Nordsoft91/translations
...
Multi-language support for network game and for VMAPs
2023-10-02 20:41:42 +02:00
nordsoft
10eb19758a
Code review fixes
2023-10-01 18:00:36 +02:00
Ivan Savenko
b21a361b99
Merge pull request #2814 from SoundSSGood/arts-counter-impovements
...
Artifacts counter impovements
2023-10-01 17:53:51 +03:00
nordsoft
3ea7988883
Treasure placement uses random templates now
2023-09-30 23:06:38 +02:00
Laserlicht
8b835c9253
load game support
2023-09-30 20:03:33 +02:00
Andrii Danylchenko
2dd0d76412
NKAI: water and air walking
2023-09-30 10:37:32 +03:00
nordsoft
1502ea2250
Fix pandora mana problem
2023-09-30 01:33:12 +02:00
nordsoft
ce62ab3e66
Select random object template instead of first
2023-09-30 01:19:18 +02:00
nordsoft
70796d232b
Full support of maps translations
2023-09-29 00:24:45 +02:00
nordsoft
ae073ee35d
Remove unused identifiers
2023-09-28 23:15:36 +02:00
nordsoft
98fde9ab1d
Add string IDs in map editor
2023-09-28 14:38:31 +02:00
nordsoft
60df49236f
Inspector widgets set string ID
2023-09-28 14:03:58 +02:00
nordsoft
56eefab255
Fix headers
2023-09-28 13:28:24 +02:00
nordsoft
1dbecc2e18
Revert "Add header"
...
This reverts commit d661600858
2023-09-28 13:28:04 +02:00
nordsoft
d661600858
Add header
2023-09-28 13:14:23 +02:00
nordsoft
a710c88b07
Proper map translations loading
2023-09-28 13:09:01 +02:00
nordsoft
67e1200448
Remove forward declaration
2023-09-28 12:46:28 +02:00
nordsoft
ba1dbbbb1d
New version for map format
2023-09-28 04:23:14 +02:00
nordsoft
65f696b018
Cosmetic changes for json map reader
2023-09-28 03:02:46 +02:00
nordsoft
9098126684
Separate map text identifiers from global
2023-09-28 02:52:49 +02:00
nordsoft
40af83a55c
Fix quest
2023-09-28 02:51:58 +02:00
nordsoft
3c2549d905
Fix town name
2023-09-28 02:51:44 +02:00
nordsoft
6da605ff83
Campaign meta strings
2023-09-28 00:10:28 +02:00
nordsoft
5b97c323d3
Rename hero strings to text id
2023-09-28 00:04:05 +02:00
nordsoft
486091a915
Heroes switched to text id
2023-09-28 00:00:32 +02:00
nordsoft
0c94a4d891
Town name switched to id
2023-09-27 23:57:05 +02:00
nordsoft
41da252e67
Seerhut meta strings
2023-09-27 23:49:27 +02:00
nordsoft
00c8c2eb82
Event message meta string
2023-09-27 23:28:17 +02:00
nordsoft
f9f79255c5
Creature message meta string
2023-09-27 23:25:19 +02:00
nordsoft
0ac893b80f
Rumors meta string
2023-09-27 23:22:45 +02:00
nordsoft
ab373f08ab
Use meta string for messages
2023-09-27 23:11:11 +02:00
nordsoft
03c099d4fd
First steps
2023-09-27 22:53:13 +02:00
Ivan Savenko
9b482a2b1e
Fix boat creation for heroes recruited on water
2023-09-27 21:25:27 +03:00
Ivan Savenko
f4c33f49ee
Removed excessive warning
2023-09-27 21:24:37 +03:00
Ivan Savenko
92fdaa20b1
Fix crash on loading Seer Hut with kill monster mission
2023-09-27 21:24:25 +03:00
Ivan Savenko
97097c20ad
Merge pull request #2874 from SoundSSGood/exchange-window-update
...
Exchange window update
2023-09-27 15:50:52 +03:00
Ivan Savenko
71a1ed816a
Merge pull request #2892 from Laserlicht/highscore_menu
...
Highscore Menu & end video
2023-09-27 15:48:47 +03:00
Ivan Savenko
94dbde05a0
Merge pull request #2868 from IvanSavenko/simultaneous_turns
...
Simultaneous turns
2023-09-27 15:45:02 +03:00
Ivan Savenko
4d43562bca
Merge pull request #2924 from Laserlicht/datetime_android
...
Datetime android
2023-09-27 15:43:46 +03:00
Ivan Savenko
d0046d29f2
Merge pull request #2957 from ProjectMutilation/fix-pvs-issues
...
Fixed some issues found by pvs
2023-09-27 15:40:37 +03:00
Maxim Korotkov
ade7a035f5
artifactUtils: reduced cyclomatic complexity in check
...
Signed-off-by: Maxim Korotkov <korotkov.maxim.s@gmail.com>
2023-09-27 09:05:58 +03:00
Nordsoft91
c803b57c33
Merge pull request #2889 from Nordsoft91/mod-compatibility-check
...
Proper mod compatibility check logic
2023-09-26 19:29:46 +02:00
Ivan Savenko
0ab766479d
One more documentation update iteration
2023-09-26 15:55:27 +03:00
Ivan Savenko
8210a2cafd
Added list of all identifiers from base game
2023-09-26 15:55:27 +03:00
Ivan Savenko
43246477d4
Update bonuses docs
2023-09-26 15:55:27 +03:00
Ivan Savenko
403acc0cf1
Update spell docs
2023-09-26 15:55:27 +03:00
Ivan Savenko
f4ee9424e4
Removed unused properties
2023-09-26 15:55:27 +03:00
Ivan Savenko
9710a6b7b3
Updated terrain/river/road schema, added docs
2023-09-26 15:55:27 +03:00
Ivan Savenko
dfc72134f2
Removed unused property
2023-09-26 15:55:27 +03:00
Ivan Savenko
27b75dbbea
Fixed silent errors on invalid Json references in schemas
2023-09-26 15:55:27 +03:00
Ivan Savenko
524c476264
Removed no longer used bonuses
2023-09-26 15:55:27 +03:00
Ivan Savenko
a7ebbf8680
Updated bonus documentation up to SPELL_AFTER_ATTACK
2023-09-26 15:55:27 +03:00
Ivan Savenko
54adeef29f
Added temporary UI for simturns testing
2023-09-26 13:42:20 +03:00
Ivan Savenko
5b21a5ffbc
Simturn duration is now part of StartInfo
2023-09-26 13:42:20 +03:00
Ivan Savenko
3ea807fb8d
Fixed movement through teleporters by AI
2023-09-26 13:42:20 +03:00
Ivan Savenko
d257fb37f0
Use optional instead of Json for queries
2023-09-26 13:42:20 +03:00
Ivan Savenko
c8a96647c3
Add turn limit option to pathfinder
2023-09-26 13:42:20 +03:00
nordsoft
2a3e371caf
Remove any modification of enabled mods during game loading
2023-09-24 23:34:46 +02:00
Laserlicht
e93a04409e
Revert "another approach"
...
This reverts commit 2f64457a9a
2023-09-24 15:02:59 +02:00
Laserlicht
2f64457a9a
another approach
2023-09-24 12:54:35 +02:00
Laserlicht
fccecf023b
no invalid json
2023-09-24 01:30:03 +02:00
Laserlicht
f3e1943aaf
Merge branch 'develop' into highscore_menu
2023-09-23 21:38:17 +02:00
Laserlicht
6f8b62d77d
codereview
2023-09-23 20:41:30 +02:00
Laserlicht
a4769782c5
correct format
2023-09-23 19:01:18 +02:00
Nordsoft91
1f2ca138dd
Merge pull request #2919 from Nordsoft91/fix-2893
2023-09-23 18:02:33 +02:00
Laserlicht
455ead7b4a
fix datetime format (android)
2023-09-23 17:27:00 +02:00
Nordsoft91
a36450e2d1
Merge pull request #2882 from Nordsoft91/ai-cheating
...
Add basic system to give more advantages for ai player
2023-09-23 03:21:19 +02:00
nordsoft
a5492b30c3
Add pre-battle message
2023-09-23 02:35:21 +02:00
nordsoft
61141a0406
Fix gcc compiling
2023-09-23 01:10:45 +02:00
nordsoft
dce1ac1538
Redesign mod incompatibility message
2023-09-23 00:32:48 +02:00
Laserlicht
b0e5a11e62
fix win build
2023-09-22 22:09:01 +02:00
Ivan Savenko
455c13164e
Merge pull request #2886 from IvanSavenko/h3m_parser_fixes
...
H3m parser fixes
2023-09-22 18:53:51 +03:00
nordsoft
5b24fe289b
Assembling difficulty json instead of overriding
2023-09-22 14:46:43 +02:00
nordsoft
2a2f0a657e
Fix battle bonuses serialization
2023-09-22 13:34:00 +02:00
Laserlicht
92b0e2b400
initial highscore support
2023-09-22 01:39:35 +02:00
nordsoft
16b147d588
Fix negative spell cost
2023-09-22 01:12:10 +02:00
Nordsoft91
ec582328b4
Merge pull request #2887 from Laserlicht/campaign_improvement
...
campaign improvements
2023-09-22 01:01:59 +02:00
nordsoft
099109b7d2
Minor fixes
2023-09-22 00:52:19 +02:00
Laserlicht
9e78f9c69c
CodeReview
2023-09-21 23:41:00 +02:00
nordsoft
60eef59bc9
Show root mods for maps
2023-09-21 22:38:01 +02:00
nordsoft
4691907f9c
Show root mods only
2023-09-21 22:28:29 +02:00
Laserlicht
5fd2eee3e8
code review
2023-09-21 21:27:06 +02:00
nordsoft
a05f8339ae
Proper mod compatibility check system
2023-09-21 04:31:08 +02:00
Laserlicht
dfb5ccbeaf
add persistent storage & completed campaign support
2023-09-20 22:18:53 +02:00
Ivan Savenko
42d9ba6c82
Merge pull request #2877 from IvanSavenko/simturn_fixes
...
Changes for simturns support
2023-09-20 22:09:25 +03:00
Ivan Savenko
3f35ed000c
Fixed parsing of some user-made H3M maps
2023-09-20 22:00:03 +03:00
Ivan Savenko
02dfecd38b
Fixed hota maps templates loading
2023-09-20 21:59:16 +03:00
Ivan Savenko
921569e02e
Fixed "Long Live the King", 1st scenario victory condition
2023-09-20 21:58:47 +03:00
nordsoft
cb3bbc6680
Restructured difficulty config
2023-09-20 16:12:26 +02:00
nordsoft
0de912e67b
Add basic system to add more advantages for ai player
2023-09-20 03:50:35 +02:00
Laserlicht
34182069f5
campaignset
2023-09-20 03:13:54 +02:00
Nordsoft91
648e8c7acb
Merge pull request #2856 from Laserlicht/hero_overview
...
Hero overview
2023-09-19 19:36:19 +02:00
Ivan Savenko
8c0d78f1d9
Added initiator-player to packs that add/remove/move objects
2023-09-19 19:24:34 +03:00
Nordsoft91
807f308c91
Merge pull request #2844 from Nordsoft91/rewardable-quests
...
New rewardable interface for SeerHuts and pandoras
2023-09-19 17:59:24 +02:00
nordsoft
326791886d
Rename and events modal mode always
2023-09-19 17:11:03 +02:00
SoundSSGood
48ec2d7e2a
Merge branch 'vcmi:develop' into exchange-window-update
2023-09-19 16:22:00 +03:00
SoundSSGood
6280e778dc
fix build
2023-09-19 16:04:37 +03:00
SoundSSGood
f47def3588
refactoring
2023-09-19 13:31:57 +03:00
SoundSSGood
a83f290e13
bulk move artifacts only equipped, only backpack
2023-09-19 13:31:42 +03:00
Ivan Savenko
219f81d28b
Added explicit "PlayerEndsTurn" netpack
...
- PlayerEndsTurn pack is now sent when player ends turn
- YourTurn pack has been renamed to PlayerStartsTurn for consistency
- PlayerStartsTurn will no longer replace list of acting players
- PlayerEndsGame and PlayerEndsTurn will remove player from acting list
2023-09-18 20:55:01 +03:00
nordsoft
2960895041
Issues fixed
2023-09-17 22:19:45 +02:00
Laserlicht
21f37cfafb
simplified
2023-09-17 21:41:55 +02:00
Laserlicht
05fad115b5
Added new Widgets an functions for simplification
2023-09-17 20:34:31 +02:00
nordsoft
a517e6ad8e
Message split for pandora box
2023-09-17 18:02:24 +02:00
nordsoft
e3538f24ab
Fix components problem
2023-09-17 16:04:34 +02:00
nordsoft
44d72dce51
Use enum in h3m map parser
2023-09-17 15:06:49 +02:00
nordsoft
7b22aefb12
Some minor fixes
2023-09-17 13:03:42 +02:00
Ivan Savenko
c8e6a7cd27
Fixed most common cases of movement actions
2023-09-16 20:07:26 +03:00
Ivan Savenko
80b80a0ae6
Minor cleanup of hero movemen code
2023-09-16 20:07:26 +03:00
Andrii Danylchenko
903be33bf3
#2689 - fix approaching guards when closest tile is double-guarded
2023-09-16 17:47:34 +03:00
nordsoft
a3b60bf829
Fix warning
2023-09-16 14:30:25 +02:00
nordsoft
4f76eb3fce
Add limiter serialization
2023-09-15 23:00:33 +02:00
nordsoft
4af2d917c0
Fix messages for pandoras
2023-09-15 21:13:07 +02:00
nordsoft
b5b5d881c4
Merge remote-tracking branch 'upstream/develop' into rewardable-quests
2023-09-15 21:08:22 +02:00
nordsoft
68c61797f8
Implement select all option for rewardable objects
2023-09-15 21:08:14 +02:00
nordsoft
c1c13cfafb
Pandora and events work as rewardable object
2023-09-15 15:29:41 +02:00
Laserlicht
1c68937d95
new approach
2023-09-15 15:26:14 +02:00
Ivan Savenko
f8541d0ae4
Merge branch 'vcmi/master' into 'vcmi/develop'
2023-09-15 13:59:02 +03:00
nordsoft
06f01c3b82
Seerhut works as rewardable object
2023-09-15 10:06:06 +02:00
Dydzio
56c969be4f
Fix commanders requirements for special skills to match WoG
2023-09-13 23:08:22 +02:00
Ivan Savenko
248afa523d
Merge pull request #2823 from dydzio0614/pathfinder-tile-cost
...
Fix pathfinder tile cost
2023-09-13 22:50:04 +03:00
Ivan Savenko
4d9cca36c6
Merge pull request #2811 from IvanSavenko/update_modding_docs
...
Update modding documentation
2023-09-13 22:07:29 +03:00
Ivan Savenko
c6588e0bd1
Updated schemas & docs for several game entities
2023-09-13 21:55:36 +03:00
Dydzio
9399bcc15d
Fix pathfinder tile cost
2023-09-13 18:54:08 +02:00
Konstantin P
1522ed85e2
vcmi: make "noneOf" selector more restrictive
...
It should do "or-not" instead of "and-not".
2023-09-13 17:09:59 +03:00
nordsoft
574047c55c
Start making new serialization for rewardables
2023-09-13 09:18:46 +02:00
nordsoft
96d6a48f01
Backward compatible json serialization
2023-09-13 02:14:35 +02:00
nordsoft
ef3f0174dd
Rewardable seer hut and quest gate
2023-09-13 01:40:07 +02:00
Ivan Savenko
935a18f077
Use error messages from H3
2023-09-12 21:34:58 +03:00
Ivan Savenko
e4aa981925
Add more logging to mod downloading process
2023-09-12 21:15:14 +03:00
SoundSSGood
82eb2f8a2b
Artifact assembling changes
2023-09-12 19:17:35 +03:00
Ivan Savenko
9ae7f53d66
Merge pull request #2791 from Nordsoft91/fix-2790
...
Fix for random dwellings
2023-09-12 12:38:55 +03:00
nordsoft
a89a8019ab
Added skills customization
2023-09-11 20:37:25 +02:00
Nordsoft91
96433436dd
Merge pull request #2782 from Nordsoft91/editor-improvements-1.4
...
Map editor: events, rumors
2023-09-11 20:36:13 +02:00
Nordsoft91
a18aa2cf7e
Merge pull request #2802 from Laserlicht/voice_camp
...
Voice for campaigns
2023-09-11 18:15:23 +02:00
Ivan Savenko
f13f213d8c
Merge pull request #2780 from IvanSavenko/fix_siege_regression
...
Fix crash on obstacle creation (e.g. moat)
2023-09-11 15:56:33 +03:00
Laserlicht
994da3fcf2
code review
2023-09-11 14:44:07 +02:00
Laserlicht
00f07f93d1
wait while audio playing; no audio on custom campaigns
2023-09-11 14:04:44 +02:00
Laserlicht
fc1ce85a72
basic voice support
2023-09-11 12:57:10 +02:00
Ivan Savenko
fd3217c875
Fix few more missing BattleID's
2023-09-11 13:20:16 +03:00
nordsoft
6e3817f18c
Events serialization
2023-09-10 01:54:55 +02:00
nordsoft
cc3864a0fa
Fix for random dwellings
2023-09-09 21:17:21 +02:00
nordsoft
01bf146640
Change string id
2023-09-09 14:31:44 +02:00
nordsoft
f6e3c6a487
Fix
2023-09-09 14:27:51 +02:00
Ivan Savenko
e8453916cf
Merge remote-tracking branch 'vcmi/beta' into develop
2023-09-08 18:49:06 +03:00
Ivan Savenko
fccd564d8d
Merge pull request #2769 from IvanSavenko/touch_tolerance
...
(1.3.2) Implemented tolerance for touch events
2023-09-08 16:45:04 +03:00
Ivan Savenko
c4e2417326
Fix crash on obstacle creation (e.g. moat)
2023-09-08 16:35:43 +03:00
Ivan Savenko
5d67481aaf
Merge pull request #2774 from IvanSavenko/beta_bugfixing
...
(1.3.2) Beta bugfixing
2023-09-08 13:15:52 +03:00
Ivan Savenko
ef0eb8e930
Merge pull request #2772 from wb180/tavernPoolHeroesFix
...
Remove(reduce durations) of bonuses for tavern heroes
2023-09-07 10:54:44 +03:00
Ivan Savenko
f39fbe5151
Merge pull request #2757 from IvanSavenko/filesystem_refactor
...
Filesystem refactor - part 1
2023-09-07 10:51:02 +03:00
Ivan Savenko
1f1f978328
Fixed battle replay
2023-09-06 16:03:47 +03:00
Ivan Savenko
ef94e7a78a
Fix build
2023-09-06 16:03:47 +03:00
Ivan Savenko
9fa7a93fb0
Properly pass battleID in all battle netpack's
2023-09-06 16:03:47 +03:00
Ivan Savenko
747e28947a
Fix build
2023-09-06 16:03:47 +03:00
Ivan Savenko
41210c1dbf
Client-side support for multiple battles
2023-09-06 16:03:47 +03:00
Ivan Savenko
036df2e0ad
Support multiple battles in AI
2023-09-06 16:03:46 +03:00
Ivan Savenko
3a88180494
Separated game and battle callback (server & client only)
2023-09-06 16:03:39 +03:00
Ivan Savenko
fc4dfda00f
Added support for concurrent battles to gamestate and server
2023-09-06 16:03:02 +03:00
Ivan Savenko
f92af94f19
Fix crash on removing object during visit
2023-09-06 12:32:26 +03:00
Evgeniy Meshcheryakov
47f5dd14fa
Remove(reduce durations) of bonuses for tavern heroes
2023-09-06 09:12:23 +03:00
Ivan Savenko
3973624278
Implemented tolerance for touch events
2023-09-06 01:06:01 +03:00
Ivan Savenko
1a82280cb2
Fix build
2023-09-05 13:16:08 +03:00
Ivan Savenko
f30355839f
Fix build
2023-09-05 00:55:54 +03:00
Ivan Savenko
609f25f344
Add sanity check
2023-09-04 22:43:16 +03:00
Ivan Savenko
b6a1a8f0da
Json Serializer should now use identifers storage properly
2023-09-04 22:23:20 +03:00
Ivan Savenko
9735fa6d06
Fix regresssion - crash
2023-09-04 22:22:45 +03:00
Ivan Savenko
12c4f8d18c
Fixed serialization of PlayerColor in json
2023-09-04 22:22:24 +03:00
Ivan Savenko
86a7f5f5cd
Removed getStr(bool), replaced with similar toString()
2023-09-04 22:21:02 +03:00
Ivan Savenko
7e27ac7073
IdentifierStorage is now separate handler in VLC
2023-09-04 18:56:16 +03:00
Ivan Savenko
c8a6cd74cc
Additional checks for invalid access to IdentifierStorage
2023-09-04 18:56:16 +03:00
Ivan Savenko
82989e6302
Use pointers in containers to guaranteed fixed address
2023-09-04 18:56:16 +03:00
Ivan Savenko
a30e7ba321
Remove bitmasks of PlayerColor's. Add encode/decode methods
2023-09-04 18:56:16 +03:00
Ivan Savenko
3f921fa771
Serialization version bump
2023-09-04 18:22:34 +03:00
Ivan Savenko
6a260a60cf
Fix resource creation
2023-09-04 18:22:34 +03:00
Ivan Savenko
9cfcf5ea19
Fix regressions
2023-09-04 18:22:34 +03:00
Ivan Savenko
0f88b8969b
Removed some usages of std string as resource path
2023-09-04 18:22:34 +03:00
Ivan Savenko
8dfdfffd87
Use ResourcePath for audio files
2023-09-04 18:22:34 +03:00
Ivan Savenko
97b7d44c88
Use ResourcePath for video accessing
2023-09-04 18:22:34 +03:00
Ivan Savenko
6f0108e462
Use ResourcePath for referencing texts and json's
2023-09-04 18:22:34 +03:00
Ivan Savenko
823ffa7a07
Always use ResourcePath for referencing images and animations
2023-09-04 18:22:34 +03:00
nordsoft
d113168db4
Fix neutral objects serializing
2023-09-04 01:42:51 +04:00
nordsoft
385202a02a
Fix abandoned map crash
2023-09-04 01:42:51 +04:00
nordsoft
8040cafb3d
Code review tweaks
2023-09-01 15:17:46 +04:00
nordsoft
15037b782f
Fix assert
2023-09-01 04:39:32 +04:00
nordsoft
e9ba1d73d1
Support partial versions
2023-09-01 04:36:53 +04:00
nordsoft
ea7ab9d5ed
Migrate launcher to vcmi versions
2023-09-01 04:12:41 +04:00
Nordsoft91
c45ab07d0b
Merge pull request #2698 from Nordsoft91/turn-timer
...
Turn timer fixes
2023-09-01 00:31:52 +04:00
Konstantin P
08967efd91
Teleport: check immunities in applicable()
...
Attempt to fix #2677
2023-08-31 19:58:46 +03:00
Ivan Savenko
7255dda624
Merge pull request #2629 from dydzio0614/neutral-creature-popup
...
Improve neutral creature adventure map popup
2023-08-31 15:44:19 +03:00
Ivan Savenko
adb633be30
Merge pull request #2715 from IvanSavenko/regression_fix
...
Fix several recently discovered regressions
2023-08-31 15:41:04 +03:00
Nordsoft91
49614f5851
Merge pull request #2695 from Nordsoft91/mod-compatibility
2023-08-31 12:14:54 +04:00
Ivan Savenko
3e169ef2f5
Fix visiting of markets
2023-08-31 01:07:59 +03:00
nordsoft
cc3ca9a41e
Timers fixes
2023-08-30 03:33:59 +04:00
nordsoft
9a42abe2a7
Extended timer info to exhange between client and server
2023-08-30 03:11:46 +04:00
Ivan Savenko
695a51d8c8
Merge remote-tracking branch 'vcmi/beta' into develop
2023-08-28 21:19:53 +03:00
nordsoft
4ee47b01ae
Make possible to play with different timers independently
2023-08-28 19:45:15 +04:00
nordsoft
98f7ed9dfd
Implement player start turn query
2023-08-28 18:56:36 +04:00
nordsoft
93f14c984d
Fix compatibility check with patch version
2023-08-28 17:49:13 +04:00
nordsoft
925bde68ff
Fix compatibility check with game version
2023-08-28 17:43:33 +04:00
nordsoft
0a6ea63b09
Revert "Add compatibility with minor version"
...
This reverts commit 6e7b13fcbe
2023-08-28 17:41:00 +04:00
nordsoft
3962b71262
Remove unused variable
2023-08-28 17:10:52 +04:00
Nordsoft91
1586c6c6a0
Merge pull request #2668 from IvanSavenko/remove_current_player
...
Remove "currentPlayer" from gamestate
2023-08-28 17:10:28 +04:00
Nordsoft91
ffc4b989f0
Merge pull request #2679 from Laserlicht/smooth_scroll
...
Smooth scroll
2023-08-28 17:08:57 +04:00
nordsoft
6e7b13fcbe
Add compatibility with minor version
2023-08-28 16:21:46 +04:00
Ivan Savenko
ce20d913e0
Fix checking PlayerColor's for validness
2023-08-27 01:35:38 +03:00
Michael
2286e0c7b1
implement speed and move
2023-08-26 21:13:33 +02:00
Michael
fe6d96f4a0
angle calc
2023-08-26 20:19:25 +02:00
Ivan Savenko
edd029c79c
Replace "currentPlayer" from gamestate with "activePlayers"
...
- Allows multiple active players at once, e.g. simturns
- Cleared up validation of netpacks by server, e.g. always check for
pack sender
2023-08-25 18:56:15 +03:00
Ivan Savenko
b61c9a9e35
Fix build
2023-08-25 13:46:42 +03:00
Ivan Savenko
e2718db791
Converted several enumerations into constants
2023-08-25 13:38:02 +03:00
Ivan Savenko
c2d5f7f22f
Formatting & cleanup
2023-08-25 13:38:02 +03:00
Ivan Savenko
e54287ea5d
Converted remaining identifier to new system
2023-08-25 13:38:02 +03:00
Ivan Savenko
0240ee886d
Converted (almost) all namespace enum's to enum classes
2023-08-25 13:38:02 +03:00
Ivan Savenko
62cd8b12d4
Converted several namespace enums to enum class
2023-08-25 13:38:02 +03:00
Ivan Savenko
17d3d663ee
Converted creature ID and spell ID to new form
2023-08-25 13:38:02 +03:00
Ivan Savenko
ec8d31bbfc
First step at unifying game identifiers code
2023-08-25 13:38:01 +03:00
Ivan Savenko
b0eec85aca
Merge pull request #2632 from rilian-la-te/resist-rework-pt1
...
Spell resistance rework: part 1
2023-08-25 01:13:57 +03:00
Ivan Savenko
940bdcee3e
Fixes according to review
2023-08-24 23:34:33 +03:00
Ivan Savenko
f9410145d6
Fix handling of "7 days without town" loss condition
2023-08-24 23:34:33 +03:00
Ivan Savenko
ee8adbe85f
Update tavern on end of 7th turn of player in question
...
Allows removal of "retreat after 7th day" workaround and as result -
more straightforward code
2023-08-24 23:34:33 +03:00
Ivan Savenko
d83aa828f6
Fix turn ending
2023-08-24 23:34:33 +03:00
Ivan Savenko
c4bc6840ea
Moved management of turn order into a new class
2023-08-24 23:34:33 +03:00
Nordsoft91
979cf129bc
Merge pull request #2637 from Laserlicht/autosave
2023-08-25 00:09:49 +04:00
Michael
e317c23a59
fix
2023-08-24 20:31:06 +02:00
Michael
37e2292720
count unicode chars to extra function
2023-08-24 18:34:00 +02:00
Michael
485af4b4b5
avoid forbidden chars in path
2023-08-23 22:23:05 +02:00
Ivan Savenko
26bddbac44
Fix possible uncaught exception
2023-08-23 22:46:28 +03:00
Michael
b22a9ff2d0
Merge branch 'develop' into autosave
2023-08-23 21:39:04 +02:00
Michael
4784ae94b5
revert uuid
2023-08-23 20:03:40 +02:00
Ivan Savenko
4ab2e617d5
Fix infinite loop on Fear trigger
2023-08-23 19:34:33 +03:00
Ivan Savenko
81242d3500
Fixed ending of battles due to retreat/surrender
2023-08-23 18:46:56 +03:00
Konstantin
e6710a4eb0
vcmi: bump serialization version
2023-08-23 17:53:09 +03:00
Konstantin
d746a96d55
vcmi: use SpellSchool identifier instead of enum
...
Use identifier instead of enum inside callbacks. It is better and more
expandable solution.
2023-08-23 17:53:09 +03:00
Konstantin
75c39c6562
vcmi: handle icons for SPELL_DAMAGE_REDUCTION
...
For all schools and for ANY subtype
2023-08-23 17:53:09 +03:00
Konstantin
d20711bcd6
immunities: polishing
2023-08-23 17:53:09 +03:00
Konstantin
344593e891
vcmi: made some CSpell properties private
...
There are getters for it.
2023-08-23 17:53:08 +03:00
Konstantin
4d67a7e3d1
BonusParams: add XXX_IMMUNITY to deprecated
...
This bonuses does not exist now.
2023-08-23 17:52:16 +03:00
Konstantin
8724181a0f
vcmi: spell resistance rework
...
Now instead of XXX_IMMUNITY bonuses we have 2 bonuses with spellSchool
subtype: SPELL_SCHOOL_IMMUNITY and NEGATIVE_EFFECT_IMMUNITY.
All previous bonuses of subtype 0 is covered by SPELL_SCHOOL_IMMUNITY,
and all previous bonuses of subtype 1 is covered by
NEGATIVE_EFFECT_IMMUNITY. Unit tests are updated accordingly.
2023-08-23 17:52:16 +03:00
Konstantin
c9bc3fd4e1
CSpellHandler: use getBonusBearer
...
Use getBonusBearer method and cachingStr method for optimization
2023-08-23 17:52:16 +03:00
Ivan Savenko
a44c08a847
Slightly better thread names
2023-08-23 16:32:29 +03:00
Ivan Savenko
44d16b32fe
Use API identical to std classes where possible
2023-08-23 16:32:29 +03:00
Nordsoft91
1bad0e96ef
Merge pull request #2635 from Nordsoft91/loading-bar
...
Loading progress bar
2023-08-23 17:28:19 +04:00
Michael
d2bbe0f35a
starttime in foldername
2023-08-23 01:47:55 +02:00
Michael
538acfe3c0
Update StartInfo.h
...
fix
2023-08-23 01:08:57 +02:00
Michael
a0450d1363
format...
2023-08-23 00:39:09 +02:00
Michael
fed9ae5157
Merge branch 'develop' into autosave
2023-08-23 00:37:15 +02:00
Michael
51ba22a631
code review
2023-08-23 00:35:44 +02:00
Michael
68a1b883eb
autosave folders
2023-08-22 20:43:44 +02:00
nordsoft
dfaf778d16
Redesign loading solution
2023-08-22 20:10:20 +04:00
nordsoft
d50edc28ab
Merge remote-tracking branch 'upstream/develop' into turn-timer
...
# Conflicts:
# server/CGameHandler.cpp
# server/CGameHandler.h
2023-08-22 00:54:38 +04:00
nordsoft
dbc3a93013
Merge remote-tracking branch 'upstream/develop' into loading-bar
...
# Conflicts:
# server/CGameHandler.h
2023-08-22 00:46:54 +04:00
Dydzio
764608f100
Merge remote-tracking branch 'dydzio/configurable-autobattle-spells' into configurable-autobattle-spells
2023-08-21 20:10:04 +02:00
Dydzio
e81cd4e0e6
Delete empty file
2023-08-21 20:09:50 +02:00
nordsoft
45f13c7964
Progress update on client side
2023-08-21 19:21:27 +04:00
nordsoft
584dd20943
Progress on server side for rmg
2023-08-21 19:21:22 +04:00
Ivan Savenko
5f7f0ec2ea
Declare enum classes as int8_t
2023-08-21 17:55:49 +03:00
Ivan Savenko
67eaef3520
Fixed few more discovered regressions
2023-08-21 17:55:49 +03:00
Ivan Savenko
013417fb7e
Code cleanup
2023-08-21 17:55:49 +03:00
Ivan Savenko
c516b5a64e
Fixes for several discovered edge cases
2023-08-21 17:55:49 +03:00
Ivan Savenko
6297140bf5
Start of stabilization - battles now start correctly
2023-08-21 17:55:49 +03:00
Ivan Savenko
44832f3797
Split BattleProcessor into few more parts
2023-08-21 17:55:49 +03:00
Dydzio
ed12f20609
Improve neutral creature adventure map popup
2023-08-21 14:42:41 +02:00
Dydzio
78f56df44f
Comment out unused OH3 options so they do not clutter code suggestions
...
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2023-08-20 19:11:36 +02:00
Nordsoft91
ef4fddd0c4
Merge pull request #2570 from Laserlicht/town_selection_window
...
Town selection window
2023-08-20 17:37:45 +04:00
Dydzio
6bfbe80cc9
Allow toggling quick combat spells usage
2023-08-19 17:23:55 +02:00
Nordsoft91
4a6deedd5e
Merge pull request #2530 from Nordsoft91/tutorial
...
Support tutorial
2023-08-19 18:06:15 +04:00
Ivan Savenko
70ddc1f3e5
Merge pull request #2577 from wb180/secondarySkillSerialization
...
Preserve order of secondary skills during hero json serialization/deserialization
2023-08-18 15:24:02 +03:00
Ivan Savenko
d0b3319f6a
Merge remote-tracking branch 'vcmi/beta' into develop
2023-08-18 15:08:23 +03:00
Ivan Savenko
83b00bb7c3
Merge pull request #2610 from vcmi/master
...
Merge master -> beta
2023-08-18 12:56:05 +03:00
DjWarmonger
f9564dc8e4
Merge pull request #2563 from vcmi/fix_resources_near_mines
...
Fix resources placed behind mines
2023-08-18 09:12:56 +02:00
Michael
e1e16018d1
code review first batch
2023-08-17 17:29:31 +02:00
Ivan Savenko
daa8a494fc
Merge branch 'release_131' into master
2023-08-17 16:19:20 +03:00
Nordsoft91
96e820ddac
Merge pull request #2517 from Laserlicht/folders
2023-08-17 10:09:37 +04:00
Ivan Savenko
ef0cd0ba6e
Fixed mod dependencies check on save loading to prevent crashes:
...
- mods that don't affect game objects can be ignored when loading save
- gameplay-affecting mods that were present in save must be active
- gameplay-affecting mods that were not in save must not be active
2023-08-14 23:55:04 +03:00
nordsoft
d26fdaefe4
Battle timer
2023-08-14 23:31:44 +04:00
Tomasz Zieliński
c59014ce18
Merge remote-tracking branch 'origin/beta' into fix_rmg_teams
2023-08-14 18:59:45 +02:00
nordsoft
2ce50915e1
Fix ios compilation
2023-08-14 05:03:50 +04:00
nordsoft
3c9c302fd2
TurnTimerInfo
2023-08-14 02:16:25 +04:00
Michael
1d76f456ad
change servercode to make it more robust
2023-08-14 00:08:48 +02:00
Evgeniy Meshcheryakov
2a83f06905
Preserve order of secondary skills during hero serialization/deserialization
2023-08-14 00:06:22 +03:00
nordsoft
4b1224ec8c
Implement turn timer feature
2023-08-13 14:07:48 +04:00
Andrii Danylchenko
a7859dae39
Battle AI: archangels cast again
2023-08-13 09:08:30 +03:00
Ivan Savenko
f13a53c1d9
Merge remote-tracking branch 'vcmi/beta' into develop
2023-08-12 17:28:47 +03:00
Ivan Savenko
92ce97bbc7
Merge remote-tracking branch 'vcmi/master' into beta
2023-08-12 16:20:06 +03:00
Tomasz Zieliński
abacb5f0ea
Fix resources placed behind mines
2023-08-12 10:53:25 +02:00
Ivan Savenko
ccf31d19f8
Merge pull request #2558 from IvanSavenko/localization_fix
...
Do not ignore translations for maps & campaigns
2023-08-12 11:24:19 +03:00
DjWarmonger
654489d5d3
Merge pull request #2525 from vcmi/battle-fast-targets
...
Battle fast targets
2023-08-12 09:22:25 +02:00
DjWarmonger
917f846a3a
Merge pull request #2562 from vcmi/fix_artifact_replacement
...
Fix regression with replacing quest artifact
2023-08-12 09:14:21 +02:00
Michael
52f00ec308
extra function: getFormattedDateTime
2023-08-12 01:13:03 +02:00
Michael
4d507f3d8a
format fix
2023-08-12 00:00:35 +02:00
Michael
f0b60cf166
suggestions; use internally uppercase; fix; fullname
2023-08-11 23:56:20 +02:00
Tomasz Zieliński
4741bd546f
Fix regression
2023-08-11 20:13:25 +02:00
Tomasz Zieliński
8f450cf253
Fix for monsters spawning at left side of the map
2023-08-11 18:43:22 +02:00
Ivan Savenko
942f8bbf05
Fix possible access to non-existing building
2023-08-11 18:50:39 +03:00
Ivan Savenko
474045194a
Do not ignore translations for maps & campaigns
2023-08-11 16:12:02 +03:00
Tomasz Zieliński
83d97626fe
Merge remote-tracking branch 'origin/beta' into fix_rmg_object_pos
2023-08-11 10:58:26 +02:00
Ivan Savenko
b2de5d32d1
Merge pull request #2546 from vcmi/fix_crash_after_battle
...
Fix crash at battle end
2023-08-11 11:37:30 +03:00
Ivan Savenko
88b23cdce1
Merge pull request #2511 from IvanSavenko/fix_starting_army
...
Fix starting army
2023-08-11 11:36:30 +03:00
Tomasz Zieliński
0252d0f986
Fix hota offset + 2 possible crashes
2023-08-11 07:45:24 +02:00
DjWarmonger
f5926c4023
Merge pull request #2498 from vcmi/fix_roads_in_rock
...
Fix placing road inside underground rock
2023-08-11 07:22:36 +02:00
Michael
2b093b8850
case handling
2023-08-11 01:46:22 +02:00
Tomasz Zieliński
84436f7f18
Throw runtime error explicitely
2023-08-10 18:29:49 +02:00
Tomasz Zieliński
f483f7bb53
Fix crash at battle end
2023-08-10 11:52:31 +02:00
Ivan Savenko
1f9ee6aa38
Merge pull request #2524 from Nordsoft91/reward_canrefuse
...
[1.3.1] Reward can refuse fix
2023-08-09 20:06:26 +03:00
nordsoft
1def98a862
Tutorial implemented
2023-08-09 03:54:09 +04:00
Andrii Danylchenko
ba9998ac66
BattleAI: fast targets optimization
2023-08-08 20:10:29 +03:00
nordsoft
be6f6da397
Fix for canRefuse flag in rewardable building
2023-08-08 19:27:00 +04:00
Ivan Savenko
2e7e8bb52b
Better error message on missing object constructor
2023-08-08 12:50:39 +03:00
Ivan Savenko
e57f8742cd
Rename ambiguos 'clear' to 'clearSlots'
...
A lot of map objects inherit from CCreatureSet and as result - get
clean() method that resets object army
2023-08-07 19:13:02 +03:00
Ivan Savenko
f0ede46186
Clear spell list, not hero army
2023-08-07 19:12:04 +03:00
Michael
a9e895c08f
basic subdirectory support
2023-08-06 21:39:39 +02:00
Tomasz Zieliński
c089e55893
Fix placing road inside underground rock
2023-08-06 21:14:16 +02:00
Ivan Savenko
c524caee5c
Fixed possible uncaught exception on starting map
2023-08-06 17:46:49 +03:00
Ivan Savenko
8b0f9c86f8
Fixed possible crash on invalid town building name
2023-08-06 13:30:20 +03:00
Ivan Savenko
041236837b
Possible fix for crash from Android crash reporting
2023-08-05 12:49:38 +03:00
Ivan Savenko
dd17896082
Fix crash on bonus parsing failure (outdated mods?)
2023-08-05 12:49:02 +03:00
Ivan Savenko
ad8695ac91
Fix saving games - regression from filesystem changes
2023-08-04 18:41:42 +03:00
Ivan Savenko
537f9fa048
Merged master into develop
2023-08-03 23:38:32 +03:00
Tomasz Zieliński
44fae4945d
Update distances in all zones adjacent to object
2023-08-02 20:41:29 +02:00
DjWarmonger
ca0eacc283
Merge pull request #2458 from vcmi/fix_water_tavern
...
Fix crash at water tavern
2023-08-02 20:03:02 +02:00
Tomasz Zieliński
250b27ba46
Fix crash due to missing boat for neutrla heroes
2023-08-02 17:19:23 +02:00
Tomasz Zieliński
f6247164ad
Fix crash, fix invisible boat blocking the tile
2023-08-01 18:51:33 +02:00
Tomasz Zieliński
69abfda981
stash
2023-08-01 08:23:09 +02:00
Ivan Savenko
8a81b3013f
Fixed transferring of artifacts from backpack in campaigns
2023-07-31 22:06:54 +03:00
Ivan Savenko
d9e7a8f88a
Merge pull request #2446 from IvanSavenko/bugfixing
...
(1.3.0) Bugfixing
2023-07-31 16:21:43 +03:00
Ivan Savenko
62fddca21e
Split massive CModHandler class/file into multiple parts:
...
- IdentifierStorage is now a separate handler in VLC
- Renamed ModHandler::Incompatibility exception to ModIncompatibility
- Extracted ModScope namespace from ModHandler
- Extracted ModUtilities namespace from ModHandler
- Split CModHandler.cpp on per-class basis
- Replaced some direct members with unique_ptr to reduce header includes
2023-07-30 22:17:47 +03:00
Ivan Savenko
8ea7e91189
moved mod-related files to new directory
2023-07-30 20:38:32 +03:00
Ivan Savenko
7f72f7a82c
Cleanup server connection code a bit
2023-07-30 20:15:32 +03:00
Ivan Savenko
593b82d178
Removed all references to boost::interprocess library
2023-07-30 20:14:57 +03:00
Ivan Savenko
397c4c7595
Fix dismissing heroes on map with "Capture town" victory condition
2023-07-30 15:28:56 +03:00
Ivan Savenko
95dd4b3ffb
Fix incorrect warnings about missing translations
2023-07-30 13:19:52 +03:00
Ivan Savenko
6c52293dd9
Merge pull request #2425 from IvanSavenko/fix_combat_replay
...
Attempt to fix combat replay queries
2023-07-29 00:03:44 +03:00
Ivan Savenko
4d08a131d3
Reorganization of boost filesystem usage
...
- Removed (most of) boost filesystem namespace usings
- Replaced boost::filesystem::fstream with std::fstream and different
constructor that should be available on any plaftorm
2023-07-28 19:12:04 +03:00
Ivan Savenko
21a39f0b01
Removed boost::iostreams in favor of std::stream / boost::filesystem
2023-07-28 19:12:04 +03:00
Ivan Savenko
6153c1b203
Merge pull request #2422 from IvanSavenko/hero_pool_fix
...
Fix errors about "hero has no army" for defeated heroes
2023-07-28 13:43:50 +03:00
heroesiiifan
bee59b3c1c
Update Languages.h
2023-07-28 00:48:06 +00:00
heroesiiifan
917229b988
Update Languages.h
2023-07-28 00:29:57 +00:00
Ivan Savenko
aed8c411fc
Minor rework & cleanup of combat replays
2023-07-27 19:25:55 +03:00
Ivan Savenko
72210afc92
Do not attempt to reset movement for inactive heroes in pool
2023-07-27 15:51:38 +03:00
Tomasz Zieliński
2747174810
Fix incorrect sand shore id
2023-07-26 17:12:09 +02:00
Ivan Savenko
e733b55c90
Removed buggy and poorly designed fromString method
...
Use VLC->modh directly with proper parameters instead
2023-07-25 22:36:45 +03:00
Ivan Savenko
1335a834e2
Merge pull request #2408 from IvanSavenko/remove_log_warning
...
Remove log warning
2023-07-25 18:15:52 +03:00
Ivan Savenko
705cdb846d
Merge pull request #2403 from IvanSavenko/error_detection_fix
...
Attempt to fix & improve error reporting
2023-07-25 18:15:28 +03:00
DjWarmonger
ae1aa816d3
Merge pull request #2405 from vcmi/fix-2389
...
#1965 - treat dwelling defenders as neutrals
2023-07-25 17:02:45 +02:00
DjWarmonger
b4c9b81a33
Update SideInBattle.cpp
2023-07-25 15:02:28 +03:00
DjWarmonger
71fe5c556f
Merge pull request #2203 from vcmi/remove_seed_info
...
Remove random seed from map description
2023-07-25 10:36:32 +02:00
Andrii Danylchenko
ec8898a0e7
#1965 - treat dwelling defenders as neutrals
2023-07-25 10:13:41 +03:00
Andrii Danylchenko
fe9090ddfa
#2044 - changed order of destructors to avoid crash
2023-07-25 10:09:28 +03:00
Ivan Savenko
37437224f9
Remove excessive warning
2023-07-24 23:16:34 +03:00
Ivan Savenko
21e794268b
Attempt to fix & improve error detection:
...
- use std::fstream instead of boost::iostreams for properly working flush
- removed some catch-all blocks
- reduce catch scope of some try/catch blocks to clearly indicate intent
2023-07-24 18:48:56 +03:00
Tomasz Zieliński
6522cec969
Just the notes
2023-07-24 08:44:37 +02:00
Ivan Savenko
a280cc8845
Merge pull request #2384 from IvanSavenko/bugfixing_beta
...
Bugfixing iteration
2023-07-24 00:49:34 +03:00
Ivan Savenko
a619193e3c
Fixed initialization of heroes in taverns
2023-07-22 22:04:32 +03:00
Ivan Savenko
5aa2492a90
Fixed crash on ending battle with a draw
2023-07-22 22:04:12 +03:00
DjWarmonger
bf7b77600a
Merge pull request #2375 from vcmi/fix_roads
...
Fix RMG failing to place roads sometimes
2023-07-22 15:56:25 +02:00
DjWarmonger
0be3d6911c
Merge pull request #2236 from vcmi/limit_seer_huts
...
Create only a single seer hut for every artifact we have
2023-07-22 08:17:03 +02:00
Ivan Savenko
8456f92bf7
Merge pull request #2292 from IvanSavenko/radial_wheel_garrison
...
Radial wheel for army management
2023-07-21 20:54:49 +03:00
DjWarmonger
377bec277d
Merge pull request #2350 from vcmi/ban_stuff_on_water_maps
...
Ban objects on maps without water
2023-07-21 15:48:13 +02:00
Tomasz Zieliński
1762df2b77
Formatting
2023-07-21 14:55:49 +02:00
Tomasz Zieliński
8bfa34e97b
Allow routing road behind objects not visitable from top if that's absolutely neccessary.
2023-07-21 14:55:34 +02:00
Ivan Savenko
d26595cef7
Radial menu is now a proper window. Minor fixes to positioning.
2023-07-21 15:47:42 +03:00
Ivan Savenko
cfdc7e6e65
Merge pull request #2363 from IvanSavenko/rewardable_translation
...
Translation support for configurable objects
2023-07-21 15:44:46 +03:00
Ivan Savenko
cefbe5152e
Merge pull request #2359 from IvanSavenko/crashfixing
...
Fix crashes from 1.2.1 statistics on Google Play
2023-07-21 15:44:37 +03:00
Ivan Savenko
3c6839722a
Merge pull request #2362 from IvanSavenko/banks_guard_preview
...
Implemented support for showing amount of guards in banks
2023-07-21 15:44:11 +03:00
Ivan Savenko
3a348abf4f
Text of configurable/rewardable objects now uses translator
2023-07-19 22:25:52 +03:00
Ivan Savenko
280085b95d
Merge pull request #2308 from IvanSavenko/remove_client_savegame
...
Remove client savegames
2023-07-19 14:46:46 +03:00
Ivan Savenko
5660884ee5
Fix revisiting of cleared banks
2023-07-19 14:21:33 +03:00
Ivan Savenko
7f1b982264
Implemented support for showing amount of guards in banks
2023-07-19 13:17:50 +03:00
Tomasz Zieliński
ad5081f9fe
Merge remote-tracking branch 'origin/develop' into ban_stuff_on_water_maps
2023-07-19 12:05:30 +02:00
Ivan Savenko
556763fb7b
Fixed handling of tactics
2023-07-18 22:02:35 +03:00
Tomasz Zieliński
e2940d2b0c
Fix Subterranean Gates incorrectly placed outside the map
...
(cherry picked from commit acf455a1c3b02c0f8d5085c23fe2230779b7560b)
2023-07-18 19:28:36 +02:00
Tomasz Zieliński
545f047cae
Fix HoTA guard once again
...
(cherry picked from commit 138a7c8024573f46962ad0f6e8e03ba53fa56076)
2023-07-18 19:28:20 +02:00
Ivan Savenko
1bf6bbd9b6
Significantly simplified threading model in battles
2023-07-18 19:55:59 +03:00
Ivan Savenko
5e8a778e7d
Attempt to fix / trace crashes from Google Play statistics
2023-07-18 17:31:21 +03:00
Tomasz Zieliński
9b649b0b79
Build fix
2023-07-18 10:55:26 +02:00
Tomasz Zieliński
03b3771f19
Ban Navigation on maps without water
2023-07-18 10:54:36 +02:00
Tomasz Zieliński
025b0814c8
+ Handled banning spells and artifacts
...
+ Rename allowedSpell => allowedSpells
2023-07-17 17:21:28 +02:00
Tomasz Zieliński
fbd1d728ec
Water heroes will now be correctly banned on random maps.
2023-07-17 16:23:34 +02:00
Ivan Savenko
6fd3c0f8bc
Fixes loading of hota maps with enabled wog mod (identifiers conflict)
2023-07-17 16:38:23 +03:00
Ivan Savenko
22b09f7164
Fixed parsing of some hota campaigns
2023-07-17 16:22:43 +03:00
Ivan Savenko
81d0ac4d6b
Removed excessive warnings from console - this is legal case
2023-07-17 16:22:29 +03:00
Tomasz Zieliński
bda126a1fd
Merge remote-tracking branch 'origin/develop' into ban_stuff_on_water_maps
2023-07-16 18:54:50 +02:00
Ivan Savenko
a4ba5a9b65
Merge pull request #2327 from IvanSavenko/bugfixing_from_stream
...
Fix accumulated minor bugs
2023-07-15 21:55:19 +03:00
Ivan Savenko
baa865d857
Extracted message-related functionality of CGameHandler to separate file
2023-07-15 21:01:13 +03:00
Ivan Savenko
463efea7bb
Fix hero retreating handling & code cleanup
2023-07-15 19:55:30 +03:00
Ivan Savenko
cb16636fce
Implemented preserving hero on retreat on 7th day after end of turn
2023-07-15 19:55:30 +03:00
Ivan Savenko
9a38d8ea97
Implemented tavern slot selection using rules similar to H3
2023-07-15 19:55:30 +03:00
Ivan Savenko
ec7e046617
Fix hero pool persistency between saves
2023-07-15 19:55:30 +03:00
