games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity
11,207 Commits 30 Branches 75 Tags
1d34c73c2d2ea6b24eccb7387253e457a2c32859
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ivan Savenko b0a11ac9d6 Merge pull request #2097 from vcmi/fix_3SM3d 
Add some non-zero value treasures to fix empty zones
 2023-05-01 21:54:46 +03:00
Ivan Savenko 916b41d9a7 Merge pull request #2078 from IvanSavenko/shortcuts 
Basic shortcuts system
 2023-05-01 21:45:52 +03:00
Ivan Savenko e9e5355af0 Added commented-out wog campaigns set 2023-05-01 18:00:35 +03:00
Ivan Savenko 0662ad49dd Fix build 2023-05-01 17:59:21 +03:00
Ivan Savenko 6c637dd8e6 Integrated hotkeys with InterfaceObjectConfigurable 2023-05-01 17:59:21 +03:00
Ivan Savenko dea10e6091 Use more descriptive names for hotkeys 2023-05-01 17:59:20 +03:00
Ivan Savenko a654cc2391 Removed vstd::advance. Added vstd::next to handle similar cases. 2023-05-01 17:58:18 +03:00
Ivan Savenko 832e56e005 Implementation of (very basic) shortcuts system 
- Added EShortcut enumeration that contains all in-game shortcuts
- CIntObject::keyPressed now receive values from hotkey enumeration
- On keypress, SDL key code will be translated to shortcut ID
- Removed access to SDL key codes from most of engine
 2023-05-01 17:58:17 +03:00
Ivan Savenko ac09f78c67 Merge pull request #2109 from IvanSavenko/server_fix 
Fix potential nullptr-to-reference conversion
 2023-05-01 16:36:51 +03:00
Ivan Savenko c7bee037d2 Fix potential nullptr-to-reference conversion 2023-05-01 14:44:52 +03:00
Ivan Savenko 4aa232a60a Merge pull request #2055 from SoundSSGood/cartifactholder-rework 
Artifact related code refactoring part2 (client CArtifactHolder)
 2023-05-01 02:33:08 +03:00
Ivan Savenko 3378a3c740 Merge pull request #1991 from rilian-la-te/modernization-rule-ver1 
vcmi: rule-based modernization part1
 2023-04-30 15:06:14 +03:00
Ivan Savenko bd1105e2b7 Merge pull request #2098 from tytannial/Chinese_locale_update 
Launcher zhCN translation
 2023-04-29 15:57:57 +03:00
Ivan Savenko 57399b5b32 Merge pull request #2094 from tytannial/Chinese_locale_update 
Chinese locale update
 2023-04-29 12:50:24 +03:00
Ivan Savenko 318ac4f23b Merge pull request #2091 from vcmi/DjWarmonger-patch-2 
Add download counter for 1.2.1
 2023-04-29 00:29:48 +03:00
Ivan Savenko d985ac90d3 Merge master -> develop 2023-04-28 22:57:25 +03:00
Ivan Savenko f26ff594b8 Merge pull request #2090 from IvanSavenko/android_fix 
Fix Android build?
 2023-04-28 22:51:59 +03:00
Ivan Savenko 346b8a4619 Merge pull request #2079 from rilian-la-te/cstack-some-private 
vcmi: make some CStack properties private
 2023-04-28 22:18:20 +03:00
Ivan Savenko 3dde827a9d Merge pull request #2070 from rilian-la-te/make-tests-compile-pass-h3 
vcmi: fix test compiling and passing
 2023-04-28 22:18:00 +03:00
Ivan Savenko d4ff2cbf12 attempt to fix Android build 2023-04-28 22:02:19 +03:00
Ivan Savenko 25d5a1555c Merge pull request #2088 from vcmi/beta 
Release 1.2.1
 2023-04-28 19:47:07 +03:00
Ivan Savenko e4864bf25a Merge pull request #2087 from IvanSavenko/beta_fixes 
Last fixes for 1.2.1
 2023-04-28 19:02:08 +03:00
Ivan Savenko 2da5b7efb8 Updated changelog 2023-04-28 17:08:50 +03:00
Ivan Savenko 3ae4819fcb Merge pull request #2085 from Nordsoft91/mapeditor-fix 
[1.2.1] Fix portrait serialization
 2023-04-28 17:06:29 +03:00
Ivan Savenko c55f52e84f Fixed disabled special weeks 2023-04-28 16:54:00 +03:00
Ivan Savenko 76d5b459f1 Fixed music playback on switching between towns 2023-04-28 16:53:45 +03:00
Ivan Savenko 93362eb692 Merge pull request #2083 from IvanSavenko/artifact_fix 
Fix list of treasures getting overwritten
 2023-04-28 15:41:38 +03:00
Ivan Savenko 881c434833 Fix list of treasures getting overwriteen leading to weird bugs 
... such as having Grail in crypts or getting relics as starting
artifact
 2023-04-27 23:40:56 +03:00
Ivan Savenko fb739e7186 Merge beta -> develop 2023-04-26 22:48:08 +03:00
Ivan Savenko 9296306fa3 Merge pull request #2041 from IvanSavenko/bugfixing_for_hotfix 
Fixes for 1.2.1
 2023-04-24 18:13:00 +03:00
Ivan Savenko 3489c4fd5c Merge pull request #2062 from heroesiiifan/patch-2 
add color to translation
 2023-04-24 17:19:36 +03:00
Ivan Savenko 48abf46824 Merge pull request #2005 from IvanSavenko/advmap_refactor 
Refactoring of adventure map interface
 2023-04-24 17:19:22 +03:00
