games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-16 02:47:36 +02:00
Code Issues Releases Activity
8,234 Commits 21 Branches 65 Tags 121 MiB
52e40b0016
Commit Graph

3985 Commits

Author SHA1 Message Date
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
Nordsoft91
9b96fa2351
Merge pull request #44 from Nordsoft91/gui-ux-improvements 
Editor UX improvements
 2022-09-11 21:14:45 +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
Nordsoft91
0db05db920 [863] Fix spells amount (#867) 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
efb6580958 Fix for mislaced hero rescued from Prison - https://bugs.vcmi.eu/view.php?id=3227 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
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
Nordsoft91
1451385a9b Fix problem with empty areas (#772) 
* Fixes for obstacles and treasures
 2022-09-11 11:31:27 +03:00
Nordsoft91
2edf9ef3a4 Fix for sealed-off treasures (#771) 
Fix for sealer-off treasures
 2022-09-11 11:31:27 +03:00
Nordsoft91
4bd0ff680a Random map generator refactoring (#762) 
random map generator refactoring and improvements
 2022-09-11 11:31:27 +03:00
Andrii Danylchenko
665bd4346e Fix getting battlefield crash 2022-09-11 11:31:27 +03:00
Andrii Danylchenko
4b4cc3cf4b battlefields in VLC and custom bonuses for terrain patches 2022-09-11 11:31:27 +03:00
Andrii Danylchenko
3b1d271ae0 allow configurable battleground graphics 2022-09-11 11:31:26 +03:00
Nordsoft91
c4035134e5 New battlegrounds (#758) 2022-09-11 11:31:26 +03:00
Nordsoft91
aaa07e4d2e New terrain support - part 1 (#755) 
Initial support of new terrains
 2022-09-11 11:31:26 +03:00
Tomasz Zielinski
816d4b3081 Merge remote-tracking branch 'origin/cpp-map-editor' into gui-ux-improvements 
# Conflicts:
#	mapeditor/mainwindow.h
#	mapeditor/mainwindow.ui
#	mapeditor/windownewmap.cpp
 2022-09-11 08:10:16 +02:00
Tomasz Zielinski
73cc606ee2 Load template name from user settings 2022-09-11 07:47:32 +02:00
nordsoft
480b58c80a Possibility to load maps from any folder 2022-09-11 00:50:41 +04:00
Nordsoft91
205bb09880
Launcher fixes for mod filesystem (#860) 
* Show submods as disabled if parent mod is disabled
* [845] disable button for local mods
Fixes for #812 #851 #852
 2022-09-10 19:30:41 +03:00
nordsoft
a0561e9d79 Merge branch 'fix-spells-amount' into cpp-map-editor 2022-09-09 16:20:13 +04:00
nordsoft
331f02be33 Fix spells amount 2022-09-09 15:29:52 +04:00
nordsoft
e64641cf01 Merge remote-tracking branch 'upstream/features/new-terrains' into cpp-map-editor 
# Conflicts:
#	launcher/settingsView/csettingsview_moc.ui
#	lib/mapping/CMap.h
#	lib/mapping/CMapEditManager.cpp
#	lib/mapping/CMapEditManager.h
#	lib/rmg/CMapGenerator.cpp
#	lib/rmg/CMapGenerator.h
#	lib/rmg/ObstaclePlacer.cpp
#	lib/rmg/ObstaclePlacer.h
#	lib/rmg/RmgArea.h
#	lib/rmg/RmgMap.cpp
#	lib/rmg/RmgMap.h
#	lib/rmg/Zone.cpp
#	lib/rmg/Zone.h
#	lib/serializer/CSerializer.h
 2022-09-09 11:59:19 +04:00
Andrii Danylchenko
68d052ac5c [844] - fix pathfinding for fly towards guarded tile 2022-09-09 09:01:21 +03:00
nordsoft
dab7c41d21 Fix terrain performance 2022-09-07 13:21:02 +04:00
nordsoft
c3355aa976 Support creature setting up 2022-09-07 05:33:48 +04:00
nordsoft
289ae8a1f8 Fix terrain performance 2022-09-07 04:20:02 +04:00
nordsoft
9429cb4340 Add more objects into inspector 2022-09-07 02:39:07 +04:00
Tomasz Zieliński
97b0fa16ae Fill obstacles as one operation (for undo). 
However, it works only for obstacles on one type of terrain.
 2022-09-06 20:51:45 +02:00
Tomasz Zieliński
d790978dbb (almost) unlimited undo, why not? 2022-09-06 19:22:36 +02:00
Tomasz Zieliński
ca0446c4ee Fix compilation 2022-09-06 19:17:52 +02:00
Tomasz Zieliński
43a6986ebf fix warning 2022-09-06 19:17:38 +02:00