games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-30 04:30:42 +02:00
Code Issues Releases Activity
10,983 Commits 22 Branches 65 Tags
Commit Graph

10983 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
nordsoft
be6667acf5 Most questionable workaround 2023-04-20 19:21:37 +04:00
nordsoft
9ecf16ca23 Fix minor bugs 2023-04-20 03:20:00 +04:00
Konstantin P
4e18a3d579 CSerializer: fix debug assertion 
Fix compilation in debug mode
 2023-04-20 01:27:15 +04:00
nordsoft
5cf9fbbe02 Fix compiling 2023-04-19 03:11:13 +04:00
nordsoft
f464ca3560 Merge remote-tracking branch 'upstream/develop' into vcmi-campaign 
# Conflicts:
#	lib/mapping/CCampaignHandler.cpp
 2023-04-19 02:45:49 +04: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
Konstantin
4a79e2ccd9 CSerializer: fix any_cast 2023-04-18 23:29:47 +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
nordsoft
ecf8b9934b Further refactoring 2023-04-17 23:19:56 +04:00
Konstantin
a1e8d95028 vcmi: rework CArtHandler 2023-04-17 12:32:47 +03:00
nordsoft
b41481c73b Fix(?) mingw 2023-04-17 05:22:32 +04:00
nordsoft
80220fda5b Merge remote-tracking branch 'upstream/develop' into vcmi-campaign 
# Conflicts:
#	lib/mapping/CMap.h
 2023-04-17 04:54:57 +04:00
nordsoft
91b4782a2f Refactor more fields from campaign header 2023-04-17 04:47:54 +04:00
nordsoft
70f4cc5e0f Refactor campaign regions 2023-04-17 04:26:35 +04:00
nordsoft
e4c147db16 Add mod management into map editor 2023-04-17 03:01:29 +04:00
krs
91c96b1b68 Fix for merge. 2023-04-17 00:53:25 +03:00
Konstantin
54eb550eb9 vcmi: remove unused functions now 2023-04-17 00:43:13 +03:00
Konstantin
7a5775a9f9 vcmi: use std::optional 2023-04-17 00:43:13 +03:00
Konstantin
0d35606a44 vcmi: use std::variant 2023-04-17 00:43:13 +03:00
Konstantin
8dcb041917 vcmi: use std::any 2023-04-17 00:43:13 +03:00
Konstantin
25783066e8 vcmi: use std::any_cast 2023-04-17 00:43:13 +03:00
krs
14cbdf7ab0 Split Process console commands code into individual functions 
Extracted functions for each if branch, added one line doc for each function, rearranged the commands to be groupped more logically.
 2023-04-16 23:45:37 +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
nordsoft
0c87d0a26c Add a comment 2023-04-16 21:49:43 +04: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
Michael
0c1262a772
Add files via upload 2023-04-16 14:59:27 +02:00
nordsoft
954a2abb71 Verifying mods before starting map 2023-04-16 15:38:13 +04:00
Michael
d64106b700
Update generate_icns.py 2023-04-16 12:33:35 +02:00
nordsoft
67e1b48d47 Remove unused interface 2023-04-16 14:00:01 +04: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