Ivan Savenko 3ac713d6a8 Fix crash on dereferencing nullptr 2023-04-24 17:17:12 +03:00
Ivan Savenko d3c1c92a03 Do not update minimap using puzzle map data 2023-04-24 17:16:55 +03:00
Ivan Savenko fa156568c4 Fixes according to review 2023-04-24 16:58:15 +03:00
Ivan Savenko 80b37a3019 Fixed remaining regressions 2023-04-20 22:19:10 +03:00
Ivan Savenko bb08a0afc8 Moved selection logic to player state 2023-04-20 22:04:24 +03:00
Ivan Savenko e8718a46cc Fix regressions 2023-04-20 22:04:24 +03:00
Ivan Savenko dd227d24c3 Formatting and cleanup 2023-04-20 22:04:24 +03:00
Ivan Savenko 365f552fa1 Added API for owned towns access 2023-04-20 22:04:24 +03:00
Ivan Savenko 5cbd0f8fc8 API for wandering heroes access 2023-04-20 22:04:24 +03:00
Ivan Savenko 3eac6f323e added API for sleeping heroes access 2023-04-20 22:04:24 +03:00
Ivan Savenko 6a46138617 Moved current selection to local state class 2023-04-20 22:04:24 +03:00
Ivan Savenko f6d480cbb2 Moved player-specific heroes & towns information to new class 2023-04-20 22:04:24 +03:00
Ivan Savenko 4a169972f0 Further refactoring to cleanup code of advmap and locplint 2023-04-20 22:04:24 +03:00
Ivan Savenko 20de44d4a5 Reodered methods in file to group similar code 2023-04-20 22:04:24 +03:00
Ivan Savenko 7db67a3101 int3 now has proper hasher function 2023-04-20 22:04:24 +03:00
Ivan Savenko 4ec32e4dcd Renamed CAdvMapInt to its proper full name 2023-04-20 22:04:24 +03:00
Ivan Savenko f1902ab247 Initial refactoring to encapsulate adventure map 2023-04-20 22:03:28 +03:00
Ivan Savenko 24c6587072 Fixed crash on leaving to main menu from battle in hotseat mode 2023-04-20 19:56:35 +03:00
Ivan Savenko f245080cba Fix missing error message on casting spell in hotseat 2023-04-20 19:24:13 +03:00
Ivan Savenko 6df85be4b3 Fixed death animation of Efreeti killed by petrification attack 2023-04-20 18:13:01 +03:00
Ivan Savenko 5c9ae8aafc Implemented spell range overlay for Dimension Door and Scuttle Boat 2023-04-20 14:15:08 +03:00
Ivan Savenko 4dc16b9ff7 Adventure map spells are no longer visible on units in battle 2023-04-20 13:16:45 +03:00
Ivan Savenko 9882c37ce3 Good morale can no longer happen after battle is over 2023-04-20 13:10:03 +03:00
Ivan Savenko d9939f0918 Bad morale can no longer happen after waiting 2023-04-20 13:08:55 +03:00
Ivan Savenko b3207f3465 RMG tab will now show all templates but will block invalid map sizes 2023-04-19 23:14:23 +03:00
Ivan Savenko b517adfb25 Fixed crash on empty save game list after filtering 2023-04-19 23:12:30 +03:00
Ivan Savenko 3d30e04184 Fixed centering of scenario information window 2023-04-19 23:11:44 +03:00
Ivan Savenko 5a5aced67e Fixed empty Black Market on game start 2023-04-19 23:11:17 +03:00
Ivan Savenko 01af231084 Fixed Json conversion on Qt6 2023-04-19 23:10:34 +03:00
Ivan Savenko f593c2cf6e Fixed handling of utf-8 in code on msvc 2023-04-19 23:08:21 +03:00
Ivan Savenko 16bed465b6 Bump to versions 1.2.1 2023-04-19 23:08:00 +03:00
Ivan Savenko 4bb4d7e7a5 Merge pull request #1989 from SoundSSGood/refactoring-arts-p1 
Artifact related code refactoring part1 (initial)
 2023-04-19 15:31:11 +03:00
Ivan Savenko 9c62748151 Merge pull request #2036 from rilian-la-te/fix-serializer-assert 
CSerializer: fix debug assertion
 2023-04-19 13:54:57 +03:00
Ivan Savenko 505a78a638 Merge pull request #2035 from rilian-la-te/native-fix-beta 
vcmi: fix terrain penalties
 2023-04-19 13:39:54 +03:00
Ivan Savenko ff5e98e78b Merge pull request #2027 from rilian-la-te/fix-any-cast 
CSerializer: fix any_cast
 2023-04-19 01:01:11 +03:00
Ivan Savenko e8788cf4c4 Merge pull request #1999 from Laserlicht/patch-2 
Big/Vector Icons
 2023-04-18 16:23:00 +03:00
Ivan Savenko 56de0c9f56 Merge pull request #2015 from rilian-la-te/optional-variant-any 
vcmi: migrate to C++17
 2023-04-18 15:44:52 +03:00
Ivan Savenko b3d9807dd1 Merge pull request #2013 from krs0/feature/Split_processCommand_into_functions 
Split Process console commands code into individual functions
 2023-04-18 15:44:33 +03:00
Ivan Savenko d55b7b2d10 Merge pull request #2002 from IvanSavenko/fix_launcher 
Fix Launcher issues discovered in 1.2
 2023-04-18 15:43:26 +03:00
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 f9173b556b Do not block setup if language detection failed 2023-04-15 20:04:00 +03:00
Ivan Savenko 49538b6e2d Handle case of user selecting "Data" folder of H3 install 
After all, we do ask user to select location of Heroes III data...
 2023-04-15 20:02:59 +03:00
Ivan Savenko 7c6247f499 Be less strict in detecting languages to catch different versions of H3 2023-04-15 20:02:10 +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