Merge branch 'master' of https://github.com/youneuoy/M2TWEOP-library

youneuoy · Dec 1, 2023 · c0b31e9 · c0b31e9
2 parents 00041f4 + e45516e
commit c0b31e9
Show file tree

Hide file tree

Showing 105 changed files with 5,987 additions and 688 deletions.
diff --git a/.github/workflows/build-and-release-eop.yml b/.github/workflows/build-and-release-eop.yml
@@ -15,7 +15,7 @@ jobs:
   # This job is used to build EOP
   # It runs on every commit pushed to GitHub
   build-eop:
-    runs-on: windows-2019
+    runs-on: windows-2022
 
     # Steps
     steps:
@@ -24,6 +24,8 @@ jobs:
 
       - name: Build EOP
         uses: ./.github/workflows/composite-actions/build-eop
+        with:
+          vsversion: "2022"
 
       - uses: actions/upload-artifact@v3
         with:
@@ -33,15 +35,17 @@ jobs:
   # This job is used to update the online documentation
   # It requires a commit message beginning with 'Docs' to run
   update-docs:
-      runs-on: windows-2019
+      runs-on: windows-2022
 
-      if: "startsWith(github.event.head_commit.message, 'Docs')"
+      if: "startsWith(github.event.head_commit.message, 'Docs:')"
       steps:
       - name: "Checkout from latest commit: '${{ github.event.head_commit.message }}'"
         uses: actions/checkout@v3
 
       - name: Build EOP
         uses: ./.github/workflows/composite-actions/build-eop
+        with:
+          vsversion: "2022"
 
       - name: Update EOP Online Documentation
         uses: ./.github/workflows/composite-actions/build-docs
@@ -51,16 +55,18 @@ jobs:
   # This job is used to release EOP to GitHub and update the documentation
   # It requires a commit message beginning with 'Release' to run
   release-eop:
-    runs-on: windows-2019
+    runs-on: windows-2022
 
     # If the latest commit message starts with 'Release', update docs and issue a release on GitHub
-    if: "startsWith(github.event.head_commit.message, 'Release')"
+    if: "startsWith(github.event.head_commit.message, 'Release:')"
     steps:
     - name: "Checkout from latest commit: '${{ github.event.head_commit.message }}'"
       uses: actions/checkout@v3
 
     - name: Build EOP
       uses: ./.github/workflows/composite-actions/build-eop
+      with:
+        vsversion: "2022"
 
     - name: Read release version info from source
       run: |
@@ -91,4 +97,4 @@ jobs:
         bodyFile: "./documentationGenerator/releaseInfo/releaseDescription.md"
         token: ${{ secrets.GITHUB_TOKEN }}
         commit: "master"
-        allowUpdates: true
+        allowUpdates: true
diff --git a/.github/workflows/composite-actions/build-eop/action.yml b/.github/workflows/composite-actions/build-eop/action.yml
@@ -7,7 +7,7 @@ runs:
     # Use msvc-dev  building
     - uses: ilammy/msvc-dev-cmd@v1
       with:
-          vsversion: "16.0"
+          vsversion: "2022"
 
     - name: Show checked out files
       run: ls -l
@@ -40,7 +40,7 @@ runs:
     # Run build script
     - name: Run buildEOP.ps1
       run: |
-        ./buildEOP.ps1
+       ./buildEOP.ps1 -shouldZip "True"
       shell: pwsh
       env:
         DXSDK_DIR: ${{ github.workspace }}\DXSDK\
@@ -52,4 +52,4 @@ runs:
         ls -l documentationGenerator/EOPDocs;
         ls -l documentationGenerator/EOPDocs/build;
         ls -l documentationGenerator/EOPDocs/build/html;
-      shell: bash
+      shell: bash
diff --git a/M2TWEOP Code/3rd/ImNotify/imgui_notify.h b/M2TWEOP Code/3rd/ImNotify/imgui_notify.h
@@ -16,7 +16,7 @@
 #define NOTIFY_PADDING_MESSAGE_Y		10.f		// Padding Y between each message
 #define NOTIFY_FADE_IN_OUT_TIME			150			// Fade in and out duration
 #define NOTIFY_DEFAULT_DISMISS			3000		// Auto dismiss after X ms (default, applied only of no data provided in constructors)
-#define NOTIFY_OPACITY					1.0f		// 0-1 Toast opacity
+#define NOTIFY_OPACITY					0.5f		// 0-1 Toast opacity
 #define NOTIFY_TOAST_FLAGS				ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoInputs | ImGuiWindowFlags_NoNav | ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoFocusOnAppearing
 // Comment out if you don't want any separator between title and content
 #define NOTIFY_USE_SEPARATOR