games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity
10,773 Commits 22 Branches 70 Tags
bfc75ccd39cbb8eae9a32a8a168a118adb4557d6
Commit Graph

10773 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SoundSSGood
ea7dd14d8b client is able to erase artifact 2023-04-08 00:41:55 +03:00
Sergei Trofimovich
2885536bf5 Add missing include headers when building with -DENABLE_PCH=OFF 
Example build failure is missing `VCMI_LIB_NAMESPACE_BEGIN` declaration:

    [  0%] Building CXX object lib/CMakeFiles/vcmi.dir/spells/ObstacleCasterProxy.cpp.o
    In file included from lib/spells/ProxyCaster.h:13,
                     from lib/spells/ObstacleCasterProxy.h:11,
                     from lib/spells/ObstacleCasterProxy.cpp:11:
    lib/../include/vcmi/spells/Caster.h:13:1: error: 'VCMI_LIB_NAMESPACE_BEGIN' does not name a type
       13 | VCMI_LIB_NAMESPACE_BEGIN
          | ^~~~~~~~~~~~~~~~~~~~~~~~
 2023-04-07 10:25:11 +01:00
nordsoft
b1d06b6141 Complete quick combat feature 2023-04-06 22:49:38 +04:00
nordsoft
e85593dbb3 Save & restore mana 2023-04-06 21:19:46 +04:00
nordsoft
3e28b58c80 Fixes 2023-04-06 19:59:22 +04:00
nordsoft
ece8a2a41f Merge branch 'battle-dialog' into battle-dialog2 
# Conflicts:
#	AI/BattleAI/BattleAI.h
#	AI/StupidAI/StupidAI.h
#	client/CPlayerInterface.cpp
#	client/CPlayerInterface.h
#	client/Client.cpp
#	client/NetPacksClient.cpp
#	client/battle/CBattleInterface.cpp
#	client/battle/CBattleInterface.h
#	client/battle/CBattleInterfaceClasses.cpp
#	client/battle/CBattleInterfaceClasses.h
#	config/schemas/settings.json
#	lib/CGameInterface.h
#	lib/IGameEventsReceiver.h
#	lib/NetPacks.h
#	lib/NetPacksLib.cpp
#	lib/battle/BattleInfo.cpp
#	server/CGameHandler.cpp
#	server/CQuery.h
 2023-04-06 19:53:52 +04:00
nordsoft
ce3028bd73 Intermediate commit 2023-04-06 19:34:07 +04:00
Konstantin
11b237a23c vcmi: massive refactoring v1 2023-04-05 22:33:12 +03:00
Konstantin
ee489f18d2 vcmi: PlayerState is now an Entity 
This will reduce code duplication a little bit.
 2023-04-05 01:22:04 +03:00
Konstantin
8968f0ef0e vcmi: change EAlignment to enum class 2023-04-05 01:22:04 +03:00
Konstantin
0c7dbea990 HeroBonus: remove unused function 2023-04-04 23:02:55 +03:00
Konstantin
b7d6270272 vcmi: add getNativeTerrain method to factions 2023-04-04 23:02:55 +03:00
Konstantin
e0715a76c8 vcmi: reduce CStack usage a little bit 2023-04-04 23:02:54 +03:00
Konstantin
e946ddcfeb CGameHandler: obstacle trigger does not use CStack 2023-04-04 23:02:54 +03:00
Konstantin
22dd97ad18 vcmi: use entilites when possible part 1 2023-04-04 23:02:54 +03:00
Konstantin
4259d116e1 vcmi: move ServerSpellCastEnvironment in separate file 
In theory, it should not know about CGameHandler
 2023-04-04 23:02:54 +03:00
Ivan Savenko
307065a633 Merge beta into develop 2023-04-04 16:06:20 +03:00
Ivan Savenko
ea291abb52 Merge pull request #1865 from IvanSavenko/identifiers_resolution_fixes 
Identifiers resolution fixes (1.3)
 2023-04-04 15:50:42 +03:00
Ivan Savenko
6518e04cd6 Merge pull request #1849 from Nordsoft91/editor-1537 
Allow single player on map and fix player params initialization
 2023-04-04 11:25:11 +03:00
Ivan Savenko
00e9cef19f Merge pull request #1857 from rilian-la-te/russian-launcher 
launcher: update russian translation
 2023-04-04 11:24:38 +03:00
Ivan Savenko
5b480124b8 Merge pull request #1862 from IvanSavenko/fix_garrison_move_shortcut 
Space and left-clicking on second hero in town now have share code
 2023-04-04 11:23:19 +03:00
