Merge branch 'release-2.1.4' into stable

pew-dahs · pew-dahs · commit abaa806ad82d · 2022-10-03T11:59:16.000-07:00
diff --git a/Assets/Plugins/Windows/x64/DynamicLibraryLoaderHelper.dll b/Assets/Plugins/Windows/x64/DynamicLibraryLoaderHelper.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f73a42c7ea18d3dd3059b7a620c0ad22cd07d0cccd804e3acaad192ff398880a
-size 249
+oid sha256:953a0d91eaebdb6e2c917bd13cd930158ae7f1b51363a8f8055e86286b0b749f
+size 10240
diff --git a/Assets/Plugins/Windows/x64/GfxPluginNativeRender-x64.dll b/Assets/Plugins/Windows/x64/GfxPluginNativeRender-x64.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:862e1dd5bea4c30ea4916b670e4b5b5897675803825b2b71697ceac6aa497c14
-size 249
+oid sha256:484af1bc88cabe4c30f180e6b6ff3be303532f58b2edd27acaa21eb9c3dec938
+size 78336
diff --git a/Assets/Plugins/Windows/x86/DynamicLibraryLoaderHelper.dll b/Assets/Plugins/Windows/x86/DynamicLibraryLoaderHelper.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2d92f02462300d83ce22a1e064fdcb63df0bf2948d3cd4dc78d70c7876c2c8c0
-size 250
+oid sha256:921783c03293a512bd19ee148d1516c3ffb387a3db4f35d8f83d59eadf17f60c
+size 113152
diff --git a/Assets/Plugins/Windows/x86/GfxPluginNativeRender-x86.dll b/Assets/Plugins/Windows/x86/GfxPluginNativeRender-x86.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65b2540ce2b3d289b081f871c7e90aa7e91f95aba7a9831b11a340e975d85b5c
-size 250
+oid sha256:9c9ad89e665db6913d5973a220821b7974e16527b84bf27c21334a4e7b4792dc
+size 388608
diff --git a/EOSUnityPlugin_package_template/CHANGELOG.md b/EOSUnityPlugin_package_template/CHANGELOG.md
@@ -8,6 +8,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 ### Fixed
 
+## [2.1.4] - 2022-10-03
+
+### Fixed
+- Updated DLLs and fixed merge error
+
 ## [2.1.3] - 2022-09-30
 
 ### Added
diff --git a/EOSUnityPlugin_package_template/package.json b/EOSUnityPlugin_package_template/package.json
@@ -1,6 +1,6 @@
 {
     "name": "com.playeveryware.eos",
-    "version": "2.1.3",
+    "version": "2.1.4",
     "unity": "2020.1",
     "unityRelease": "11f1",
     "displayName": "Epic Online Services Plugin for Unity",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "com.playeveryware.eos",`
`3`		`- "version": "2.1.3",`
	`3`	`+ "version": "2.1.4",`
`4`	`4`	`"unity": "2020.1",`
`5`	`5`	`"unityRelease": "11f1",`
`6`	`6`	`"displayName": "Epic Online Services Plugin for Unity",`