Skip to content

Commit

Permalink
Merge pull request #89 from alessandrofama/update-2023.1
Browse files Browse the repository at this point in the history 
Update integration to 2023.1.0 major release
  • Loading branch information
@alessandrofama
alessandrofama authored Nov 16, 2023
2 parents fdf2748 + b1014c0 commit 920e37c
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 19 deletions.
36 changes: 18 additions & 18 deletions .github/workflows/build_all.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ on:

env:
BASE_BRANCH: ci
WWISE_VERSION: "2023.1.0-beta"
GODOT_ENGINE_VERSION: "4.1.2"
WWISE_VERSION: "2023.1.0"
GODOT_ENGINE_VERSION: "4.1.3"
GODOT_ENGINE_STAGE: "stable"
INTEGRATION_VERSION: "2.0.3"

Expand Down Expand Up @@ -109,82 +109,82 @@ jobs:
uses: suisei-cn/actions-download-file@v1.4.0
if: steps.cache-wwise-sdk.outputs.cache-hit != 'true'
with:
url: "https://www.dropbox.com/scl/fi/osbj3muk10dp0kt9azlag/wwise_sdk_2023.1.0_beta_base.zip?rlkey=zrf83nacc680qvbrh93c7jpre&dl=1"
url: "https://www.dropbox.com/scl/fi/xlrcmxbmxsmy58tp33uiw/wwise_sdk_2023.1.0_base.zip?rlkey=30ut2n1g1bi5dp33y923epsbd&dl=1"
target: ./addons/Wwise/native/wwise_sdk/

- name: Download Wwise SDK (Windows)
uses: suisei-cn/actions-download-file@v1.4.0
if: runner.os == 'Windows' && steps.cache-wwise-sdk.outputs.cache-hit != 'true'
with:
url: "https://www.dropbox.com/scl/fi/g7tqtnmtwm1ir32sfdt0q/wwise_sdk_2023.1.0_beta_win.zip?rlkey=nl38xonxw55rk0cyzomfzj0z7&dl=1"
url: "https://www.dropbox.com/scl/fi/kt51rpzdbvgzt6wsnclhe/wwise_sdk_2023.1.0_win.zip?rlkey=ossw4of3bxjat6fbempev6jbr&dl=1"
target: ./addons/Wwise/native/wwise_sdk/

- name: Download Wwise SDK (macOS)
uses: suisei-cn/actions-download-file@v1.4.0
if: runner.os == 'MacOS' && matrix.sdk-platform == 'mac' && steps.cache-wwise-sdk.outputs.cache-hit != 'true'
with:
url: "https://www.dropbox.com/scl/fi/g23x4bv6471alp626gpyr/wwise_sdk_2023.1.0_beta_mac.zip?rlkey=6msjqa9uln4gnrme1g8m5dvc9&dl=1"
url: "https://www.dropbox.com/scl/fi/97zus2pl7btnua0s5dhw1/wwise_sdk_2023.1.0_mac.zip?rlkey=v4io943jvor5ovbw7x6n5p6gm&dl=1"
target: ./addons/Wwise/native/wwise_sdk/

- name: Download Wwise SDK (Linux)
uses: suisei-cn/actions-download-file@v1.4.0
if: runner.os == 'Linux' && matrix.sdk-platform == 'linux' && steps.cache-wwise-sdk.outputs.cache-hit != 'true'
with:
url: "https://www.dropbox.com/scl/fi/dqjr5n0hfcq54xpmmyt82/wwise_sdk_2023.1.0_beta_linux_x64.zip?rlkey=s1yw1k993676e4kdx39xtxr3f&dl=1"
url: "https://www.dropbox.com/scl/fi/76dgnud1pg6bbctiruiy4/wwise_sdk_2023.1.0_linux.zip?rlkey=8oimalx8sj8klaze2hl35pbha&dl=1"
target: ./addons/Wwise/native/wwise_sdk/

- name: Download Wwise SDK (iOS)
uses: suisei-cn/actions-download-file@v1.4.0
if: runner.os == 'MacOS' && matrix.sdk-platform == 'ios' && steps.cache-wwise-sdk.outputs.cache-hit != 'true'
with:
url: "https://www.dropbox.com/scl/fi/tmq0wfahgu6riifp0kj6q/wwise_sdk_2023.1.0_beta_ios.zip?rlkey=nx8ssb1fai0xgsdxapdo9by2r&dl=1"
url: "https://www.dropbox.com/scl/fi/p0jknjqz3ahw4myzq5y1g/wwise_sdk_2023.1.0_ios.zip?rlkey=ybyvp3bavmh6h2r6csftsmtep&dl=1"
target: ./addons/Wwise/native/wwise_sdk/

- name: Download Wwise SDK (Android)
uses: suisei-cn/actions-download-file@v1.4.0
if: runner.os == 'Linux' && matrix.sdk-platform == 'android' && steps.cache-wwise-sdk.outputs.cache-hit != 'true'
with:
url: "https://www.dropbox.com/scl/fi/szpqfc3q46ejaskj7roap/wwise_sdk_2023.1.0_beta_android.zip?rlkey=ad5cp09mw4ga1frbii7hdkjs8&dl=1"
url: "https://www.dropbox.com/scl/fi/0armk45ync2ijvrq5epgq/wwise_sdk_2023.1.0_android.zip?rlkey=twmaw7gc39bytxgenuc8baqml&dl=1"
target: ./addons/Wwise/native/wwise_sdk/

