1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-30 08:57:00 +02:00
vcmi/test
Andrii Danylchenko 9c8d776398 Merge branch 'develop' into handlersAbstraction
# Conflicts:
#	CI/linux/before_install.sh
#	CI/mac/before_install.sh
#	CI/mxe/before_install.sh
#	lib/CModHandler.cpp
#	lib/mapObjects/CObjectClassesHandler.cpp
#	lib/mapObjects/CObjectClassesHandler.h
#	lib/mapObjects/CommonConstructors.cpp
#	server/CGameHandler.cpp
#	test/CMakeLists.txt
#	test/spells/effects/TeleportTest.cpp
2021-07-16 00:32:13 +03:00
..
battle Entities redesign and a few ERM features 2021-02-14 19:05:43 +03:00
entity Entities redesign and a few ERM features 2021-02-14 19:05:43 +03:00
erm Merge pull request #690 from nullkiller/erm-fix-vr 2021-04-29 16:05:20 +03:00
events Entities redesign and a few ERM features 2021-02-14 19:05:43 +03:00
game Fixes for code review issues 2021-02-20 04:57:50 +03:00
googletest@4bab34d208
map Merge branch 'develop' into handlersAbstraction 2021-07-16 00:32:13 +03:00
mock Fixes for code review issues 2021-02-20 04:57:50 +03:00
netpacks Entities redesign and a few ERM features 2021-02-14 19:05:43 +03:00
rmg Redone RMG template serialization using JSON serializer, added tests 2018-03-10 19:36:19 +03:00
scripting Entities redesign and a few ERM features 2021-02-14 19:05:43 +03:00
serializer Entities redesign and a few ERM features 2021-02-14 19:05:43 +03:00
spells Merge branch 'develop' into handlersAbstraction 2021-07-16 00:32:13 +03:00
testdata Entities redesign and a few ERM features 2021-02-14 19:05:43 +03:00
vcai Entities redesign and a few ERM features 2021-02-14 19:05:43 +03:00
CMakeLists.txt Merge branch 'develop' into handlersAbstraction 2021-07-16 00:32:13 +03:00
CMemoryBufferTest.cpp
CVcmiTestConfig.cpp Entities redesign and a few ERM features 2021-02-14 19:05:43 +03:00
CVcmiTestConfig.h CMake: unittest improvements (#447) 2018-04-15 18:02:31 +07:00
JsonComparer.cpp Entities redesign and a few ERM features 2021-02-14 19:05:43 +03:00
JsonComparer.h [tests] Moved JsonComparer to own file 2018-03-05 21:26:00 +03:00
main.cpp CMake: unittest improvements (#447) 2018-04-15 18:02:31 +07:00
StdInc.cpp
StdInc.h [C::B] test project update 2017-07-20 15:46:40 +03:00
Test.cbp Fixed build 2021-04-10 02:04:07 +03:00
Test.vcxproj Update VS files to 2019, partially fix test project 2019-06-09 17:28:55 +02:00
Test.vcxproj.filters Update VS files to 2019, partially fix test project 2019-06-09 17:28:55 +02:00