nordsoft 149790ad2d Merge remote-tracking branch 'upstream/features/new-terrains' into cpp-map-editor ...

# Conflicts:
#	config/randomMap.json
#	config/terrains.json
#	lib/rmg/CMapGenerator.cpp
#	lib/rmg/CMapGenerator.h
#	lib/rmg/ObjectManager.cpp
#	lib/rmg/ObjectManager.h
#	lib/rmg/ObstaclePlacer.cpp
#	lib/rmg/ObstaclePlacer.h
#	lib/rmg/RmgArea.h
#	lib/rmg/RmgMap.cpp
#	lib/rmg/RmgMap.h
#	lib/rmg/RoadPlacer.cpp
#	lib/rmg/RoadPlacer.h
#	lib/rmg/Zone.cpp
#	lib/rmg/Zone.h

2022-09-04 15:54:37 +04:00

..

abilities

Entities redesign and a few ERM features

2021-02-14 19:05:43 +03:00

battle

Revert "First compilable commit for obstacles"

2022-09-04 15:48:04 +04:00

events

Warning fix (I moved C++17 and CI to another branch) (#739)

2022-05-19 15:14:50 +03:00

filesystem

use Conan to make macOS CI builds for both Intel and ARM (#782)

2022-08-30 17:29:00 +03:00

logging

…

mapObjects

Fix getting battlefield crash

2022-08-29 08:53:35 +03:00

mapping

Show objects preview

2022-09-03 01:04:28 +04:00

minizip

…

registerTypes

Fix RMG bug with incorrect town placement (#779)

2022-08-29 08:53:36 +03:00

rmg

Merge remote-tracking branch 'upstream/features/new-terrains' into cpp-map-editor

2022-09-04 15:54:37 +04:00

serializer

Revert "Minor fixes"

2022-09-04 15:47:47 +04:00

spells

Merge branch 'mod-from-github' into cpp-map-editor

2022-09-04 04:13:52 +04:00

vstd

Entities redesign and a few ERM features

2021-02-14 19:05:43 +03:00

AI_Base.h

…

BattleFieldHandler.cpp

Revert "First compilable commit for obstacles"

2022-09-04 15:48:04 +04:00

BattleFieldHandler.h

Revert "Obstacles works fine without regression"

2022-09-04 15:47:53 +04:00

CAndroidVMHelper.cpp

…

CAndroidVMHelper.h

…

CArtHandler.cpp

tweaks

2021-02-15 15:03:32 +03:00

CArtHandler.h

New terrain support - part 1 (#755)

2022-08-29 08:53:35 +03:00

CBonusTypeHandler.cpp

…

CBonusTypeHandler.h

…

CBuildingHandler.cpp

…

CBuildingHandler.h

…

CConfigHandler.cpp

…

CConfigHandler.h

…

CConsoleHandler.cpp

full crash dump

2022-05-14 13:23:09 +03:00

CConsoleHandler.h

…

CCreatureHandler.cpp

New terrain support - part 1 (#755)

2022-08-29 08:53:35 +03:00

CCreatureHandler.h

Random map generator refactoring (#762)

2022-08-29 08:53:36 +03:00

CCreatureSet.cpp

Feature: Army Management Shortcuts should work as in HD+ Mod

2021-11-28 20:00:43 +02:00

CCreatureSet.h

Feature: Army Management Shortcuts should work as in HD+ Mod

2021-11-28 20:00:43 +02:00

CGameInfoCallback.cpp

New terrain support - part 1 (#755)

2022-08-29 08:53:35 +03:00

CGameInfoCallback.h

Nullkiller: update / fix build, core changes required for Nullkiller AI

2021-07-26 21:02:50 +03:00

CGameInterface.cpp

Entities redesign and a few ERM features

2021-02-14 19:05:43 +03:00

CGameInterface.h

Entities redesign and a few ERM features

2021-02-14 19:05:43 +03:00

CGameState.cpp

battlefields in VLC and custom bonuses for terrain patches

2022-08-29 08:53:35 +03:00

CGameState.h

New battlegrounds (#758)

2022-08-29 08:53:35 +03:00

CGameStateFwd.h

Warning fix (I moved C++17 and CI to another branch) (#739)

2022-05-19 15:14:50 +03:00

CGeneralTextHandler.cpp

New terrain support - part 1 (#755)

2022-08-29 08:53:35 +03:00

CGeneralTextHandler.h

New terrain support - part 1 (#755)

2022-08-29 08:53:35 +03:00

CHeroHandler.cpp

Revert "First compilable commit for obstacles"

2022-09-04 15:48:04 +04:00

CHeroHandler.h

Revert "First compilable commit for obstacles"

2022-09-04 15:48:04 +04:00

CMakeLists.txt

Revert "update cmakelists"

2022-09-04 15:47:36 +04:00

CModHandler.cpp

Revert "Game runs without crash"

2022-09-04 15:47:58 +04:00

CModHandler.h

New terrain support - part 1 (#755)

2022-08-29 08:53:35 +03:00

CondSh.h

…

ConstTransitivePtr.h

…

CPathfinder.cpp

New terrain support - part 1 (#755)

2022-08-29 08:53:35 +03:00

CPathfinder.h

New terrain support - part 1 (#755)

2022-08-29 08:53:35 +03:00

CPlayerState.cpp

Entities redesign and a few ERM features

2021-02-14 19:05:43 +03:00

CPlayerState.h

New terrain support - part 1 (#755)

2022-08-29 08:53:35 +03:00

CRandomGenerator.cpp

…

CRandomGenerator.h

…

CScriptingModule.cpp

Entities redesign and a few ERM features

2021-02-14 19:05:43 +03:00

CScriptingModule.h

Entities redesign and a few ERM features

2021-02-14 19:05:43 +03:00

CSkillHandler.cpp

Entities redesign and a few ERM features

2021-02-14 19:05:43 +03:00

CSkillHandler.h

New terrain support - part 1 (#755)

2022-08-29 08:53:35 +03:00

CSoundBase.h

…

CStack.cpp

New terrain support - part 1 (#755)

2022-08-29 08:53:35 +03:00

CStack.h

New terrain support - part 1 (#755)

2022-08-29 08:53:35 +03:00

CStopWatch.h

…

CThreadHelper.cpp

…

CThreadHelper.h

Entities redesign and a few ERM features

2021-02-14 19:05:43 +03:00

CTownHandler.cpp

New terrain support - part 1 (#755)

2022-08-29 08:53:35 +03:00

CTownHandler.h

New terrain support - part 1 (#755)

2022-08-29 08:53:35 +03:00

FunctionList.h

…

GameConstants.cpp

Revert "First compilable commit for obstacles"

2022-09-04 15:48:04 +04:00

GameConstants.h

Revert "First compilable commit for obstacles"

2022-09-04 15:48:04 +04:00

HeroBonus.cpp

Merge branch 'mod-from-github' into cpp-map-editor

2022-09-04 04:13:52 +04:00

HeroBonus.h

New terrain support - part 1 (#755)

2022-08-29 08:53:35 +03:00

IBonusTypeHandler.h

…

IGameCallback.cpp

Revert "First compilable commit for obstacles"

2022-09-04 15:48:04 +04:00

IGameCallback.h

Fixed: duplicated bonusing building. Improved: opposite bonus propagation

2021-09-12 14:30:54 +03:00

IGameEventsReceiver.h

Fix: Get rid of 'Tile is not visible' error message

2022-01-30 12:31:07 +02:00

IHandlerBase.cpp

…

IHandlerBase.h

Entities redesign and a few ERM features

2021-02-14 19:05:43 +03:00

int3.h

Nullkiller: rename VCAI to AIGateway

2021-07-26 21:02:50 +03:00

Interprocess.h

…

JsonDetail.cpp

Fix: Crash on startup when mod dependency is not found

2022-03-21 09:43:06 +02:00

JsonDetail.h

New terrain support - part 1 (#755)

2022-08-29 08:53:35 +03:00

JsonNode.cpp

New terrain support - part 1 (#755)

2022-08-29 08:53:35 +03:00

JsonNode.h

New terrain support - part 1 (#755)

2022-08-29 08:53:35 +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

Feature: Army Management Shortcuts should work as in HD+ Mod

2021-11-28 20:00:43 +02:00

NetPacksBase.h

Entities redesign and a few ERM features

2021-02-14 19:05:43 +03:00

NetPacksLib.cpp

New terrain support - part 1 (#755)

2022-08-29 08:53:35 +03:00

NetPacksLobby.h

…

PathfinderUtil.h

New terrain support - part 1 (#755)

2022-08-29 08:53:35 +03:00

ResourceSet.cpp

…

ResourceSet.h

…

ScopeGuard.h

…

ScriptHandler.cpp

Android: allow run without scripting

2021-10-15 09:51:32 +03:00

ScriptHandler.h

Entities redesign and a few ERM features

2021-02-14 19:05:43 +03:00

StartInfo.cpp

Fix start game button for rmg without templates (#781)

2022-08-30 08:30:21 +03:00

StartInfo.h

Merge branch 'mod-from-github' into cpp-map-editor

2022-09-04 04:13:52 +04:00

StdInc.cpp

…

StdInc.h

…

StringConstants.h

New terrain support - part 1 (#755)

2022-08-29 08:53:35 +03:00

Terrain.cpp

Random map generator refactoring (#762)

2022-08-29 08:53:36 +03:00

Terrain.h

Random map generator refactoring (#762)

2022-08-29 08:53:36 +03:00

UnlockGuard.h

…

vcmi_endian.h

…

VCMI_lib.cbp

!?OB WIP

2021-02-16 13:32:18 +03:00

VCMI_Lib.cpp

Revert "First compilable commit for obstacles"

2022-09-04 15:48:04 +04:00

VCMI_Lib.h

Revert "First compilable commit for obstacles"

2022-09-04 15:48:04 +04:00

VCMI_lib.vcxproj

…

VCMI_lib.vcxproj.filters

…

VCMIDirs.cpp

fix boost.locale crash on macOS-arm64

2021-03-05 21:00:33 +00:00

VCMIDirs.h

…