games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-31 00:07:39 +02:00
Code Issues Releases Activity
16,175 Commits 22 Branches 70 Tags
f4143362436954e589cc09de4fcff8a44debf984
Commit Graph

6805 Commits

Author SHA1 Message Date
Alexander Wilms
31e1d39f92 Fix issues introduced by fixing typos 2024-06-27 08:38:04 +00:00
Alexander Wilms
02e429e973 Fix typos using https://github.com/crate-ci/typos 
Changes were reviewed manually
 2024-06-24 03:47:19 +02:00
Ivan Savenko
3bea383b59 Merge branch 'vcmi/beta' into 'vcmi/develop' 2024-06-21 12:58:36 +00:00
Ivan Savenko
4e9feca8d4 Validate mod.json as json5 instead of strict json since Android launcher 
no longer exists
 2024-06-19 19:59:06 +00:00
Ivan Savenko
2b7131cfea Show error message if vcmi unable to access data directory instead of 
silent crash
 2024-06-19 19:59:06 +00:00
Ivan Savenko
85d170af70 Merge pull request #4163 from godric3/fix-serialization-of-subtype-to-include-mod-id 
fix CGObjectInstance `subTypeName` to include mod id
 2024-06-19 21:29:06 +03:00
godric3
ddfc212a03 fix CGObjectInstance subTypeName to include mod id 2024-06-18 21:42:22 +02:00
Ivan Savenko
af5572db15 Merge pull request #4157 from IvanSavenko/bugfixing 
[1.5.3] Bugfixing
 2024-06-18 12:14:43 +03:00
Ivan Savenko
0ca41127a6 Merge pull request #4152 from IvanSavenko/rmg_fix 
[1.5.3] Fix rmg generation if player list is not continuous
 2024-06-18 12:06:40 +03:00
Ivan Savenko
76bb32536f Correctly iterate over allowed spells set (was vector originally) 2024-06-17 20:58:04 +00:00
Ivan Savenko
38bee87cf4 Do not activate mana vortex if hero already has double mana 2024-06-17 20:22:36 +00:00
Ivan Savenko
4e7809d934 Take resources on quest completion instead of giving them 2024-06-17 20:18:34 +00:00
Ivan Savenko
c68f2da977 Fix initialization of gold pile from random resource with fixed amount 2024-06-17 20:08:07 +00:00
Tomasz Zieliński
6d9f83a376 Protect lakes accessed from both zones with lock 2024-06-17 19:00:37 +02:00
Ivan Savenko
f2d870e651 Merge pull request #4130 from IvanSavenko/races_fixes 
Fixes for discovered uninitialized memory access and thread data races
 2024-06-17 17:26:16 +03:00
Ivan Savenko
2d0bd94135 Fix rmg generation if player list is not continuous 2024-06-17 13:35:58 +00:00
Andrey Filipenkov
bf832d4b13 fix building editor with Apple Clang 15 2024-06-13 06:38:15 +03:00
Ivan Savenko
e5dba942ac Clear buffer (if any). Avoids false-positives with memcheck if buffer 
contains old data
 2024-06-12 18:13:21 +00:00
Ivan Savenko
1ac98e305f Fix potential data race if two threads attempt to select bonuses with 
different durations
 2024-06-12 18:11:22 +00:00
Ivan Savenko
e32b6bd807 Fix potentially uninitialized members 2024-06-12 18:10:38 +00:00
Ivan Savenko
3a602bd3d4 Merge pull request #4040 from MichalZr6/develop 
Add amount of resurrected Vampires to the battle log
 2024-06-12 17:35:39 +03:00
Ivan Savenko
b4c6906471 Merge branch 'vcmi/beta' into 'vcmi/develop' 2024-06-11 19:22:23 +00:00
MichalZr6
15f86c0284 Fixed issues from review 2024-06-11 16:47:23 +02:00
Ivan Savenko
9c05e80315 Fix Admiral's Hat whirlpool immunity. Reduce usage of 
convertFromVisitablePos
 2024-06-11 14:31:11 +00:00
