nordsoft ece8a2a41f Merge branch 'battle-dialog' into battle-dialog2 ... # Conflicts: # AI/BattleAI/BattleAI.h # AI/StupidAI/StupidAI.h # client/CPlayerInterface.cpp # client/CPlayerInterface.h # client/Client.cpp # client/NetPacksClient.cpp # client/battle/CBattleInterface.cpp # client/battle/CBattleInterface.h # client/battle/CBattleInterfaceClasses.cpp # client/battle/CBattleInterfaceClasses.h # config/schemas/settings.json # lib/CGameInterface.h # lib/IGameEventsReceiver.h # lib/NetPacks.h # lib/NetPacksLib.cpp # lib/battle/BattleInfo.cpp # server/CGameHandler.cpp # server/CQuery.h		2023-04-06 19:53:52 +04:00
..
ai	NKAI: more fixes to defense and pandora	2023-04-02 10:02:33 +03:00
creatures	vcmi: convert fireWall and landMine	2023-03-31 01:01:25 +03:00
factions	Fixed moat identifiers requests - will now always request spells	2023-04-03 15:15:12 +03:00
heroes	Merge beta into develop	2023-04-04 16:06:20 +03:00
objects	Fix Whirlpool sounds	2023-03-28 19:05:38 +03:00
schemas	Merge branch 'battle-dialog' into battle-dialog2	2023-04-06 19:53:52 +04:00
spells	vcmi: add getTrigger method to obstacles	2023-03-31 01:01:26 +03:00
widgets	Allow defining active areas for sliders. Fixes settings window.	2023-04-02 22:24:07 +03:00
ambientSounds.json	Restored ambient sounds functionality	2023-03-05 18:02:59 +02:00
artifacts.json	vcmi: fix hourglass of the evil hour	2023-03-16 16:46:42 +03:00
battleEffects.json	Fix teleport animation speed	2023-03-25 23:54:51 +02:00
battlefields.json	Fix missing obstacles on subterranean terrain	2023-01-20 15:16:42 +02:00
battles_graphics.json	battlefields in VLC and custom bonuses for terrain patches	2022-09-11 11:31:27 +03:00
battleStartpos.json
bonuses.json	Merge pull request #1818 from rilian-la-te/beta-fixes	2023-04-01 23:09:38 +03:00
buildings5.json
campaign_regions.json
campaignMedia.json	A bit more text-related work:	2013-08-29 16:41:14 +00:00
campaignSets.json	- move campaigns description into new config file, campaignSets.json	2014-02-14 22:46:06 +00:00
commanders.json	fix commander jousting	2023-03-17 21:03:47 +03:00
ERMU_to_picture.json
filesystem.json	Support Polish version of H3 data files	2022-12-29 21:50:04 +02:00
fonts.json
gameConfig.json	gameConfig.json: add missing comma	2023-04-02 23:53:47 +03:00
heroClasses.json	Fix affinities of Dungeon heroes	2023-03-28 18:58:30 +03:00
mainmenu.json	Main menu buttons are now defined using position of their center	2022-12-29 21:50:04 +02:00
mapOverrides.json	- found yet another missing victory condition, fixes 1684	2014-02-02 11:05:05 +00:00
NEUTRAL.PAL
obstacles.json	#1071 - In latest night builds there are problems with schema obstacle.json and file obstacles.json	2022-11-04 00:06:15 +02:00
randomMap.json	Terrain/Road/River handler are now in compileable state	2023-01-10 00:01:35 +02:00
resolutions.json	Fix 2292. Fix chat on adventure map, increase maxOutputPerLine	2015-11-08 22:16:58 +03:00
resources.json
rivers.json	Added translatable strings for roads & rivers, for use in editor	2023-01-10 00:01:35 +02:00
roads.json	Added translatable strings for roads & rivers, for use in editor	2023-01-10 00:01:35 +02:00
skills.json	Removed hardcoded texts	2023-03-31 23:18:45 +03:00
startres.json
terrains.json	Refactoring of new code, multiple functionality changes:	2023-03-05 18:02:58 +02:00
terrainViewPatterns.json	Fix mantis #1859, unknown pattern in underground	2015-03-28 16:41:26 +01:00