Merge branch 'dev' of https://dev.ds-servers.com/sip/engine into dev

28fea178 · D-AIRY · 47de6884 · d0a14e8a · 28fea178 · 47de6884
Commit 28fea178 authored Dec 16, 2018 by D-AIRY
171 changed files
--- a/.gitignore
+++ b/.gitignore
@@ -209,6 +209,7 @@ build/gamesource/*
 docs/html/*
 !docs/html/material_editor/
 !docs/html/particles_editor/
+!build/maxplugin/

 /source/game/ents_doc.h


--- a/build/gamesource/models/zombie/zombie.dse
+++ b/build/gamesource/models/zombie/zombie.dse
--- a/build/maxplugin/DS3DSMAXexporter2010X32V706.dle
+++ b/build/maxplugin/DS3DSMAXexporter2010X32V706.dle
--- a/build/maxplugin/DS3DSMAXexporter2010X64V706.dle
+++ b/build/maxplugin/DS3DSMAXexporter2010X64V706.dle
--- a/build/maxplugin/DS3DSMAXexporter2016X64V706.dle
+++ b/build/maxplugin/DS3DSMAXexporter2016X64V706.dle
--- a/build/maxplugin/DS3DSMAXexporter2017X64V706.dle
+++ b/build/maxplugin/DS3DSMAXexporter2017X64V706.dle
--- a/build/maxplugin/DS3DSMAXexporter2018X64V706.dle
+++ b/build/maxplugin/DS3DSMAXexporter2018X64V706.dle
--- a/docs/html/material_editor/image1.png
+++ b/docs/html/material_editor/image1.png
--- a/docs/html/material_editor/image10.png
+++ b/docs/html/material_editor/image10.png
--- a/docs/html/material_editor/image11.png
+++ b/docs/html/material_editor/image11.png
--- a/docs/html/material_editor/image12.png
+++ b/docs/html/material_editor/image12.png
--- a/docs/html/material_editor/image13.png
+++ b/docs/html/material_editor/image13.png
--- a/docs/html/material_editor/image14.png
+++ b/docs/html/material_editor/image14.png
--- a/docs/html/material_editor/image15.png
+++ b/docs/html/material_editor/image15.png
--- a/docs/html/material_editor/image16.png
+++ b/docs/html/material_editor/image16.png
--- a/docs/html/material_editor/image17.png
+++ b/docs/html/material_editor/image17.png
--- a/docs/html/material_editor/image18.png
+++ b/docs/html/material_editor/image18.png
--- a/docs/html/material_editor/image19.png
+++ b/docs/html/material_editor/image19.png
--- a/docs/html/material_editor/image2.png
+++ b/docs/html/material_editor/image2.png
--- a/docs/html/material_editor/image20.png
+++ b/docs/html/material_editor/image20.png
--- a/docs/html/material_editor/image21.png
+++ b/docs/html/material_editor/image21.png
--- a/docs/html/material_editor/image22.png
+++ b/docs/html/material_editor/image22.png
--- a/docs/html/material_editor/image23.png
+++ b/docs/html/material_editor/image23.png
--- a/docs/html/material_editor/image24.png
+++ b/docs/html/material_editor/image24.png
--- a/docs/html/material_editor/image25.png
+++ b/docs/html/material_editor/image25.png
--- a/docs/html/material_editor/image26.png
+++ b/docs/html/material_editor/image26.png
--- a/docs/html/material_editor/image27.png
+++ b/docs/html/material_editor/image27.png
--- a/docs/html/material_editor/image28.png
+++ b/docs/html/material_editor/image28.png
--- a/docs/html/material_editor/image29.png
+++ b/docs/html/material_editor/image29.png
--- a/docs/html/material_editor/image3.png
+++ b/docs/html/material_editor/image3.png
--- a/docs/html/material_editor/image30.png
+++ b/docs/html/material_editor/image30.png
--- a/docs/html/material_editor/image31.png
+++ b/docs/html/material_editor/image31.png
--- a/docs/html/material_editor/image32.png
+++ b/docs/html/material_editor/image32.png
--- a/docs/html/material_editor/image33.png
+++ b/docs/html/material_editor/image33.png
--- a/docs/html/material_editor/image34.png
+++ b/docs/html/material_editor/image34.png
--- a/docs/html/material_editor/image35.png
+++ b/docs/html/material_editor/image35.png
--- a/docs/html/material_editor/image36.png
+++ b/docs/html/material_editor/image36.png
--- a/docs/html/material_editor/image37.png
+++ b/docs/html/material_editor/image37.png
--- a/docs/html/material_editor/image38.png
+++ b/docs/html/material_editor/image38.png
--- a/docs/html/material_editor/image39.png
+++ b/docs/html/material_editor/image39.png
--- a/docs/html/material_editor/image4.png
+++ b/docs/html/material_editor/image4.png
--- a/docs/html/material_editor/image40.png
+++ b/docs/html/material_editor/image40.png
--- a/docs/html/material_editor/image41.png
+++ b/docs/html/material_editor/image41.png
--- a/docs/html/material_editor/image42.png
+++ b/docs/html/material_editor/image42.png
--- a/docs/html/material_editor/image43.png
+++ b/docs/html/material_editor/image43.png
--- a/docs/html/material_editor/image44.png
+++ b/docs/html/material_editor/image44.png
--- a/docs/html/material_editor/image45.png
+++ b/docs/html/material_editor/image45.png
--- a/docs/html/material_editor/image46.png
+++ b/docs/html/material_editor/image46.png
--- a/docs/html/material_editor/image47.png
+++ b/docs/html/material_editor/image47.png
--- a/docs/html/material_editor/image48.png
+++ b/docs/html/material_editor/image48.png
--- a/docs/html/material_editor/image49.png
+++ b/docs/html/material_editor/image49.png
--- a/docs/html/material_editor/image5.png
+++ b/docs/html/material_editor/image5.png
--- a/docs/html/material_editor/image50.png
+++ b/docs/html/material_editor/image50.png
--- a/docs/html/material_editor/image51.png
+++ b/docs/html/material_editor/image51.png
--- a/docs/html/material_editor/image52.png
+++ b/docs/html/material_editor/image52.png
--- a/docs/html/material_editor/image53.png
+++ b/docs/html/material_editor/image53.png
--- a/docs/html/material_editor/image54.png
+++ b/docs/html/material_editor/image54.png
--- a/docs/html/material_editor/image55.png
+++ b/docs/html/material_editor/image55.png
--- a/docs/html/material_editor/image56.png
+++ b/docs/html/material_editor/image56.png
--- a/docs/html/material_editor/image57.png
+++ b/docs/html/material_editor/image57.png
--- a/docs/html/material_editor/image58.png
+++ b/docs/html/material_editor/image58.png
--- a/docs/html/material_editor/image6.png
+++ b/docs/html/material_editor/image6.png
--- a/docs/html/material_editor/image7.png
+++ b/docs/html/material_editor/image7.png
--- a/docs/html/material_editor/image8.png
+++ b/docs/html/material_editor/image8.png
--- a/docs/html/material_editor/image9.png
+++ b/docs/html/material_editor/image9.png
--- a/docs/html/particles_editor/collision_delete.png
+++ b/docs/html/particles_editor/collision_delete.png
--- a/docs/html/particles_editor/color_rgba.png
+++ b/docs/html/particles_editor/color_rgba.png
--- a/docs/html/particles_editor/image1.png
+++ b/docs/html/particles_editor/image1.png
--- a/docs/html/particles_editor/image10.png
+++ b/docs/html/particles_editor/image10.png
--- a/docs/html/particles_editor/image11.png
+++ b/docs/html/particles_editor/image11.png
--- a/docs/html/particles_editor/image12.png
+++ b/docs/html/particles_editor/image12.png
--- a/docs/html/particles_editor/image13.png
+++ b/docs/html/particles_editor/image13.png
--- a/docs/html/particles_editor/image14.png
+++ b/docs/html/particles_editor/image14.png
--- a/docs/html/particles_editor/image15.png
+++ b/docs/html/particles_editor/image15.png
--- a/docs/html/particles_editor/image16.png
+++ b/docs/html/particles_editor/image16.png
--- a/docs/html/particles_editor/image17.png
+++ b/docs/html/particles_editor/image17.png
--- a/docs/html/particles_editor/image18.png
+++ b/docs/html/particles_editor/image18.png
--- a/docs/html/particles_editor/image19.png
+++ b/docs/html/particles_editor/image19.png
--- a/docs/html/particles_editor/image2.png
+++ b/docs/html/particles_editor/image2.png
--- a/docs/html/particles_editor/image20.png
+++ b/docs/html/particles_editor/image20.png
--- a/docs/html/particles_editor/image21.png
+++ b/docs/html/particles_editor/image21.png
--- a/docs/html/particles_editor/image22.png
+++ b/docs/html/particles_editor/image22.png
--- a/docs/html/particles_editor/image23.png
+++ b/docs/html/particles_editor/image23.png
--- a/docs/html/particles_editor/image24.png
+++ b/docs/html/particles_editor/image24.png
--- a/docs/html/particles_editor/image25.png
+++ b/docs/html/particles_editor/image25.png
--- a/docs/html/particles_editor/image26.png
+++ b/docs/html/particles_editor/image26.png
--- a/docs/html/particles_editor/image27.png
+++ b/docs/html/particles_editor/image27.png
--- a/docs/html/particles_editor/image28.png
+++ b/docs/html/particles_editor/image28.png
--- a/docs/html/particles_editor/image29.png
+++ b/docs/html/particles_editor/image29.png
--- a/docs/html/particles_editor/image3.png
+++ b/docs/html/particles_editor/image3.png
--- a/docs/html/particles_editor/image30.png
+++ b/docs/html/particles_editor/image30.png
--- a/docs/html/particles_editor/image31.png
+++ b/docs/html/particles_editor/image31.png
--- a/docs/html/particles_editor/image32.png
+++ b/docs/html/particles_editor/image32.png
--- a/docs/html/particles_editor/image33.png
+++ b/docs/html/particles_editor/image33.png
--- a/docs/html/particles_editor/image34.png
+++ b/docs/html/particles_editor/image34.png
--- a/docs/html/particles_editor/image35.png
+++ b/docs/html/particles_editor/image35.png
--- a/docs/html/particles_editor/image36.png
+++ b/docs/html/particles_editor/image36.png
--- a/docs/html/particles_editor/image37.png
+++ b/docs/html/particles_editor/image37.png
--- a/docs/html/particles_editor/image38.png
+++ b/docs/html/particles_editor/image38.png
--- a/docs/html/particles_editor/image39.png
+++ b/docs/html/particles_editor/image39.png
--- a/docs/html/particles_editor/image4.png
+++ b/docs/html/particles_editor/image4.png
--- a/docs/html/particles_editor/image40.png
+++ b/docs/html/particles_editor/image40.png
--- a/docs/html/particles_editor/image41.png
+++ b/docs/html/particles_editor/image41.png
--- a/docs/html/particles_editor/image42.png
+++ b/docs/html/particles_editor/image42.png
--- a/docs/html/particles_editor/image43.png
+++ b/docs/html/particles_editor/image43.png
--- a/docs/html/particles_editor/image44.png
+++ b/docs/html/particles_editor/image44.png
--- a/docs/html/particles_editor/image45.png
+++ b/docs/html/particles_editor/image45.png
--- a/docs/html/particles_editor/image46.png
+++ b/docs/html/particles_editor/image46.png
--- a/docs/html/particles_editor/image47.png
+++ b/docs/html/particles_editor/image47.png
--- a/docs/html/particles_editor/image48.png
+++ b/docs/html/particles_editor/image48.png
--- a/docs/html/particles_editor/image49.png
+++ b/docs/html/particles_editor/image49.png
--- a/docs/html/particles_editor/image5.png
+++ b/docs/html/particles_editor/image5.png
--- a/docs/html/particles_editor/image51.png
+++ b/docs/html/particles_editor/image51.png
--- a/docs/html/particles_editor/image52.png
+++ b/docs/html/particles_editor/image52.png
--- a/docs/html/particles_editor/image53.png
+++ b/docs/html/particles_editor/image53.png
--- a/docs/html/particles_editor/image54.png
+++ b/docs/html/particles_editor/image54.png
--- a/docs/html/particles_editor/image55.png
+++ b/docs/html/particles_editor/image55.png
--- a/docs/html/particles_editor/image56.png
+++ b/docs/html/particles_editor/image56.png
--- a/docs/html/particles_editor/image57.png
+++ b/docs/html/particles_editor/image57.png
--- a/docs/html/particles_editor/image58.png
+++ b/docs/html/particles_editor/image58.png
--- a/docs/html/particles_editor/image59.png
+++ b/docs/html/particles_editor/image59.png
--- a/docs/html/particles_editor/image6.png
+++ b/docs/html/particles_editor/image6.png
--- a/docs/html/particles_editor/image60.png
+++ b/docs/html/particles_editor/image60.png
--- a/docs/html/particles_editor/image61.png
+++ b/docs/html/particles_editor/image61.png
--- a/docs/html/particles_editor/image62.png
+++ b/docs/html/particles_editor/image62.png
--- a/docs/html/particles_editor/image63.png
+++ b/docs/html/particles_editor/image63.png
--- a/docs/html/particles_editor/image64.png
+++ b/docs/html/particles_editor/image64.png
--- a/docs/html/particles_editor/image65.png
+++ b/docs/html/particles_editor/image65.png
--- a/docs/html/particles_editor/image66.png
+++ b/docs/html/particles_editor/image66.png
--- a/docs/html/particles_editor/image67.png
+++ b/docs/html/particles_editor/image67.png
--- a/docs/html/particles_editor/image68.png
+++ b/docs/html/particles_editor/image68.png
--- a/docs/html/particles_editor/image69.png
+++ b/docs/html/particles_editor/image69.png
--- a/docs/html/particles_editor/image7.png
+++ b/docs/html/particles_editor/image7.png
--- a/docs/html/particles_editor/image70.png
+++ b/docs/html/particles_editor/image70.png
--- a/docs/html/particles_editor/image71.png
+++ b/docs/html/particles_editor/image71.png
--- a/docs/html/particles_editor/image72.png
+++ b/docs/html/particles_editor/image72.png
--- a/docs/html/particles_editor/image73.png
+++ b/docs/html/particles_editor/image73.png
--- a/docs/html/particles_editor/image74.png
+++ b/docs/html/particles_editor/image74.png
--- a/docs/html/particles_editor/image75.png
+++ b/docs/html/particles_editor/image75.png
--- a/docs/html/particles_editor/image76.png
+++ b/docs/html/particles_editor/image76.png
--- a/docs/html/particles_editor/image77.png
+++ b/docs/html/particles_editor/image77.png
--- a/docs/html/particles_editor/image78.png
+++ b/docs/html/particles_editor/image78.png
--- a/docs/html/particles_editor/image79.png
+++ b/docs/html/particles_editor/image79.png
--- a/docs/html/particles_editor/image8.png
+++ b/docs/html/particles_editor/image8.png
--- a/docs/html/particles_editor/image80.png
+++ b/docs/html/particles_editor/image80.png
--- a/docs/html/particles_editor/image81.png
+++ b/docs/html/particles_editor/image81.png
--- a/docs/html/particles_editor/image82.png
+++ b/docs/html/particles_editor/image82.png
--- a/docs/html/particles_editor/image83.png
+++ b/docs/html/particles_editor/image83.png
--- a/docs/html/particles_editor/image84.png
+++ b/docs/html/particles_editor/image84.png
--- a/docs/html/particles_editor/image85.png
+++ b/docs/html/particles_editor/image85.png
--- a/docs/html/particles_editor/image86.png
+++ b/docs/html/particles_editor/image86.png
--- a/docs/html/particles_editor/image87.png
+++ b/docs/html/particles_editor/image87.png
--- a/docs/html/particles_editor/image88.png
+++ b/docs/html/particles_editor/image88.png
--- a/docs/html/particles_editor/image89.png
+++ b/docs/html/particles_editor/image89.png
--- a/docs/html/particles_editor/image9.png
+++ b/docs/html/particles_editor/image9.png
--- a/docs/html/particles_editor/image90.png
+++ b/docs/html/particles_editor/image90.png
--- a/docs/html/particles_editor/image91.png
+++ b/docs/html/particles_editor/image91.png
--- a/docs/html/particles_editor/image92.png
+++ b/docs/html/particles_editor/image92.png
--- a/docs/html/particles_editor/track.png
+++ b/docs/html/particles_editor/track.png
--- a/docs/settings_doxygen/Doxyfile
+++ b/docs/settings_doxygen/Doxyfile
--- a/docs/settings_doxygen/DoxygenLayout.xml
+++ b/docs/settings_doxygen/DoxygenLayout.xml
--- a/docs/settings_doxygen/doxygen/doxygen.exe
+++ b/docs/settings_doxygen/doxygen/doxygen.exe
--- a/docs/settings_doxygen/doxygen/doxyindexer.exe
+++ b/docs/settings_doxygen/doxygen/doxyindexer.exe
--- a/docs/settings_doxygen/doxygen/doxysearch.cgi.exe
+++ b/docs/settings_doxygen/doxygen/doxysearch.cgi.exe
--- a/docs/settings_doxygen/doxygen/gen.bat
+++ b/docs/settings_doxygen/doxygen/gen.bat
--- a/docs/settings_doxygen/doxygen/libclang.dll
+++ b/docs/settings_doxygen/doxygen/libclang.dll
--- a/docs/settings_doxygen/doxygen/skydoc_preprocessor.exe
+++ b/docs/settings_doxygen/doxygen/skydoc_preprocessor.exe
--- a/docs/settings_doxygen/logo.png
+++ b/docs/settings_doxygen/logo.png
--- a/source/SkyXEngine_Build/SkyXEngine_Build.cpp
+++ b/source/SkyXEngine_Build/SkyXEngine_Build.cpp
--- a/source/core/sxcore.cpp
+++ b/source/core/sxcore.cpp
--- a/source/core/sxcore.h
+++ b/source/core/sxcore.h