- name: Unzip SDK (Windows)
if: runner.os == 'Windows' && steps.cache-wwise-sdk.outputs.cache-hit != 'true'
run: |
cd ./addons/Wwise/native/wwise_sdk
7z x wwise_sdk_2023.1.0_beta_base.zip
7z x wwise_sdk_2023.1.0_beta_win.zip
7z x wwise_sdk_2023.1.0_base.zip
7z x wwise_sdk_2023.1.0_win.zip
cd ../../../../
- name: Unzip SDK (macOS)
if: runner.os == 'MacOS' && matrix.sdk-platform == 'mac' && steps.cache-wwise-sdk.outputs.cache-hit != 'true'
run: |
cd ./addons/Wwise/native/wwise_sdk
7z x wwise_sdk_2023.1.0_beta_base.zip
7z x wwise_sdk_2023.1.0_beta_mac.zip
7z x wwise_sdk_2023.1.0_base.zip
7z x wwise_sdk_2023.1.0_mac.zip
cd ../../../../
- name: Unzip SDK (Linux)
if: runner.os == 'Linux' && matrix.sdk-platform == 'linux' && steps.cache-wwise-sdk.outputs.cache-hit != 'true'
run: |
cd ./addons/Wwise/native/wwise_sdk
7z x wwise_sdk_2023.1.0_beta_base.zip
7z x wwise_sdk_2023.1.0_beta_linux_x64.zip
7z x wwise_sdk_2023.1.0_base.zip
7z x wwise_sdk_2023.1.0_linux.zip
cd ../../../../
- name: Unzip SDK (iOS)
if: runner.os == 'MacOS' && matrix.sdk-platform == 'ios' && steps.cache-wwise-sdk.outputs.cache-hit != 'true'
run: |
cd ./addons/Wwise/native/wwise_sdk
7z x wwise_sdk_2023.1.0_beta_base.zip
7z x wwise_sdk_2023.1.0_beta_ios.zip
7z x wwise_sdk_2023.1.0_base.zip
7z x wwise_sdk_2023.1.0_ios.zip
cd ../../../../
- name: Unzip SDK (Android)
if: runner.os == 'Linux' && matrix.sdk-platform == 'android' && steps.cache-wwise-sdk.outputs.cache-hit != 'true'
run: |
cd ./addons/Wwise/native/wwise_sdk
7z x wwise_sdk_2023.1.0_beta_base.zip
7z x wwise_sdk_2023.1.0_beta_android.zip
7z x wwise_sdk_2023.1.0_base.zip
7z x wwise_sdk_2023.1.0_android.zip
cd ../../../../
- name: Compile Debug library
Expand Down
2 changes: 1 addition & 1 deletion addons/Wwise/native/godot-cpp
Submodule godot-cpp updated 33 files
+20 −1 .github/workflows/ci.yml
+4 −0 .gitignore
+21 −5 CMakeLists.txt
+4 −0 SConstruct
+3 −65 binding_generator.py
+18 −18 gdextension/extension_api.json
+62 −0 include/godot_cpp/classes/editor_plugin_registration.hpp
+1 −1 include/godot_cpp/classes/ref.hpp
+119 −75 include/godot_cpp/classes/wrapped.hpp
+6 −8 include/godot_cpp/core/class_db.hpp
+1 −1 include/godot_cpp/core/memory.hpp
+0 −3 include/godot_cpp/godot.hpp
+8 −5 include/godot_cpp/templates/cowdata.hpp
+1 −1 include/godot_cpp/templates/list.hpp
+3 −3 include/godot_cpp/templates/rid_owner.hpp
+4 −4 include/godot_cpp/templates/thread_work_pool.hpp
+12 −0 include/godot_cpp/variant/char_string.hpp
+14 −6 include/godot_cpp/variant/variant.hpp
+3 −3 src/classes/editor_plugin_registration.cpp
+29 −0 src/classes/wrapped.cpp
+14 −3 src/core/class_db.cpp
+2 −2 src/core/memory.cpp
+3 −3 src/godot.cpp
+8 −6 src/variant/variant.cpp
+16 −1 test/CMakeLists.txt
+2 −0 test/project/example.gdextension
+7 −0 test/project/main.gd
+6 −0 test/src/example.cpp
+3 −0 test/src/example.h
+19 −7 tools/android.py
+30 −7 tools/godotcpp.py
+20 −23 tools/web.py
+1 −1 tools/windows.py
1 change: 1 addition & 0 deletions addons/Wwise/native/src/editor/ak_editor_utils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ class AkEditorUtils : public Object
{
GDCLASS(AkEditorUtils, Object);

public:
enum AkType
{
AKTYPE_EVENT,
Expand Down

0 comments on commit 920e37c

Please sign in to comment.