From 303f32f5b268b1c2b1d1f73e858e1faed4ff40bc Mon Sep 17 00:00:00 2001 From: ParticleG Date: Tue, 21 Feb 2023 10:40:51 +0800 Subject: [PATCH 1/9] - Try ios CI at main --- .github/workflows/main.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8d304350..21384b32 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -159,7 +159,8 @@ jobs: build-android: runs-on: ubuntu-latest needs: [get-info, build-core, auto-test] - if: github.event_name != 'pull_request' + # if: github.event_name != 'pull_request' + if: ${{ !always() }} env: OUTPUT_FOLDER: ./build RELEASE_FOLDER: ./release @@ -278,7 +279,7 @@ jobs: dir: ./ColdClear - name: Build iOS packages id: build-packages - uses: love-actions/love-actions-ios@v1 + uses: love-actions/love-actions-ios@main with: app-name: ${{ needs.get-info.outputs.app-name }} bundle-id: ${{ steps.process-app-name.outputs.bundle-id }} @@ -345,6 +346,7 @@ jobs: build-linux: runs-on: ubuntu-latest needs: [get-info, build-core, auto-test] + if: ${{ !always() }} env: OUTPUT_FOLDER: ./build RELEASE_FOLDER: ./release @@ -444,7 +446,8 @@ jobs: build-macos-appstore: runs-on: macos-latest needs: [get-info, build-core, auto-test] - if: github.event_name != 'pull_request' + # if: github.event_name != 'pull_request' + if: ${{ !always() }} env: OUTPUT_FOLDER: ./build RELEASE_FOLDER: ./release @@ -544,7 +547,8 @@ jobs: build-macos-portable: runs-on: macos-latest needs: [get-info, build-core, auto-test] - if: github.event_name != 'pull_request' + # if: github.event_name != 'pull_request' + if: ${{ !always() }} env: OUTPUT_FOLDER: ./build RELEASE_FOLDER: ./release @@ -656,6 +660,7 @@ jobs: build-windows: runs-on: windows-latest needs: [get-info, build-core, auto-test] + if: ${{ !always() }} env: OUTPUT_FOLDER: ./build RELEASE_FOLDER: ./release From 6166c03eabdfb7197cd054d05a1cd632ddb2e7f6 Mon Sep 17 00:00:00 2001 From: ParticleG Date: Tue, 21 Feb 2023 11:19:17 +0800 Subject: [PATCH 2/9] - Try fix iOS portrait mode --- .github/workflows/main.yml | 2 +- conf.lua | 42 +++++++++++++++----------------------- 2 files changed, 17 insertions(+), 27 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 21384b32..95136a17 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -279,7 +279,7 @@ jobs: dir: ./ColdClear - name: Build iOS packages id: build-packages - uses: love-actions/love-actions-ios@main + uses: love-actions/love-actions-ios@v1 with: app-name: ${{ needs.get-info.outputs.app-name }} bundle-id: ${{ steps.process-app-name.outputs.bundle-id }} diff --git a/conf.lua b/conf.lua index 2ebafa82..5b2d4ad0 100644 --- a/conf.lua +++ b/conf.lua @@ -27,36 +27,26 @@ function love.conf(t) t.audio.mixwithsystem=true end - local W=t.window - W.title="Techmino "..require "version".string + t.window.title="Techmino "..require "version".string + t.window.vsync=0 -- Unlimited FPS + t.window.msaa=msaa -- Multi-sampled antialiasing + t.window.depth=0 -- Bits/samp of depth buffer + t.window.stencil=1 -- Bits/samp of stencil buffer + t.window.display=1 -- Monitor ID + t.window.highdpi=true -- High-dpi mode for the window on a Retina display + t.window.x,t.window.y=nil,nil -- Position of the window + t.window.borderless=MOBILE -- Display window frame + t.window.resizable=not MOBILE -- Whether window is resizable + t.window.fullscreen=MOBILE -- Fullscreen mode if portrait then - W.width,W.height=720,1280 - W.minwidth,W.minheight=360,640 + t.window.width,t.window.height=720,1280 + t.window.minwidth,t.window.minheight=360,640 else - W.width,W.height=1280,720 - W.minwidth,W.minheight=640,360 + t.window.width,t.window.height=1280,720 + t.window.minwidth,t.window.minheight=640,360 end - - W.vsync=0 -- Unlimited FPS - W.msaa=msaa -- Multi-sampled antialiasing - W.depth=0 -- Bits/samp of depth buffer - W.stencil=1 -- Bits/samp of stencil buffer - W.display=1 -- Monitor ID - W.highdpi=true -- High-dpi mode for the window on a Retina display - W.x,W.y=nil,nil -- Position of the window - if fs.getInfo('media/image/icon.png') then - W.icon='media/image/icon.png' - end - - if MOBILE then - W.borderless=true - W.resizable=false - W.fullscreen=true - else - W.borderless=false - W.resizable=true - W.fullscreen=false + t.window.icon='media/image/icon.png' end local M=t.modules From 17bb8dbe6da465dca21caa9e0f8ecbdbae3bcf12 Mon Sep 17 00:00:00 2001 From: ParticleG Date: Tue, 21 Feb 2023 11:39:23 +0800 Subject: [PATCH 3/9] - Try fix iOS portrait issue --- conf.lua | 45 +++++++++++++++++++++++---------------------- parts/gameFuncs.lua | 2 +- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/conf.lua b/conf.lua index 5b2d4ad0..882ed3ed 100644 --- a/conf.lua +++ b/conf.lua @@ -27,28 +27,6 @@ function love.conf(t) t.audio.mixwithsystem=true end - t.window.title="Techmino "..require "version".string - t.window.vsync=0 -- Unlimited FPS - t.window.msaa=msaa -- Multi-sampled antialiasing - t.window.depth=0 -- Bits/samp of depth buffer - t.window.stencil=1 -- Bits/samp of stencil buffer - t.window.display=1 -- Monitor ID - t.window.highdpi=true -- High-dpi mode for the window on a Retina display - t.window.x,t.window.y=nil,nil -- Position of the window - t.window.borderless=MOBILE -- Display window frame - t.window.resizable=not MOBILE -- Whether window is resizable - t.window.fullscreen=MOBILE -- Fullscreen mode - if portrait then - t.window.width,t.window.height=720,1280 - t.window.minwidth,t.window.minheight=360,640 - else - t.window.width,t.window.height=1280,720 - t.window.minwidth,t.window.minheight=640,360 - end - if fs.getInfo('media/image/icon.png') then - t.window.icon='media/image/icon.png' - end - local M=t.modules M.window,M.system,M.event,M.thread=true,true,true,true M.timer,M.math,M.data=true,true,true @@ -56,4 +34,27 @@ function love.conf(t) M.graphics,M.font,M.image=true,true,true M.mouse,M.touch,M.keyboard,M.joystick=true,true,true,true M.physics=false + + local W=t.window + W.vsync=0 -- Unlimited FPS + W.msaa=msaa -- Multi-sampled antialiasing + W.depth=0 -- Bits/samp of depth buffer + W.stencil=1 -- Bits/samp of stencil buffer + W.display=1 -- Monitor ID + W.highdpi=true -- High-dpi mode for the window on a Retina display + W.x,W.y=nil,nil -- Position of the window + W.borderless=MOBILE -- Display window frame + W.resizable=not MOBILE -- Whether window is resizable + W.fullscreen=MOBILE -- Fullscreen mode + W.title="Techmino "..require "version".string -- Window title + if portrait then + W.width,W.height=720,1280 + W.minwidth,W.minheight=360,640 + else + W.width,W.height=1280,720 + W.minwidth,W.minheight=640,360 + end + if fs.getInfo('media/image/icon.png') then + W.icon='media/image/icon.png' + end end diff --git a/parts/gameFuncs.lua b/parts/gameFuncs.lua index 103c3cb5..f13fc73c 100644 --- a/parts/gameFuncs.lua +++ b/parts/gameFuncs.lua @@ -129,7 +129,7 @@ do-- function applySettings() love.mouse.setVisible(SETTING.sysCursor) -- Apply fullscreen - love.window.setFullscreen(SETTING.fullscreen) + -- love.window.setFullscreen(SETTING.fullscreen) love.resize(GC.getWidth(),GC.getHeight()) -- Apply Zframework setting From d1cef7ed841c010ff9d68f80314976cb16bd2229 Mon Sep 17 00:00:00 2001 From: ParticleG Date: Tue, 21 Feb 2023 11:54:58 +0800 Subject: [PATCH 4/9] - Try fix iOS portrait issue --- conf.lua | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/conf.lua b/conf.lua index 882ed3ed..37112107 100644 --- a/conf.lua +++ b/conf.lua @@ -43,17 +43,19 @@ function love.conf(t) W.display=1 -- Monitor ID W.highdpi=true -- High-dpi mode for the window on a Retina display W.x,W.y=nil,nil -- Position of the window - W.borderless=MOBILE -- Display window frame - W.resizable=not MOBILE -- Whether window is resizable - W.fullscreen=MOBILE -- Fullscreen mode - W.title="Techmino "..require "version".string -- Window title - if portrait then - W.width,W.height=720,1280 - W.minwidth,W.minheight=360,640 - else + -- if portrait then + -- W.width,W.height=720,1280 + -- W.minwidth,W.minheight=360,640 + -- else W.width,W.height=1280,720 W.minwidth,W.minheight=640,360 - end + -- end + -- W.borderless=MOBILE -- Display window frame + -- W.resizable=not MOBILE -- Whether window is resizable + -- W.fullscreen=MOBILE -- Fullscreen mode + W.borderless=true + W.resizable=false + W.title="Techmino "..require "version".string -- Window title if fs.getInfo('media/image/icon.png') then W.icon='media/image/icon.png' end From 00bf828ef4e564d8573851bc362d6ebcb9271403 Mon Sep 17 00:00:00 2001 From: ParticleG Date: Tue, 21 Feb 2023 12:16:02 +0800 Subject: [PATCH 5/9] - Try fix iOS portrait issue --- conf.lua | 8 +++----- parts/gameFuncs.lua | 2 +- parts/gameTables.lua | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/conf.lua b/conf.lua index 37112107..9b126c9a 100644 --- a/conf.lua +++ b/conf.lua @@ -50,11 +50,9 @@ function love.conf(t) W.width,W.height=1280,720 W.minwidth,W.minheight=640,360 -- end - -- W.borderless=MOBILE -- Display window frame - -- W.resizable=not MOBILE -- Whether window is resizable - -- W.fullscreen=MOBILE -- Fullscreen mode - W.borderless=true - W.resizable=false + W.borderless=MOBILE -- Display window frame + W.resizable=not MOBILE -- Whether window is resizable + W.fullscreen=MOBILE -- Fullscreen mode W.title="Techmino "..require "version".string -- Window title if fs.getInfo('media/image/icon.png') then W.icon='media/image/icon.png' diff --git a/parts/gameFuncs.lua b/parts/gameFuncs.lua index f13fc73c..103c3cb5 100644 --- a/parts/gameFuncs.lua +++ b/parts/gameFuncs.lua @@ -129,7 +129,7 @@ do-- function applySettings() love.mouse.setVisible(SETTING.sysCursor) -- Apply fullscreen - -- love.window.setFullscreen(SETTING.fullscreen) + love.window.setFullscreen(SETTING.fullscreen) love.resize(GC.getWidth(),GC.getHeight()) -- Apply Zframework setting diff --git a/parts/gameTables.lua b/parts/gameTables.lua index f8000a95..dc20b43d 100644 --- a/parts/gameTables.lua +++ b/parts/gameTables.lua @@ -652,7 +652,7 @@ do-- Userdata tables showSpike=true, highCam=true, nextPos=true, - fullscreen=true, + fullscreen=MOBILE, portrait=false, msaa=0, bg='on', From 48f3d293bd32f3853d9cf5e146d6e56710bd0466 Mon Sep 17 00:00:00 2001 From: ParticleG Date: Tue, 21 Feb 2023 14:09:44 +0800 Subject: [PATCH 6/9] - Try fix iOS portrait issue --- conf.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/conf.lua b/conf.lua index 9b126c9a..5296c175 100644 --- a/conf.lua +++ b/conf.lua @@ -43,16 +43,16 @@ function love.conf(t) W.display=1 -- Monitor ID W.highdpi=true -- High-dpi mode for the window on a Retina display W.x,W.y=nil,nil -- Position of the window - -- if portrait then - -- W.width,W.height=720,1280 - -- W.minwidth,W.minheight=360,640 - -- else - W.width,W.height=1280,720 - W.minwidth,W.minheight=640,360 - -- end W.borderless=MOBILE -- Display window frame W.resizable=not MOBILE -- Whether window is resizable - W.fullscreen=MOBILE -- Fullscreen mode + W.fullscreentype="exclusive" -- Fullscreen type + if portrait then + W.width,W.height=720,1280 + W.minwidth,W.minheight=360,640 + else + W.width,W.height=1280,720 + W.minwidth,W.minheight=640,360 + end W.title="Techmino "..require "version".string -- Window title if fs.getInfo('media/image/icon.png') then W.icon='media/image/icon.png' From f8277e1c8a7ba3065a10b10a8d052a7a121e759a Mon Sep 17 00:00:00 2001 From: ParticleG Date: Tue, 21 Feb 2023 14:37:58 +0800 Subject: [PATCH 7/9] - Revert changes in SETTING table - Use exclusive fullscreen on mobile devices --- conf.lua | 2 +- parts/gameTables.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf.lua b/conf.lua index 5296c175..99c333c2 100644 --- a/conf.lua +++ b/conf.lua @@ -45,7 +45,7 @@ function love.conf(t) W.x,W.y=nil,nil -- Position of the window W.borderless=MOBILE -- Display window frame W.resizable=not MOBILE -- Whether window is resizable - W.fullscreentype="exclusive" -- Fullscreen type + W.fullscreentype=MOBILE and "exclusive" or "desktop" -- Fullscreen type if portrait then W.width,W.height=720,1280 W.minwidth,W.minheight=360,640 diff --git a/parts/gameTables.lua b/parts/gameTables.lua index dc20b43d..f8000a95 100644 --- a/parts/gameTables.lua +++ b/parts/gameTables.lua @@ -652,7 +652,7 @@ do-- Userdata tables showSpike=true, highCam=true, nextPos=true, - fullscreen=MOBILE, + fullscreen=true, portrait=false, msaa=0, bg='on', From 69a84c035e29edfe42e9c7b574b16eb8f5184120 Mon Sep 17 00:00:00 2001 From: ParticleG Date: Tue, 21 Feb 2023 14:54:28 +0800 Subject: [PATCH 8/9] - Remove trailing spaces --- conf.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.lua b/conf.lua index 99c333c2..f66d41bf 100644 --- a/conf.lua +++ b/conf.lua @@ -56,5 +56,5 @@ function love.conf(t) W.title="Techmino "..require "version".string -- Window title if fs.getInfo('media/image/icon.png') then W.icon='media/image/icon.png' - end + end end From 5c4557a7b7b3376040b677eba60ec7102efcc5d8 Mon Sep 17 00:00:00 2001 From: ParticleG Date: Tue, 21 Feb 2023 15:08:28 +0800 Subject: [PATCH 9/9] - Re-enable other platforms' CI --- .github/workflows/main.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 95136a17..8d304350 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -159,8 +159,7 @@ jobs: build-android: runs-on: ubuntu-latest needs: [get-info, build-core, auto-test] - # if: github.event_name != 'pull_request' - if: ${{ !always() }} + if: github.event_name != 'pull_request' env: OUTPUT_FOLDER: ./build RELEASE_FOLDER: ./release @@ -346,7 +345,6 @@ jobs: build-linux: runs-on: ubuntu-latest needs: [get-info, build-core, auto-test] - if: ${{ !always() }} env: OUTPUT_FOLDER: ./build RELEASE_FOLDER: ./release @@ -446,8 +444,7 @@ jobs: build-macos-appstore: runs-on: macos-latest needs: [get-info, build-core, auto-test] - # if: github.event_name != 'pull_request' - if: ${{ !always() }} + if: github.event_name != 'pull_request' env: OUTPUT_FOLDER: ./build RELEASE_FOLDER: ./release @@ -547,8 +544,7 @@ jobs: build-macos-portable: runs-on: macos-latest needs: [get-info, build-core, auto-test] - # if: github.event_name != 'pull_request' - if: ${{ !always() }} + if: github.event_name != 'pull_request' env: OUTPUT_FOLDER: ./build RELEASE_FOLDER: ./release @@ -660,7 +656,6 @@ jobs: build-windows: runs-on: windows-latest needs: [get-info, build-core, auto-test] - if: ${{ !always() }} env: OUTPUT_FOLDER: ./build RELEASE_FOLDER: ./release