1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-26 03:52:01 +02:00

4545 Commits

Author SHA1 Message Date
SoundSSGood
dcac8252f3 fixed windows positions 2023-04-23 14:57:45 +03:00
SoundSSGood
a8220c551f fixed init CArtifactsOfHero 2023-04-23 14:33:47 +03:00
SoundSSGood
177523d972 askToAssemble, askToDisassemble 2023-04-23 14:17:27 +03:00
SoundSSGood
1046964eef CArtifactHolder 2023-04-23 14:14:24 +03:00
Nordsoft91
a553a4aa66
Merge pull request #2030 from Nordsoft91/boats 2023-04-22 03:27:00 +04: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
nordsoft
de159df481 Rename boats 2023-04-20 21:20:51 +04: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
nordsoft
753b72f96d Revert "Hidden maps"
This reverts commit e669d31d33beb20685c5fd87148a3d37a0391afd.
2023-04-20 19:50:00 +04: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
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
4bb4d7e7a5
Merge pull request #1989 from SoundSSGood/refactoring-arts-p1
Artifact related code refactoring part1 (initial)
2023-04-19 15:31:11 +03: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
nordsoft
0a28262c15 Merge remote-tracking branch 'upstream/develop' into boats
# Conflicts:
#	AI/VCAI/Pathfinding/AINodeStorage.cpp
2023-04-19 02:22:19 +04:00
nordsoft
d1dacd45e2 Animations from config 2023-04-19 00:14:15 +04: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
nordsoft
ed798b06da Prepare transport enum 2023-04-18 13:04:49 +04:00
nordsoft
2babb5add5 Fix boat extra animations 2023-04-17 23:39:34 +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
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
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
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
Ivan Savenko
1704fab3a2 Fix assertion failure on fighting against AI with tactics 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
de855085f0 Added information on banks, seer hut and monster properties 2023-04-15 17:20:38 +03:00