Commit Graph
100 Commits
Author SHA1 Message Date
Ivan Savenko e3ed728193 Merge pull request #1932 from rilian-la-te/proper-teleport
VCMI: teleport redesign
2023-04-16 22:52:01 +03:00
Ivan Savenko 0ea299859d Merge pull request #1871 from IvanSavenko/h3m_reader_refactoring
Hota H3M parsing support (1.3)
2023-04-16 20:33:17 +03:00
Ivan Savenko 65e4ce9ffe Update to c++17 2023-04-15 17:20:38 +03:00
Ivan Savenko 5589e973a8 Fixed parsing of hota 'arena' map format hacks 2023-04-15 17:20:38 +03:00
Ivan Savenko 1704fab3a2 Fix assertion failure on fighting against AI with tactics 2023-04-15 17:20:38 +03:00
Ivan Savenko 22558551bf Fix parsing of invalid data from h3m 2023-04-15 17:20:38 +03:00
Ivan Savenko 2c2c2c8fe0 Slight tweaking of logging of h3m edge cases 2023-04-15 17:20:38 +03:00
Ivan Savenko f84665b5ec Fixed loading of maps with objects owned by non-existing players 2023-04-15 17:20:38 +03:00
Ivan Savenko f997241da1 Throw exception on loading not supported hota duel/arena maps 2023-04-15 17:20:38 +03:00
Ivan Savenko 87647cd02a Do not propose banned skills in witch huts 2023-04-15 17:20:38 +03:00
Ivan Savenko d6a3c0e666 Cleaned up handling of hota map format versioning 2023-04-15 17:20:38 +03:00
Ivan Savenko 5b658462a1 Renamed army formation enum value 2023-04-15 17:20:38 +03:00
Ivan Savenko b1e7774bbd Fixed parsing of hota format '0' 2023-04-15 17:20:38 +03:00
Ivan Savenko cc8c1c769a Fix duplicated maps in scenario selection screen 2023-04-15 17:20:38 +03:00
Ivan Savenko 1b6ece1367 Formatting and renames of H3M readers, no functionality changes 2023-04-15 17:20:38 +03:00
Ivan Savenko de855085f0 Added information on banks, seer hut and monster properties 2023-04-15 17:20:38 +03:00
Ivan Savenko ea8aeef8c0 Implemeted parsing of HotA Seer Huts 2023-04-15 17:20:38 +03:00
Ivan Savenko ac8952d6cf Added list of H3 objects for reference 2023-04-15 17:20:38 +03:00
Ivan Savenko 88096de7e4 Fixed parsing of HotA H3M format, including Seer Huts 2023-04-15 17:20:38 +03:00
Ivan Savenko 46239215af Implemented parsing of HotA map objects (except for Seer Hut) 2023-04-15 17:20:38 +03:00
Ivan Savenko 3790661fa6 Refactored loadObject() monstrocity into set of smaller methods. 2023-04-15 17:20:38 +03:00
Ivan Savenko c0e9eb6eb1 HotA maps up to objects block can be parsed 2023-04-15 17:20:38 +03:00
Ivan Savenko 838d45b32c Implemented parsing of HotA h3m header 2023-04-15 17:20:38 +03:00
Ivan Savenko f93335d678 Cleanup and formatting of H3M loader code 2023-04-15 17:20:38 +03:00
Ivan Savenko 3738171b21 Refactoring of H3M loader to make HotA format support easier
- extracted low-level reader from MapFormatH3M class
- added separate structure to define version-specific values
- cleared up some H3M format edge cases
- replaced witch hut skill vector with set
- converted several fields to enum type
2023-04-15 17:20:38 +03:00
Ivan Savenko df291463d0 Merge pull request #1990 from Laserlicht/patch-1
metainfo.xml update
2023-04-15 13:26:31 +03:00
Ivan Savenko b354f99cc3 Merge pull request #1936 from IvanSavenko/cpp_17_upgrade
Upgrade c++ standard to c++17
2023-04-14 19:21:17 +03:00
Ivan Savenko 128764b1c9 Merge pull request #1968 from rilian-la-te/fix-caster-tactics
Fix caster tactics
2023-04-14 18:59:03 +03:00
Ivan Savenko 44b83b2e11 Merge master -> develop 2023-04-14 16:51:35 +03:00
Ivan Savenko c125e040c3 Merge pull request #1977 from vcmi/beta
Merge 1.2 release into master branch
2023-04-14 15:31:09 +03:00
Ivan Savenko c24a60dce6 Merge pull request #1980 from IvanSavenko/debian_update
Updated Linux release date
2023-04-14 14:58:16 +03:00
Ivan Savenko 4a2c7e9bdf Updated Linux release date 2023-04-14 14:51:26 +03:00
Ivan Savenko 7f04ce7b9d Merge pull request #1895 from IvanSavenko/changelog_update
Final changelog update for 1.2 release
2023-04-14 14:20:17 +03:00
Ivan Savenko 93af4ef557 Updated to latest beta 2023-04-14 14:18:53 +03:00
Ivan Savenko c7c2b25b6a Merge pull request #1979 from IvanSavenko/fix_multiple_mods_install
Fix installation of multiple mods at once, e.g. during setup
2023-04-14 14:12:23 +03:00
Ivan Savenko a9aa751ba0 Fix installation of multiple mods at once, e.g. during setup 2023-04-14 12:47:13 +03:00
Ivan Savenko 5dd1d5bf3f Merge pull request #1973 from IvanSavenko/beta_fixes
Fixes for 1.2 release
2023-04-14 11:41:22 +03:00
Ivan Savenko e97c2bd838 Merge pull request #1970 from IvanSavenko/add_rmg_templates
Moved RMG templates from vcmi-extras to vcmi mod
2023-04-14 11:40:27 +03:00
Ivan Savenko c2a0cf4cf3 Extended some templates to support larger maps (G+U / H+U) 2023-04-14 00:24:13 +03:00
Ivan Savenko 9d31830c74 Fix check for Demon Summon targets 2023-04-13 21:17:35 +03:00
Ivan Savenko 1978e6f8e8 Do not show unit information on dead creatures 2023-04-13 21:16:55 +03:00
Ivan Savenko 1fab2e2e34 Do not allow rising of corpses below alive stack 2023-04-13 19:08:08 +03:00
Ivan Savenko beb9069f78 Do not allow targeting enemy corpses for Demon summon 2023-04-13 19:07:46 +03:00
Ivan Savenko ccb08bda6f Fix loading of "true fullscreen" option in launcher 2023-04-13 19:07:21 +03:00
Ivan Savenko 35ac4d88ac Fix Seer Hut right-click text 2023-04-13 19:06:44 +03:00
Ivan Savenko 9d901efb0c Change default difficulty to "Normal" 2023-04-13 19:06:17 +03:00
Ivan Savenko b1158a16c5 Version bump for vcmi mod 2023-04-13 16:37:52 +03:00
Ivan Savenko 2dc48496ef Fix generation of roads and rivers near map edge 2023-04-13 16:26:03 +03:00
Ivan Savenko 4f8890d866 Moved RMG templates from vcmi-extras into core mod 2023-04-13 16:25:36 +03:00
Ivan Savenko 05550158ee Merge pull request #1944 from Laserlicht/patch-1
Nullkiller -> Standard-AI
2023-04-12 12:48:13 +03:00
Ivan Savenko 79b7659097 Fix gcc build 2023-04-12 01:04:27 +03:00
Ivan Savenko 63d2e6ea42 Removed no longer used code 2023-04-12 01:04:27 +03:00
Ivan Savenko 644f0f4b32 Removed ARRAY_COUNT in favor of std::size 2023-04-12 01:04:26 +03:00
Ivan Savenko 506c3d29bc Replaced vstd clamp with std version 2023-04-12 01:03:14 +03:00
Ivan Savenko 5f74aca341 Fix missing attribute 2023-04-12 01:03:14 +03:00
Ivan Savenko 3e94ae1b2b Attempt to make macOS c++17 build 2023-04-12 01:03:14 +03:00
Ivan Savenko 63b197b78a Converted attributes to use c++17 functionality 2023-04-12 01:03:14 +03:00
Ivan Savenko 2150eabfc5 Bumped C++ standard to C++17 2023-04-12 01:03:14 +03:00
Ivan Savenko 662db90cc1 Merge pull request #1941 from rilian-la-te/reduce-boost-little
vcmi: reduce boost a little bit
2023-04-11 20:24:16 +03:00
Ivan Savenko dfa2e2a349 Merge beta into develop 2023-04-11 19:37:35 +03:00
Ivan Savenkoandkrs 6d0f8e3f24 Update ChangeLog.md
Co-authored-by: krs <krs0@users.noreply.github.com>
2023-04-11 12:02:47 +03:00
Ivan Savenko b424ebb628 Changelog update 2023-04-11 12:02:47 +03:00
Ivan Savenko c9e9d93b60 Merge pull request #1937 from Nordsoft91/launcher-layout
[1.2] Adjustable layout for launcher
2023-04-11 11:12:15 +03:00
Ivan Savenko 7d92ef5f86 Merge pull request #1909 from vcmi/avoid-freeze-on-siege-selfblocking
BattleAI: avoid selfblocking on siege
2023-04-11 11:11:05 +03:00
Ivan Savenko ef103290fa Merge pull request #1938 from rilian-la-te/fix-orb-of-vulnerability
config: Orb of Vulnerability should block all resistances from work (Resistance skill, dwarves, unicorns and so on.
2023-04-11 11:10:33 +03:00
Ivan Savenko 7fcd750d0f Merge pull request #1904 from vcmi/fix_pandora_amounts
Fix pandora amounts
2023-04-11 11:10:05 +03:00
Ivan Savenko e25cd7f90f Merge pull request #1934 from IvanSavenko/beta_fixes
Fixed bugs for 1.2 release
2023-04-11 11:08:40 +03:00
Ivan Savenko ff66592fad Merge pull request #1882 from rilian-la-te/native-terrain-refactor
Native terrain refactor
2023-04-11 02:14:37 +03:00
Ivan Savenko 2d332f5ce8 Merge pull request #1916 from rilian-la-te/constexpr-id
vcmi: constexpr IDs
2023-04-10 18:28:45 +03:00
Ivan Savenko 9ea746a68c Merge pull request #1935 from rilian-la-te/fix-spell-display
Fix spell display
2023-04-10 18:28:23 +03:00
Ivan Savenko 42b2be4bbb Merge pull request #1908 from SoundSSGood/art-client-server-fixes
Artifact related fixes
2023-04-10 18:26:49 +03:00
Ivan Savenko 07230f3b47 Attempt to fix stack splitting on macos 2023-04-10 14:34:17 +03:00
Ivan Savenko 5046f916d6 Fix filtering of objects by terrain in editor 2023-04-10 14:33:53 +03:00
Ivan Savenko 02c9a3f3d8 Correctly reset UI on aborting Clone/Sacrifice 2023-04-10 14:33:24 +03:00
Ivan Savenko e2d0cd37e4 Merge pull request #1910 from IvanSavenko/beta_fixes
Fixes for 1.2 branch
2023-04-09 20:09:03 +03:00
Ivan Savenko bfd77d871c Merge pull request #1918 from IvanSavenko/fix_map_loading
Fix vcmi map loading
2023-04-09 20:08:23 +03:00
Ivan Savenko 6e90c0fd09 Merge pull request #1913 from IvanSavenko/fix_shooting_yourself_in_the_foot
Fix initialization of spell effects registry
2023-04-09 20:07:29 +03:00
Ivan Savenko a6ce99573c Added fallback identifiers for reading older vcmi maps 2023-04-09 12:27:33 +03:00
Ivan Savenko 148cc0b280 Merge pull request #1896 from rilian-la-te/change-gcc-build-settings
vcmi: change gcc variant to build lua and no pch
2023-04-09 01:14:22 +03:00
Ivan Savenko ae5d273df9 Merge pull request #1905 from IvanSavenko/fix_rewardables
Fixed UI of objects that provide one reward that can be refused
2023-04-08 22:15:22 +03:00
Ivan Savenko a97ebc2bf1 Merge pull request #1874 from krs0/feature/separate_movement_highlight_for_hoverd_units_in_battle
Separate movement highlight for hovered units in battle
2023-04-08 21:47:49 +03:00
Ivan Savenko f211207f83 Merge pull request #1893 from trofi/fix-build-without-pch
Add missing include headers when building with -DENABLE_PCH=OFF
2023-04-08 21:45:47 +03:00
Ivan Savenko 84af64ce6b Removed magical initialization of registry via static variables 2023-04-08 21:29:04 +03:00
Ivan Savenko 454168897e Fix handling of invalid hotkeys in configurable UI 2023-04-08 19:53:13 +03:00
Ivan Savenko 71ddaeea6e Fix crash on missing music file 2023-04-08 19:47:16 +03:00
Ivan Savenko 4d37686eb3 Merge pull request #1901 from rilian-la-te/disable-info-bar-scroll
InfoBar: disable scrollbar
2023-04-08 19:12:48 +03:00
Ivan Savenko d00fa5bf86 Merge pull request #1887 from Adriankhl/fix_dropbox_left_click
Fix: close dropbox with left mouse click outside of the dropbox
2023-04-08 19:11:50 +03:00
Ivan Savenko 0abc00f82e Fix assertion failure in in-game console 2023-04-08 18:53:47 +03:00
Ivan Savenko 3dedc963f7 Fix double-playing of battle effects 2023-04-08 18:53:28 +03:00
Ivan Savenko e35a1ba471 Merge pull request #1876 from rilian-la-te/refactoring-v1
VCMI Refactoring
2023-04-08 11:14:05 +03:00
Ivan Savenko 50da080130 Fixed UI of objects that provide one reward that can be refused 2023-04-08 00:13:38 +03:00
Ivan Savenko 1590c710dd Merge pull request #1886 from rilian-la-te/fix-rmg-levels
vcmi: fix rmg header levels
2023-04-07 12:43:34 +03:00
Ivan Savenko f3aed901fd Merge pull request #1883 from rilian-la-te/fixup-healing-destination
CGameHandler: fixup healing destination
2023-04-07 12:42:52 +03:00
Ivan Savenko e306e8f9ce Merge pull request #1879 from kambala-decapitator/single-process-development-mode
fix "development mode" condition when building in single process mode
2023-04-07 12:42:03 +03:00
Ivan Savenko c675e6878a Merge pull request #1878 from IvanSavenko/fix_battle_ui
Fix visual glitches in battle UI
2023-04-07 12:41:29 +03:00
Ivan Savenko d8faacc9f2 Merge pull request #1875 from IvanSavenko/ttf_fonts_fallback
TTF fonts fallback
2023-04-07 12:41:00 +03:00
Ivan Savenko c304687b2a Merge pull request #1873 from IvanSavenko/fix_stack_experience_bonuses
Fix stack experience bonuses
2023-04-07 12:38:23 +03:00
Ivan Savenko a3c5f75600 Fix visibility of alternative actions button in tactics stage 2023-04-05 18:36:10 +03:00
Ivan Savenko cf966015bb Correctly update battle queue state after changing its state 2023-04-05 18:35:45 +03:00
Ivan Savenko 0770a1a153 TTF fonts can now be used as fallback for H3 fonts 2023-04-04 22:23:32 +03:00