Tomasz Zieliński e105b23a37 Merge remote-tracking branch 'origin/develop' into fix_rmg_teams ... # Conflicts: # Mods/vcmi/config/vcmi/rmg/heroes3/newcomers.JSON # Mods/vcmi/config/vcmi/rmg/heroes3/southOfHell.JSON # Mods/vcmi/config/vcmi/rmg/symmetric/2sm0k.JSON # Mods/vcmi/config/vcmi/rmg/symmetric/2sm2i(2).JSON # Mods/vcmi/config/vcmi/rmg/symmetric/3sb0b.JSON # Mods/vcmi/config/vcmi/rmg/symmetric/3sb0c.JSON # Mods/vcmi/config/vcmi/rmg/symmetric/5sb0a.JSON # Mods/vcmi/config/vcmi/rmg/symmetric/5sb0b.JSON # Mods/vcmi/config/vcmi/rmg/symmetric/7sb0b.JSON # Mods/vcmi/config/vcmi/rmg/symmetric/7sb0c.JSON # client/lobby/RandomMapTab.cpp		2023-10-30 20:08:13 +01:00
..
battle	Fix Lua and test building	2023-10-23 16:05:38 +03:00
entity	Renamed new types for consistency with code style	2023-10-22 16:55:19 +03:00
erm	vcmi: split bonus to enumerator and HeroBonus.h	2023-05-03 18:01:06 +03:00
events	Fix Lua and test building	2023-10-23 16:05:38 +03:00
game	move SetStackEffect to a separate file	2023-10-24 01:27:52 +03:00
googletest@b796f7d446	vcmi: use std::optional	2023-04-17 00:43:13 +03:00
map	Fixed most of reported issues, removed unused code.	2023-10-29 21:25:39 +01:00
mock	Fix Lua and test building	2023-10-23 16:05:38 +03:00
netpacks	Fix Lua and test building	2023-10-23 16:05:38 +03:00
rmg
scripting	Fix Lua and test building	2023-10-23 16:05:38 +03:00
serializer	vcmi: use std::optional	2023-04-17 00:43:13 +03:00
spells	move SetStackEffect to a separate file	2023-10-24 01:27:52 +03:00
testdata	Fix JSON files	2023-09-17 12:36:57 +00:00
vcai	Replaced boost::thread_specific_ptr with thread_local	2023-08-23 16:32:29 +03:00
CMakeLists.txt	Replaced boost::thread_specific_ptr with thread_local	2023-08-23 16:32:29 +03:00
CMemoryBufferTest.cpp
CVcmiTestConfig.cpp	tests: disable settings.init()	2023-04-27 20:59:55 +03:00
CVcmiTestConfig.h
JsonComparer.cpp	Use API identical to std classes where possible	2023-08-23 16:32:29 +03:00
JsonComparer.h
main.cpp
StdInc.cpp	convert line endings from CRLF (Windows) to LF (Linux/Unix)	2023-10-19 16:23:21 +02:00
StdInc.h	convert line endings from CRLF (Windows) to LF (Linux/Unix)	2023-10-19 16:23:21 +02:00
Test.cbp
Test.vcxproj
Test.vcxproj.filters