Skip to content

Commit

Permalink
Merge pull request #30 from Deamon87/development
Browse files Browse the repository at this point in the history
Update casclib for 10.2
  • Loading branch information
Deamon87 authored Sep 8, 2023
2 parents 1ef6762 + f6512d8 commit 029e7fd
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion 3rdparty/DBImporter
2 changes: 1 addition & 1 deletion 3rdparty/casclib
Submodule casclib updated 86 files
+26 −0 .vscode/c_cpp_properties.json
+34 −0 .vscode/launch.json
+8 −0 .vscode/settings.json
+28 −0 .vscode/tasks.json
+9 −5 CMakeLists.txt
+3 −3 CascLib.sln
+10 −51 CascLib.vcxproj
+29 −5 CascLib.vcxproj.filters
+10 −15 CascLib_dll.vcxproj
+29 −5 CascLib_dll.vcxproj.filters
+17 −7 CascLib_test.vcxproj
+41 −8 CascLib_test.vcxproj.filters
+35 −71 CascLib_vs08.vcproj
+35 −23 CascLib_vs08_dll.vcproj
+39 −11 CascLib_vs08_test.vcproj
+0 −0 Config.cmake.in
+0 −34 PostBuild.bat
+ listfile/listfile-archive.zip
+89,609 −0 listfile/listfile.txt
+0 −1,140,133 listfile/listfile8x.csv
+257 −0 listfile/update-listfiles.py
+0 −14 listfile/update.bat
+57 −23 make-msvc.bat
+5 −1 sources-cpp.cpp
+74 −66 src/CascCommon.h
+1 −1 src/CascDecompress.cpp
+5 −5 src/CascDecrypt.cpp
+17 −7 src/CascDumpData.cpp
+659 −510 src/CascFiles.cpp
+1 −1 src/CascFindFile.cpp
+93 −152 src/CascIndexFiles.cpp
+35 −10 src/CascLib.h
+17 −2 src/CascOpenFile.cpp
+141 −182 src/CascOpenStorage.cpp
+33 −29 src/CascPort.h
+85 −52 src/CascReadFile.cpp
+68 −87 src/CascRootFile_Diablo3.cpp
+9 −9 src/CascRootFile_Install.cpp
+115 −114 src/CascRootFile_MNDX.cpp
+212 −401 src/CascRootFile_OW.cpp
+51 −36 src/CascRootFile_TVFS.cpp
+6 −6 src/CascRootFile_Text.cpp
+175 −73 src/CascRootFile_WoW.cpp
+1 −0 src/DllMain.def
+4 −4 src/DllMain.rc
+29 −8 src/common/Array.h
+286 −0 src/common/ArraySparse.h
+49 −110 src/common/Common.cpp
+118 −52 src/common/Common.h
+14 −23 src/common/Csv.cpp
+1 −1 src/common/Csv.h
+45 −17 src/common/Directory.cpp
+13 −5 src/common/Directory.h
+17 −15 src/common/FileStream.cpp
+98 −104 src/common/FileTree.cpp
+11 −3 src/common/FileTree.h
+7 −5 src/common/ListFile.cpp
+11 −10 src/common/Map.h
+231 −235 src/common/Mime.cpp
+34 −24 src/common/Mime.h
+82 −13 src/common/Path.h
+4 −4 src/common/RootHandler.cpp
+1 −1 src/common/RootHandler.h
+66 −37 src/common/Sockets.cpp
+5 −9 src/common/Sockets.h
+0 −0 src/hashes/md5.cpp
+0 −0 src/hashes/md5.h
+214 −0 src/hashes/sha1.cpp
+34 −0 src/hashes/sha1.h
+6 −0 src/jenkins/lookup3.c
+2,112 −0 src/overwatch/aes.cpp
+53 −0 src/overwatch/aes.h
+42 −0 src/overwatch/aes_local.h
+154 −0 src/overwatch/apm.cpp
+13,907 −0 src/overwatch/cmf-key.cpp
+482 −0 src/overwatch/cmf-update.py
+221 −0 src/overwatch/cmf.cpp
+279 −0 src/overwatch/overwatch.h
+255 −241 test/CascTest.cpp
+358 −180 test/TLogHelper.cpp
+465 −190 test/casclib-test-001.txt
+0 −271 test/casclib-test-002.txt
+0 −278 test/casclib-test-003.txt
+0 −330 test/casclib-test-004.txt
+0 −336 test/casclib-test-005.txt
+0 −345 test/casclib-test-006.txt
3 changes: 0 additions & 3 deletions wowViewerLib/shaders/glsl/vulkan/m2ParticleShader.frag
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ void main() {

float uAlphaTest = uAlphaTestv.x;

if(tex.a < uAlphaTest)
discard;

vec4 finalColor = vec4((tex * vColor ).rgb, tex.a*vColor.a );
int uNonOptPixelShader = uPixelShaderBlendModev.x;
if (uNonOptPixelShader == 0) { //particle_mod
Expand Down

0 comments on commit 029e7fd

Please sign in to comment.