games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-20 03:29:32 +02:00
Code Issues Releases Activity
vcmi/lib
History
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
..
abilities
…
battle
battlefields in VLC and custom bonuses for terrain patches
2022-09-11 11:31:27 +03:00
events
…
filesystem
Merge remote-tracking branch 'upstream/develop' into cpp-map-editor
2022-09-11 18:26:11 +04:00
logging
…
mapObjects
Merge remote-tracking branch 'upstream/develop' into cpp-map-editor
2022-09-11 18:26:11 +04:00
mapping
Merge remote-tracking branch 'upstream/develop' into cpp-map-editor
2022-09-11 18:26:11 +04:00
minizip
…
registerTypes
Fix RMG bug with incorrect town placement (#779)
2022-09-11 11:31:27 +03:00
rmg
Merge remote-tracking branch 'upstream/develop' into cpp-map-editor
2022-09-11 18:26:11 +04:00
serializer
Merge remote-tracking branch 'upstream/develop' into cpp-map-editor
2022-09-11 18:26:11 +04:00
spells
Switch ObjectTemplate to shared_ptr<const> (#870)
2022-09-11 16:13:53 +03:00
vstd
…
AI_Base.h
…
BattleFieldHandler.cpp
battlefields in VLC and custom bonuses for terrain patches
2022-09-11 11:31:27 +03:00
BattleFieldHandler.h
battlefields in VLC and custom bonuses for terrain patches
2022-09-11 11:31:27 +03:00
CAndroidVMHelper.cpp
…
CAndroidVMHelper.h
…
CArtHandler.cpp
…
CArtHandler.h
New terrain support - part 1 (#755)
2022-09-11 11:31:26 +03:00
CBonusTypeHandler.cpp
…
CBonusTypeHandler.h
…
CBuildingHandler.cpp
…
CBuildingHandler.h
…
CConfigHandler.cpp
…
CConfigHandler.h
…
CConsoleHandler.cpp
…
CConsoleHandler.h
…
CCreatureHandler.cpp
[863] Fix spells amount (#867)
2022-09-11 11:31:28 +03:00
CCreatureHandler.h
Random map generator refactoring (#762)
2022-09-11 11:31:27 +03:00
CCreatureSet.cpp
…
CCreatureSet.h
…
CGameInfoCallback.cpp
New terrain support - part 1 (#755)
2022-09-11 11:31:26 +03:00
CGameInfoCallback.h
…
CGameInterface.cpp
…
CGameInterface.h
…
CGameState.cpp
battlefields in VLC and custom bonuses for terrain patches
2022-09-11 11:31:27 +03:00
CGameState.h
New battlegrounds (#758)
2022-09-11 11:31:26 +03:00
CGameStateFwd.h
…
CGeneralTextHandler.cpp
New terrain support - part 1 (#755)
2022-09-11 11:31:26 +03:00
CGeneralTextHandler.h
New terrain support - part 1 (#755)
2022-09-11 11:31:26 +03:00
CHeroHandler.cpp
prevent crash when a mod from save file doesn't exist
2022-09-11 13:42:21 +03:00
CHeroHandler.h
Random map generator refactoring (#762)
2022-09-11 11:31:27 +03:00
CMakeLists.txt
Random map generator refactoring (#762)
2022-09-11 11:31:27 +03:00
CModHandler.cpp
battlefields in VLC and custom bonuses for terrain patches
2022-09-11 11:31:27 +03:00
CModHandler.h
New terrain support - part 1 (#755)
2022-09-11 11:31:26 +03:00
CondSh.h
…
ConstTransitivePtr.h
…
CPathfinder.cpp
[844] - fix pathfinding for fly towards guarded tile
2022-09-11 11:31:27 +03:00
CPathfinder.h
New terrain support - part 1 (#755)
2022-09-11 11:31:26 +03:00
CPlayerState.cpp
…
CPlayerState.h
New terrain support - part 1 (#755)
2022-09-11 11:31:26 +03:00
CRandomGenerator.cpp
…
CRandomGenerator.h
…
CScriptingModule.cpp
…
CScriptingModule.h
…
CSkillHandler.cpp
…
CSkillHandler.h
New terrain support - part 1 (#755)
2022-09-11 11:31:26 +03:00
CSoundBase.h
…
CStack.cpp
New terrain support - part 1 (#755)
2022-09-11 11:31:26 +03:00
CStack.h
New terrain support - part 1 (#755)
2022-09-11 11:31:26 +03:00
CStopWatch.h
…
CThreadHelper.cpp
…
CThreadHelper.h
…
CTownHandler.cpp
New terrain support - part 1 (#755)
2022-09-11 11:31:26 +03:00
CTownHandler.h
New terrain support - part 1 (#755)
2022-09-11 11:31:26 +03:00
FunctionList.h
…
GameConstants.cpp
Final preparations for merge into develop (#780)
2022-09-11 11:31:27 +03:00
GameConstants.h
battlefields in VLC and custom bonuses for terrain patches
2022-09-11 11:31:27 +03:00
HeroBonus.cpp
[810] Fix bonus duplication
2022-09-11 11:31:27 +03:00
HeroBonus.h
New terrain support - part 1 (#755)
2022-09-11 11:31:26 +03:00
IBonusTypeHandler.h
…
IGameCallback.cpp
battlefields in VLC and custom bonuses for terrain patches
2022-09-11 11:31:27 +03:00
IGameCallback.h
…
IGameEventsReceiver.h
…
IHandlerBase.cpp
…
IHandlerBase.h
…
int3.h
…
Interprocess.h
…
JsonDetail.cpp
…
JsonDetail.h
New terrain support - part 1 (#755)
2022-09-11 11:31:26 +03:00
JsonNode.cpp
New terrain support - part 1 (#755)
2022-09-11 11:31:26 +03:00
JsonNode.h
New terrain support - part 1 (#755)
2022-09-11 11:31:26 +03:00
LoadProgress.cpp
Progress bar for random map loading
2022-08-31 01:24:12 +04:00
LoadProgress.h
Progress bar for random map loading
2022-08-31 01:24:12 +04:00
LogicalExpression.cpp
…
LogicalExpression.h
…
NetPacks.h
…
NetPacksBase.h
…
NetPacksLib.cpp
New terrain support - part 1 (#755)
2022-09-11 11:31:26 +03:00
NetPacksLobby.h
…
PathfinderUtil.h
New terrain support - part 1 (#755)
2022-09-11 11:31:26 +03:00
ResourceSet.cpp
…
ResourceSet.h
…
ScopeGuard.h
…
ScriptHandler.cpp
…
ScriptHandler.h
…
StartInfo.cpp
Fix start game button for rmg without templates (#781)
2022-08-30 08:30:21 +03:00
StartInfo.h
New terrain support - part 1 (#755)
2022-09-11 11:31:26 +03:00
StdInc.cpp
…
StdInc.h
…
StringConstants.h
New terrain support - part 1 (#755)
2022-09-11 11:31:26 +03:00
Terrain.cpp
Fix terrain performance
2022-09-11 11:31:27 +03:00
Terrain.h
Fix terrain performance
2022-09-11 11:31:27 +03:00
UnlockGuard.h
…
vcmi_endian.h
…
VCMI_lib.cbp
…
VCMI_Lib.cpp
battlefields in VLC and custom bonuses for terrain patches
2022-09-11 11:31:27 +03:00
VCMI_Lib.h
battlefields in VLC and custom bonuses for terrain patches
2022-09-11 11:31:27 +03:00
VCMI_lib.vcxproj
…
VCMI_lib.vcxproj.filters
…
VCMIDirs.cpp
…
VCMIDirs.h
…