games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-18 17:40:48 +02:00
Code Issues Releases Activity
8,717 Commits 19 Branches 61 Tags 109 MiB
57dfeb2ff2
Commit Graph

8717 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nordsoft91
60264aae29
Apply suggestions from code review 
Co-authored-by: Andrey Filipenkov <decapitator@ukr.net>
 2022-09-19 01:18:17 +04:00
Andrey Filipenkov
beeef8527f Apply suggestions from code review 
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
 2022-09-18 17:43:40 +03:00
Andrey Filipenkov
81dec1405f fix typo: purhase -> purchase 2022-09-18 17:43:40 +03:00
Andrey Filipenkov
a320af837d fix includes in client subdirectories 2022-09-18 17:43:40 +03:00
Andrey Filipenkov
0163190ac5 move hardcoded strings to JSON file 2022-09-18 17:43:37 +03:00
DjWarmonger
7ba271edf1
Rotation rebase2 (#912) 
* Instead of [x][y][z] coordinates, map will be stored as [z][x][y].
* Nullkiller AI can get it too.
* Use boost::multi_array instead of nested vectors
* In MapHandler too
* Rotate foreach algorithms, too
* VCAI gets rotated, too
 2022-09-18 17:39:10 +03:00
Andrey Filipenkov
90d355dd05 check availability only of town creatures 
QRD shows only town creatures ignoring Summoning Portal
 2022-09-18 15:58:15 +03:00
Andrey Filipenkov
a0832c39f9 show message instead of the Quick Recruit dialog when there're no creatures in town 2022-09-18 15:50:06 +03:00
Andrey Filipenkov
e85f8a56bb make FFmpeg dependency optional 2022-09-18 09:25:10 +03:00
Andrey Filipenkov
45f5fc04be [macOS] store logs in the standard system directory 
~/Library/Logs/vcmi
 2022-09-18 09:24:36 +03:00
Andrey Filipenkov
99af5bbe4c add dedicated method to get logs path 2022-09-18 09:24:36 +03:00
Andrey Filipenkov
03b4ea71ba move VCMIDirs::genHelpString() implementation to the base class 
removes copy-paste
 2022-09-18 09:24:36 +03:00
nordsoft
0563828763 Fix hero initialization for random map 2022-09-18 03:44:52 +04:00
nordsoft
0b9f601d2c Squashing editor 2022-09-18 03:23:17 +04:00
nordsoft
12c71c154f Merge remote-tracking branch 'origin/vlc-obstacles' into vlc-obstacles 
# Conflicts:
#	lib/LoadProgress.cpp
#	lib/LoadProgress.h
#	lib/ObstacleHandler.cpp
#	lib/ObstacleHandler.h
#	lib/battle/BattleInfo.cpp
#	lib/battle/CObstacleInstance.cpp
#	lib/filesystem/Filesystem.h
#	lib/mapObjects/CGHeroInstance.h
#	lib/mapObjects/CGTownInstance.cpp
#	lib/mapObjects/CGTownInstance.h
#	lib/mapObjects/CObjectHandler.cpp
#	lib/mapObjects/CObjectHandler.h
#	lib/mapping/CMap.cpp
#	lib/mapping/CMap.h
#	lib/mapping/CMapEditManager.h
#	lib/mapping/CMapOperation.cpp
#	lib/mapping/CMapOperation.h
#	lib/mapping/MapEditUtils.cpp
#	lib/mapping/MapEditUtils.h
#	lib/rmg/CMapGenerator.cpp
#	lib/rmg/CRmgTemplateStorage.cpp
#	lib/rmg/CRmgTemplateStorage.h
 2022-09-17 17:47:36 +04:00
nordsoft
1b6f4a5cf3 Rebase on develop 2022-09-17 17:43:59 +04:00
Nordsoft91
e4ac0d4370
Editor prerequisites [part 2] (#889) 2022-09-17 14:04:01 +03:00
nordsoft
736962a79c Forgotten objects 2022-09-17 13:00:55 +03:00
Andrii Danylchenko
faccad7a15 #913 fix artifact assembling check 2022-09-16 14:13:56 +03:00
nordsoft
a598925a0b Support pickable objects 2022-09-16 09:41:23 +03:00
Nordsoft91
ad01c7ffce
Vlc obstacles [part 1] (#888) 
* obstacles content handler, entity service and VLC integration
 2022-09-15 11:06:54 +03:00
nordsoft
7dc05d8e81 Support rewardable objects 2022-09-15 11:05:13 +03:00
Andrey Filipenkov
5637cdbe3f [macOS] perform ad-hoc codesigning 2022-09-15 11:04:00 +03:00
nordsoft
0473f69c2f Fix parsing of mod versions 2022-09-15 04:27:03 +04:00
nordsoft
52e40b0016 Try to avoid double records 2022-09-15 03:14:31 +04:00
nordsoft
ab3a0cbab8 Version compatibility check in launcher 2022-09-15 03:14:09 +04:00
Alexander Wilms
d67d8a003e Add 1.0.0 release to appstream metadata 2022-09-14 21:53:42 +03:00
DjWarmonger
d34dd8676e
Merge pull request #898 from vcmi/cache-pathfinding 
Cache pathfinding
 2022-09-14 20:32:54 +02:00
DjWarmonger
5e2d87abd7
Update AI/Nullkiller/Goals/ExecuteHeroChain.cpp 
Co-authored-by: Andrey Filipenkov <decapitator@ukr.net>
 2022-09-14 16:23:13 +02:00
Tomasz Zieliński
931f4af2df typo 2022-09-14 15:24:39 +02:00
Tomasz Zieliński
77e43cb36f Cache Pathfinding skill 2022-09-14 15:24:24 +02:00
DjWarmonger
627b63ca56
Merge pull request #894 from vcmi/optimization_rebase 
Bonus and string optimization
 2022-09-14 13:03:30 +02:00
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