Ivan Savenko
6b2b8bb5c0 Merge pull request #1863 from IvanSavenko/fix_mod_identifiers 
Fix mod identifiers
 2023-04-04 11:22:30 +03:00
Ivan Savenko
6061ee391d Merge pull request #1864 from IvanSavenko/launcher_layout_fix 
Launcher layout fix
 2023-04-04 11:22:16 +03:00
Ivan Savenko
d6cb513374 Merge pull request #1858 from IvanSavenko/sliders_fix 
Allow defining active areas for sliders.
 2023-04-04 11:21:45 +03:00
DjWarmonger
53df84459f Merge pull request #1781 from vcmi/object_distribution 
Improved object distribution
 2023-04-04 06:52:10 +02:00
Andrii Danylchenko
10bf9bc7a0 Merge pull request #1678 from vcmi/nkai-fix-build 
NKAI: more fixes to defense and pandora
 2023-04-03 22:39:11 +03:00
Ivan Savenko
255bb145b9 Added fallback for 1.2 compatibility 2023-04-03 16:26:43 +03:00
Ivan Savenko
766fb066c6 Fix debug build 2023-04-03 15:15:51 +03:00
Ivan Savenko
c5acb8bb7d Fixed empty scope on resolving map overrides 2023-04-03 15:15:29 +03:00
Ivan Savenko
191959ae05 Fixed moat identifiers requests - will now always request spells 2023-04-03 15:15:12 +03:00
Ivan Savenko
2d0344f905 VCMI will now correctly resolve identifiers in unexpected form 2023-04-03 15:14:34 +03:00
Ivan Savenko
fd0274eb95 Fix label visibility 2023-04-03 01:46:26 +03:00
Ivan Savenko
6683c866ee Disabled check for unused lines in translations due to false positives 2023-04-03 01:12:48 +03:00
Ivan Savenko
10e852fcb9 Fix scope of identifiers resolving for commanders abilities 2023-04-03 01:12:04 +03:00
Ivan Savenko
93b77d0c99 Space and left-clicking on second hero in town now have share code 2023-04-03 00:43:18 +03:00
Ivan Savenko
e1c3550ae2 Merge pull request #1859 from rilian-la-te/fix-stack-smash 
vcmi: fix stack smash
 2023-04-03 00:41:44 +03:00
Ivan Savenko
0eebafff7f Merge pull request #1860 from rilian-la-te/fix-comma 
gameConfig.json: add missing comma
 2023-04-03 00:39:43 +03:00
Konstantin
76bddf97bd gameConfig.json: add missing comma 2023-04-02 23:53:47 +03:00
Konstantin
f41b2475fe vcmi: fix stack smash 2023-04-02 23:27:15 +03:00
Ivan Savenko
507d8bf7fd Allow defining active areas for sliders. Fixes settings window. 2023-04-02 22:24:07 +03:00
Konstantin
41fa2367e5 launcher: update russian translation 2023-04-02 22:05:47 +03:00
Ivan Savenko
c661419897 Merge pull request #1700 from rilian-la-te/resource-array 
Modernize resourceSet.
 2023-04-02 20:12:45 +03:00
Ivan Savenko
6dac15c5b2 Merge pull request #1706 from rilian-la-te/moats-landmines 
Proper moats: mechanincs
 2023-04-02 20:12:33 +03:00
Ivan Savenko
c5ca17a324 Merge pull request #1853 from Nordsoft91/fix-scope-guard 
Fix ScopeGuard move behavior
 2023-04-02 20:10:26 +03:00
Ivan Savenko
1cb0c6b270 Merge pull request #1848 from Nordsoft91/editor-fix 
Fix map editor crash with cutting random town
 2023-04-02 20:09:24 +03:00
Ivan Savenko
2b1def4ef1 Merge pull request #1813 from Laserlicht/patch-1 
hide messages from AI
 2023-04-02 20:08:45 +03:00
Ivan Savenko
f471d1b23a Merge pull request #1816 from krs0/feature/all_cheats_should_have_lotr_equivalent 
Added LotR alternatives for vcmiarmy and vcmiexp
 2023-04-02 20:08:33 +03:00
Ivan Savenko
a3074e2741 Merge pull request #1835 from rilian-la-te/fix-native-type 
CCreatureHandler: fix native terrain for any
 2023-04-02 20:08:18 +03:00
Ivan Savenko
7be55754ed Merge pull request #1837 from vcmi/Nordsoft91-patch-1 
Update changelog
 2023-04-02 20:07:59 +03:00
Ivan Savenko
141443b319 Merge pull request #1852 from Nordsoft91/load-crash 
Fix divide by zero crash
 2023-04-02 20:07:09 +03:00