Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop/premake' into develop/core-3
# Conflicts: # applications/sandbox/assets/textures/warlock/retopo_and_uv_warlock_5_Warlock_AO.tif # applications/sandbox/engine/resources/rythe/icon # applications/sandbox/engine/tools/lgnspre/VCRUNTIME140.dll # applications/sandbox/engine/tools/lgnspre/_asyncio.pyd # applications/sandbox/engine/tools/lgnspre/_bz2.pyd # applications/sandbox/engine/tools/lgnspre/_ctypes.pyd # applications/sandbox/engine/tools/lgnspre/_decimal.pyd # applications/sandbox/engine/tools/lgnspre/_elementtree.pyd # applications/sandbox/engine/tools/lgnspre/_hashlib.pyd # applications/sandbox/engine/tools/lgnspre/_lzma.pyd # applications/sandbox/engine/tools/lgnspre/_multiprocessing.pyd # applications/sandbox/engine/tools/lgnspre/_overlapped.pyd # applications/sandbox/engine/tools/lgnspre/_queue.pyd # applications/sandbox/engine/tools/lgnspre/_socket.pyd # applications/sandbox/engine/tools/lgnspre/_ssl.pyd # applications/sandbox/engine/tools/lgnspre/_testcapi.pyd # applications/sandbox/engine/tools/lgnspre/_tkinter.pyd # applications/sandbox/engine/tools/lgnspre/api-ms-win-core-console-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-core-datetime-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-core-debug-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-core-errorhandling-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-core-file-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-core-file-l1-2-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-core-file-l2-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-core-handle-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-core-heap-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-core-interlocked-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-core-libraryloader-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-core-localization-l1-2-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-core-memory-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-core-namedpipe-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-core-processenvironment-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-core-processthreads-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-core-processthreads-l1-1-1.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-core-profile-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-core-rtlsupport-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-core-string-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-core-synch-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-core-synch-l1-2-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-core-sysinfo-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-core-timezone-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-core-util-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-conio-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-convert-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-environment-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-filesystem-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-heap-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-locale-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-math-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-process-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-runtime-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-stdio-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-string-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-time-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-utility-l1-1-0.dll # applications/sandbox/engine/tools/lgnspre/base_library.zip # applications/sandbox/engine/tools/lgnspre/libcrypto-1_1-x64.dll # applications/sandbox/engine/tools/lgnspre/libffi-7.dll # applications/sandbox/engine/tools/lgnspre/libssl-1_1-x64.dll # applications/sandbox/engine/tools/lgnspre/pyexpat.pyd # applications/sandbox/engine/tools/lgnspre/python38.dll # applications/sandbox/engine/tools/lgnspre/pywintypes38.dll # applications/sandbox/engine/tools/lgnspre/select.pyd # applications/sandbox/engine/tools/lgnspre/tcl86t.dll # applications/sandbox/engine/tools/lgnspre/tk86t.dll # applications/sandbox/engine/tools/lgnspre/ucrtbase.dll # applications/sandbox/engine/tools/lgnspre/unicodedata.pyd # applications/sandbox/engine/tools/lgnspre/win32api.pyd # applications/sandbox/engine/tools/lgnspre/win32evtlog.pyd
- Loading branch information