Commit Graph
100 Commits
Author SHA1 Message Date
Ivan SavenkoandGitHub 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
Ivan Savenko fd3217c875 Fix few more missing BattleID's 2023-09-11 13:20:16 +03:00
Ivan Savenko e8453916cf Merge remote-tracking branch 'vcmi/beta' into develop 2023-09-08 18:49:06 +03:00
Ivan SavenkoandGitHub 7aef40dfb6 Merge pull request #2781 from vcmi/IvanSavenko-patch-1
Fix typo
2023-09-08 16:56:06 +03:00
Ivan SavenkoandGitHub 89c31d0d52 Fix typo 2023-09-08 16:54:51 +03:00
Ivan SavenkoandGitHub 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 8112b8082e Add new option to settings 2023-09-08 13:23:18 +03:00
Ivan SavenkoandGitHub 9e6424c545 Merge pull request #2775 from IvanSavenko/radial_fill_ones
(1.3.2) Add "Fill with single creatures" option to radial wheel
2023-09-08 13:16:00 +03:00
Ivan SavenkoandGitHub 5d67481aaf Merge pull request #2774 from IvanSavenko/beta_bugfixing
(1.3.2) Beta bugfixing
2023-09-08 13:15:52 +03:00
Ivan SavenkoandGitHub 72858cd0d8 Merge pull request #2768 from IvanSavenko/cherry_picked_fixes
(1.3.2) Cherry picked fixes
2023-09-08 13:15:34 +03:00
Ivan SavenkoandGitHub 587be4c7d5 Merge pull request #2767 from IvanSavenko/dwelling_recruit_fix
Fixes ownership checks for creature recruitment
2023-09-07 15:09:55 +03:00
Ivan Savenko 635884cb05 Replaced show unit info with fill with one's option in radial 2023-09-07 13:55:58 +03:00
Ivan SavenkoandGitHub ba017f0e8d Merge pull request #2749 from SoundSSGood/artifacts-related-fixes
Artifacts related fixes
2023-09-07 13:03:52 +03:00
Ivan SavenkoandGitHub bef97889e9 Merge pull request #2773 from wb180/blindedStackMoraleFix
Blinded stack should not be able to get morale
2023-09-07 10:54:51 +03:00
Ivan SavenkoandGitHub 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 SavenkoandGitHub 4615a4e3ea Merge pull request #2761 from IvanSavenko/fix_launcher_freeze
(1.3.2) Fix Launcher freeze on startup
2023-09-07 10:51:09 +03:00
Ivan SavenkoandGitHub f39fbe5151 Merge pull request #2757 from IvanSavenko/filesystem_refactor
Filesystem refactor - part 1
2023-09-07 10:51:02 +03:00
Ivan Savenko 346eead8e0 Show spell cursor when casting spell in touch input mode 2023-09-06 23:01:43 +03:00
Ivan Savenko e5719daf11 Added "vcmiartifacts angelWings" form to cheat 2023-09-06 22:44:41 +03:00
Ivan Savenko d7fb2bcf83 Show message on cancelling spell in combat 2023-09-06 21:54:26 +03:00
Ivan SavenkoandGitHub 5f07f3f091 Merge pull request #2673 from IvanSavenko/concurrent_battles
Concurrent battles support
2023-09-06 19:24:27 +03:00
Ivan Savenko 1f1f978328 Fixed battle replay 2023-09-06 16:03:47 +03:00
Ivan Savenko 8bdddd1324 Fix tests compilation 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 SavenkoandGitHub a21de70516 Merge pull request #2758 from IvanSavenko/identifiers_serialization_fix
Fix serialization of identifers by Json Serializer
2023-09-06 15:21:54 +03:00
Ivan Savenko f92af94f19 Fix crash on removing object during visit 2023-09-06 12:32:26 +03:00
Ivan Savenko ad25bfb4bb Fixed invisible creatures from SUMMON_GUARDIANS bonus 2023-09-06 11:29:28 +03:00
Ivan Savenko b85a2f99c1 Quick fix to avoid freeze on Launcher startup / mod repo checkout 2023-09-06 01:11:18 +03:00
Ivan Savenko 3973624278 Implemented tolerance for touch events 2023-09-06 01:06:01 +03:00
Ivan Savenko 64adb538fe Do not allow stopping movement while using water walk over water 2023-09-05 23:32:02 +03:00
Ivan Savenko 63a8cd9642 Fix quest log button block status 2023-09-05 23:31:26 +03:00
Ivan Savenko 47249ee5ed Fix resource bar UI in hotseat 2023-09-05 23:31:20 +03:00
Ivan Savenko f7b67a5abe Remove incorrect message on another player defeat 2023-09-05 23:31:14 +03:00
Ivan Savenko 5d1d559d81 Fix possible unprotected access to battleint 2023-09-05 23:31:07 +03:00
Ivan Savenko b159d8a028 Fixes ownership checks for creature recruitment 2023-09-05 23:12:57 +03:00
Ivan SavenkoandGitHub 211bcb6e82 Merge pull request #2720 from SoundSSGood/backpack-variable-cap
Support for different backpack window capacities
2023-09-05 13:40:39 +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 1d0e696db6 Added RenderHandler that acts as factory for images and animations 2023-09-04 18:22:34 +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
Ivan SavenkoandGitHub f79492e5b0 Merge pull request #2755 from wb180/fixNKAICompilation
Fix NKAI compilation with NKAI_PATHFINDER_TRACE_LEVEL>=2
2023-09-04 15:29:44 +03:00
Ivan SavenkoandGitHub e2b5ff13f1 Merge pull request #2746 from wb180/teamsPopup
Show only non-empty teams in teams popup
2023-09-03 22:23:32 +03:00
Ivan SavenkoandGitHub 7ccc8605ac Merge pull request #2733 from SoundSSGood/empty-bulk-move-fix
Arts bulk move crash fixed
2023-09-03 22:06:57 +03:00
Ivan SavenkoandGitHub 9d4d2e0bae Merge pull request #2717 from rilian-la-te/fix-unit-effect-immune
Teleport: check immunities in applicable()
2023-09-01 22:37:28 +03:00
Ivan SavenkoandGitHub cab2bddf7e Merge pull request #2712 from Laserlicht/dim_map
Dim adventuremap
2023-09-01 22:37:10 +03:00
Ivan SavenkoandGitHub ab2d4ba471 Merge pull request #2708 from Laserlicht/disable_unavilable_heroes
disable unavailable heroes in selection
2023-08-31 15:45:32 +03:00
Ivan SavenkoandGitHub 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 SavenkoandGitHub a59d7b5fc9 Merge pull request #2687 from Nordsoft91/filledTexturePlayerColored
Support FilledTexturePlayerColored in configurable interface
2023-08-31 15:43:40 +03:00
Ivan SavenkoandGitHub 3ce99e8613 Merge pull request #2710 from dydzio0614/artifacts-backpack-graphics
Split artifacts bag button background and icon
2023-08-31 15:42:50 +03:00
Ivan SavenkoandGitHub adb633be30 Merge pull request #2715 from IvanSavenko/regression_fix
Fix several recently discovered regressions
2023-08-31 15:41:04 +03:00
Ivan Savenko 2e411eca19 Do not allow stopping movement while using water walk over water 2023-08-31 01:38:16 +03:00
Ivan Savenko 0f4f9b3233 Fix handling of opening spells when tactics is present 2023-08-31 01:32:32 +03:00
Ivan Savenko 3e169ef2f5 Fix visiting of markets 2023-08-31 01:07:59 +03:00
Ivan SavenkoandGitHub f6a4a1ae0c Merge pull request #2686 from vcmi/fix-battle-freeze
BattleAI: fix freeze
2023-08-31 01:06:47 +03:00
Ivan SavenkoandGitHub 4b29edc7c4 Merge pull request #2707 from dydzio0614/commander-abilities-fix
Commander abilities UI fix
2023-08-30 11:50:27 +03:00
Ivan Savenko 695a51d8c8 Merge remote-tracking branch 'vcmi/beta' into develop 2023-08-28 21:19:53 +03:00
Ivan SavenkoandGitHub eafa9cbae1 Merge pull request #2684 from dydzio0614/creature-spellcasting-fixes
Better default stack action handling + "F shortcut" mode fixes
2023-08-28 20:01:04 +03:00
Ivan SavenkoandGitHub 5be87b30c1 Merge pull request #2625 from dydzio0614/artifacts-backpack-gui
Artifacts backpack GUI
2023-08-28 19:59:11 +03:00
Ivan SavenkoandGitHub a30939ad8e Merge pull request #2685 from dydzio0614/mana-drain-ui-refresh
Fix mana drain not refreshing battle hero window mana
2023-08-28 19:56:29 +03:00
Ivan SavenkoandGitHub 790a5680e5 Merge pull request #2669 from SoundSSGood/backpack-window-fix
Backpack window fix
2023-08-27 22:07:22 +03:00
Ivan SavenkoandGitHub 6896ee5370 Merge pull request #2681 from IvanSavenko/fix_player_color_regression
Fix checking PlayerColor's for validness
2023-08-27 22:01:23 +03:00
Ivan SavenkoandGitHub 5ec2f39fd5 Merge pull request #2676 from Laserlicht/patch-3
Flatpak - Use new screenshots
2023-08-27 21:00:19 +03:00
Ivan Savenko ce20d913e0 Fix checking PlayerColor's for validness 2023-08-27 01:35:38 +03: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 SavenkoandGitHub 4500e59713 Merge pull request #2624 from IvanSavenko/identifiers_cleanup
Identifiers system refactoring and cleanup
2023-08-25 18:10:20 +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 SavenkoandGitHub 43096f0ed1 Merge pull request #2617 from dydzio0614/configurable-autobattle-spells
Configurable autobattle spells usage
2023-08-25 01:29:16 +03:00
Ivan SavenkoandGitHub 988843c4ee Update cmake_modules/VCMI_lib.cmake 2023-08-25 01:14:22 +03:00
Ivan SavenkoandGitHub 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 SavenkoandGitHub f9049e7796 Merge pull request #2636 from IvanSavenko/server_turn_order_processor
Reorganize player turn order handling on server
2023-08-25 01:08:58 +03:00