Ivan Savenko
55efa3c719 Merge remote-tracking branch 'vcmi/beta' into bugfixing 2024-06-11 14:10:17 +00:00
MichalZr6
65d22f17ae proper logging of drained life and resurrected count 
new struct for keeping track of healed HP (also drained life) and resurrected count
 2024-06-09 23:54:20 +02:00
Ivan Savenko
9de6023224 Removed no longer needed pseudo-languages 2024-06-08 15:31:40 +00:00
Ivan Savenko
cffdf1081c Merge pull request #4105 from IvanSavenko/limiter_fix 
Fix CreatureTerrainLimiter
 2024-06-08 13:47:03 +03:00
Ivan Savenko
308b403a55 Merge pull request #4096 from IvanSavenko/handle_terminate 
Create crashdump on uncaught c++ exception
 2024-06-08 13:46:24 +03:00
Andrey Filipenkov
5a58edde22 use 32-bit minizip file funcs on old Android 2024-06-08 00:09:03 +03:00
Ivan Savenko
1057fa4ef9 Re-enable code that was not restored after terrain rework 2024-06-07 12:24:36 +00:00
Ivan Savenko
22e58387f9 Also check for json when checking for battle animation existance 2024-06-07 11:57:46 +00:00
Ivan Savenko
79d568b17b Try to handle uncaught c++ exception on Windows and create crashdump 2024-06-06 20:08:48 +00:00
Ivan Savenko
a8dcbd8ff9 Merge pull request #4061 from Laserlicht/hota_buildings 
Support HotA thives guild
 2024-06-05 12:41:35 +03:00
Ivan Savenko
615361a4d2 Remove excessive casts to void 2024-06-01 12:18:23 +00:00
Ivan Savenko
b50d350747 Show error message on load if mod has broken creature instead of 
crashing on creature window screen
 2024-06-01 11:49:51 +00:00
Ivan Savenko
b8beb4fb13 Fixes for various minor issues detected by Sonar Cloud 2024-06-01 11:48:30 +00:00
Ivan Savenko
b638b0b679 Fixed possible crash if hero class has no valid commander ID 2024-06-01 07:40:48 +00:00
Ivan Savenko
7e9c486a7a "Transport Artifact" victory condition will no longer trigger if another 
player completed it
 2024-06-01 07:40:13 +00:00
Ivan Savenko
df83fa33a1 Merge branch 'vcmi/master' into 'vcmi/develop' 2024-05-31 09:34:21 +00:00
Ivan Savenko
adc3441bda Merge pull request #3998 from IvanSavenko/refactor_sdl_media 
[1.6] Reorganize SDL sound/music/video handling
 2024-05-31 12:02:55 +03:00
Laserlicht
9c1ce214fc thievesGuild support 2024-05-30 21:58:35 +02:00
Laserlicht
3f9e53acc8 fix typo 2024-05-30 21:57:58 +02:00
Ivan Savenko
37e196c565 Automatically select preferred audio stream when playing video 2024-05-30 18:02:50 +00:00
Ivan Savenko
5d6470e527 Merge pull request #4025 from IvanSavenko/shared_ptr_lib 
[1.6] Use shared_ptr for library entities
 2024-05-30 19:14:06 +03:00
Ivan Savenko
5ecb527252 Merge pull request #3997 from IvanSavenko/serialization_refactor 
[1.6] Serialization refactor
 2024-05-30 19:13:21 +03:00
Ivan Savenko
9e0bae96cc Merge pull request #3895 from SoundSSGood/CWindowWithArtifacts-refactoring2 
CWindowWithArtifacts refactoring part2
 2024-05-30 19:12:39 +03:00
Ivan Savenko
888149c6f6 Implemented simple versioning system for multiplayer 2024-05-29 20:08:32 +00:00
Ivan Savenko
5c2ca380ab Merge pull request #4052 from vcmi/bank_battle 
Config option for regular unit placement in Black Tower
 2024-05-29 22:55:22 +03:00
Tomasz Zieliński
098c88eff4 Update serialization version 2024-05-29 20:52:59 +02:00