You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
ryzom-core/code/ryzom
kaetemi ed06500c86 Merge branch 'develop' into feature/build-pipeline-v3
# Conflicts:
#	code/nel/src/misc/displayer.cpp
#	code/nel/tools/3d/plugin_max/nel_export/nel_export_export.cpp
#	code/nel/tools/3d/plugin_max/nel_export/nel_export_script.cpp
#	code/nel/tools/3d/tga_2_dds/tga2dds.cpp
#	code/nel/tools/CMakeLists.txt
#	code/nel/tools/misc/bnp_make/main.cpp
6 years ago
..
client Fixed: Wrong operator (should be = instead of ==) 6 years ago
common Merge branch 'develop' into feature/build-pipeline-v3 6 years ago
server File ai_instance.cpp uses inline processStateEvent from state_instance.h which uses inline testCompatibility from event_reaction_include.h 6 years ago
tools Changed: Use PCH in World Editor Primitive Plugin 6 years ago
CMakeLists.txt Changed: Allow to compile Ryzom tools even without MySQL (mysql client library has compilation problems with VC++ 2015) 8 years ago
COPYING initial version 15 years ago