1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-18 17:40:48 +02:00
Commit Graph

8935 Commits

Author SHA1 Message Date
Tomasz Zieliński
55b142a8c9 Suggested tweaks 2022-09-14 11:37:12 +02:00
nordsoft
c24fc89fe3 Lambda decltype on compile time instead of runtime 2022-09-14 12:08:20 +03:00
Tomasz Zieliński
d0f857c3c4 - Generate caching string with sprintf
- Reserve BonusList space to avoid costly vector reallocation
- Tweaks in int3 and UNDEAD bonus
2022-09-14 11:00:40 +02:00
nordsoft
2d5d616af0 Remove backward compatibility with non-existing version 2022-09-13 03:35:35 +04:00
nordsoft
1705d7e43f Refactor obstacles placer
# Conflicts:
#	lib/rmg/ObstaclePlacer.cpp
#	lib/rmg/ObstaclePlacer.h
2022-09-13 03:31:34 +04:00
nordsoft
2d4239d039 Mod version verification system 2022-09-13 03:30:19 +04:00
nordsoft
2d063bf19b Add numeric version
# Conflicts:
#	lib/GameConstants.cpp
2022-09-13 03:29:47 +04:00
nordsoft
bb2866a3cd Remove unused declaration 2022-09-13 03:28:43 +04:00
nordsoft
d72f50da6d Merge tag 'MapEditor0.0.3' into vlc-obstacles
# Conflicts:
#	client/CGameInfo.cpp
#	client/CGameInfo.h
#	client/battle/CBattleInterface.cpp
#	config/gameConfig.json
#	config/obstacles.json
#	config/schemas/battlefield.json
#	config/schemas/obstacle.json
#	include/vcmi/Services.h
#	lib/BattleFieldHandler.cpp
#	lib/BattleFieldHandler.h
#	lib/CHeroHandler.cpp
#	lib/CHeroHandler.h
#	lib/CModHandler.cpp
#	lib/GameConstants.cpp
#	lib/GameConstants.h
#	lib/IGameCallback.cpp
#	lib/VCMI_Lib.cpp
#	lib/VCMI_Lib.h
#	lib/battle/BattleInfo.cpp
#	lib/spells/CSpellHandler.cpp
#	test/mock/mock_Services.h
2022-09-13 03:28:23 +04:00
nordsoft
e5e5e78fca Merge remote-tracking branch 'upstream/develop' into vlc-obstacles
# Conflicts:
#	.github/workflows/github.yml
#	CI/mac/before_install.sh
#	client/CGameInfo.cpp
#	client/CGameInfo.h
#	client/battle/CBattleInterface.cpp
#	config/gameConfig.json
#	config/obstacles.json
#	config/randomMap.json
#	config/schemas/battlefield.json
#	config/terrains.json
#	include/vcmi/Services.h
#	lib/BattleFieldHandler.cpp
#	lib/BattleFieldHandler.h
#	lib/CHeroHandler.cpp
#	lib/CHeroHandler.h
#	lib/CModHandler.cpp
#	lib/GameConstants.cpp
#	lib/GameConstants.h
#	lib/IGameCallback.cpp
#	lib/Terrain.cpp
#	lib/Terrain.h
#	lib/VCMI_Lib.cpp
#	lib/VCMI_Lib.h
#	lib/battle/BattleInfo.cpp
#	lib/mapObjects/CObjectClassesHandler.cpp
#	lib/mapObjects/CObjectClassesHandler.h
#	lib/mapObjects/ObjectTemplate.cpp
#	lib/mapObjects/ObjectTemplate.h
#	lib/mapping/CCampaignHandler.h
#	lib/rmg/CMapGenerator.cpp
#	lib/rmg/CMapGenerator.h
#	lib/rmg/ConnectionsPlacer.cpp
#	lib/rmg/ObjectManager.cpp
#	lib/rmg/ObjectManager.h
#	lib/rmg/ObstaclePlacer.cpp
#	lib/rmg/RiverPlacer.cpp
#	lib/rmg/RmgObject.cpp
#	lib/rmg/RoadPlacer.cpp
#	lib/rmg/RoadPlacer.h
#	lib/rmg/TownPlacer.cpp
#	lib/rmg/TreasurePlacer.cpp
#	lib/rmg/TreasurePlacer.h
#	lib/rmg/WaterProxy.cpp
#	lib/spells/CSpellHandler.cpp
#	test/mock/mock_Services.h
2022-09-13 03:00:32 +04:00
nordsoft
72e39ccce6 Allow number only 2022-09-12 14:37:55 +04:00
nordsoft
38fd6ec610 Pandora rewards delegate 2022-09-12 14:28:38 +04:00
nordsoft
330b107a23 Fix crashes after merge 2022-09-11 22:48:54 +04:00
Nordsoft91
9b96fa2351
Merge pull request #44 from Nordsoft91/gui-ux-improvements
Editor UX improvements
2022-09-11 21:14:45 +04:00
nordsoft
656ee8c2b2 Raw version of hero flags 2022-09-11 21:00:30 +04:00
nordsoft
82d6a6350c Fix compilation errors 2022-09-11 18:50:59 +04:00
nordsoft
5ce0f7c4e0 Merge remote-tracking branch 'upstream/develop' into cpp-map-editor
# Conflicts:
#	lib/CHeroHandler.cpp
#	lib/mapObjects/CObjectClassesHandler.cpp
#	lib/mapObjects/CObjectClassesHandler.h
#	lib/mapObjects/ObjectTemplate.cpp
#	lib/mapObjects/ObjectTemplate.h
#	lib/mapping/CCampaignHandler.h
#	lib/mapping/CMap.h
#	lib/mapping/CMapEditManager.cpp
#	lib/mapping/CMapEditManager.h
#	lib/rmg/CMapGenerator.cpp
#	lib/rmg/CMapGenerator.h
#	lib/rmg/ConnectionsPlacer.cpp
#	lib/rmg/ObjectManager.cpp
#	lib/rmg/ObstaclePlacer.cpp
#	lib/rmg/ObstaclePlacer.h
#	lib/rmg/RiverPlacer.cpp
#	lib/rmg/RmgArea.h
#	lib/rmg/RmgMap.cpp
#	lib/rmg/RmgMap.h
#	lib/rmg/RmgObject.cpp
#	lib/rmg/TownPlacer.cpp
#	lib/rmg/TreasurePlacer.cpp
#	lib/rmg/TreasurePlacer.h
#	lib/rmg/WaterProxy.cpp
#	lib/rmg/Zone.cpp
#	lib/rmg/Zone.h
#	lib/serializer/CSerializer.h
#	lib/spells/CSpellHandler.cpp
2022-09-11 18:26:11 +04:00
DjWarmonger
3d2dc2335b Switch ObjectTemplate to shared_ptr<const> (#870) 2022-09-11 16:13:53 +03:00
Andrey Filipenkov
cedc9a92ed prevent crash when a mod from save file doesn't exist 2022-09-11 13:42:21 +03:00
Andrey Filipenkov
e6e7679a2c activate battle hexes after heroes
gives hexes higher priority when performing "hit test" for mouse click as CGuiHandler::handleElementActivate() uses push_front to a list
this fixes RMB click on the topmost corner stacks: now it shows stack info instead of hero
2022-09-11 13:40:38 +03:00
Andrey Filipenkov
bccc658e8b fix launching server when Windows user name has non-latin characters 2022-09-11 11:31:28 +03:00
Andrey Filipenkov
d44780d2ac add standard hotkeys to the Quick Recruitment dialog 2022-09-11 11:31:28 +03:00
Nordsoft91
0db05db920 [863] Fix spells amount (#867) 2022-09-11 11:31:28 +03:00
Tomasz Zieliński
40585a66c0 Style, commend - requested 2022-09-11 11:31:28 +03:00
Tomasz Zieliński
22b4795f86 Well, we should have some sensible exception handling in VCMI 2022-09-11 11:31:28 +03:00
Tomasz Zieliński
1649cf2bb9 misc comments 2022-09-11 11:31:27 +03:00
Tomasz Zieliński
6ae3b77d80 AI will not wait to conwuer fort if possible 2022-09-11 11:31:27 +03:00
Tomasz Zieliński
f0bb97b0d2 AI will actually attack all heroes when possible - and win the game eventually :) 2022-09-11 11:31:27 +03:00
Tomasz Zieliński
6fb7301e8e Fixed issue with taking creatures from a Bank, Pandora or joiners 2022-09-11 11:31:27 +03:00
Tomasz Zieliński
b52faad4c7 + Stack speed is valuable
+ Hero movement is also very valuable
2022-09-11 11:31:27 +03:00
Tomasz Zieliński
efb6580958 Fix for mislaced hero rescued from Prison - https://bugs.vcmi.eu/view.php?id=3227 2022-09-11 11:31:27 +03:00
Tomasz Zieliński
a83753a7d2 AI will now pick Prisons if possible 2022-09-11 11:31:27 +03:00
Tomasz Zieliński
cbf2a1b7cc AI will consider Pandora Box as a valuable object - good for every occasion! 2022-09-11 11:31:27 +03:00
Tomasz Zieliński
faa6ca401e Fixed duplicated value 2022-09-11 11:31:27 +03:00
Tomasz Zieliński
f4de5453c6 + AI will consider free slot (or lack of it) for creature reward from a bank
+ AI might use banks for resources other than gold
2022-09-11 11:31:27 +03:00
Andrii Danylchenko
a25d0198a9 [844] - fix pathfinding for fly towards guarded tile 2022-09-11 11:31:27 +03:00
nordsoft
c9eec47304 Fix terrain performance 2022-09-11 11:31:27 +03:00
nordsoft
9a8a37637f [839] update config 2022-09-11 11:31:27 +03:00
nordsoft
05c931a4c8 [838] update config 2022-09-11 11:31:27 +03:00
nordsoft
9681c88b65 [837] update config 2022-09-11 11:31:27 +03:00
nordsoft
1a37b06358 [833] Fix spell scroll sound 2022-09-11 11:31:27 +03:00
nordsoft
fa4f79692b [832] Fix water ambient sound 2022-09-11 11:31:27 +03:00
nordsoft
cf9314507b Fix crash in rmg 2022-09-11 11:31:27 +03:00
nordsoft
f7bf1ad467 [810] Fix bonus duplication 2022-09-11 11:31:27 +03:00
DjWarmonger
f81d869b4a Mine roads (#808)
* Create dirt roads to mines if there are no roads in a zone.
2022-09-11 11:31:27 +03:00
Nordsoft91
99a9680f62 Final preparations for merge into develop (#780)
* version updated, change log updated from release draft
* horse sounds for terrains
* Update and freeze essential files
2022-09-11 11:31:27 +03:00
nordsoft
670bca2fdb Randomly shuffle required objects to avoid patterns 2022-09-11 11:31:27 +03:00
Nordsoft91
8f0dcf928c Fix problems with water zone (#784) 2022-09-11 11:31:27 +03:00
Nordsoft91
e028875fe3 Fix RMG bug with incorrect town placement (#779)
* Fix RMG bug with incorrect town placement
* Readability tweak
2022-09-11 11:31:27 +03:00
Nordsoft91
454889598f Improve treasure placement logic (#775)
Improve treasure placement logic (#775)
2022-09-11 11:31:27 +03:00