Skip to content

Commit 93c858d

Browse files
slambo311slambo311
authored
Merge branch 'alesan99:master' into master
2 parents 2855040 + f34ca26 commit 93c858d

File tree

5 files changed

+126
-11
lines changed

5 files changed

+126
-11
lines changed

‎.github/workflows/compile.yaml

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Compile
2-
on: [push]
2+
on: [push, pull_request]
33
jobs:
44
build:
55
runs-on: ubuntu-24.04
@@ -70,10 +70,6 @@ jobs:
7070
keystore-base64: ${{ env.KEYSTORE_BASE64 }}
7171
keystore-key-password: ${{ env.KEYSTORE_KEYPASSWORD }}
7272
keystore-store-password: ${{ env.KEYSTORE_STOREPASSWORD }}
73-
74-
- name: List Output Directory
75-
run: ls -R main/makelove-build/android
76-
7773
- name: Artifact (Android Release)
7874
uses: actions/upload-artifact@v4
7975
with:
@@ -83,4 +79,4 @@ jobs:
8379
uses: actions/upload-artifact@v4
8480
with:
8581
name: ${{ steps.metadata.outputs.id }}-android-debug
86-
path: main/makelove-build/android/${{ steps.metadata.outputs.id }}-debug.apk
82+
path: main/makelove-build/android/${{ steps.metadata.outputs.id }}-debug.apk

‎.github/workflows/release.yaml

+119
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
name: Release
2+
3+
on:
4+
push:
5+
tags:
6+
- 'v*' # Triggers on version tags, e.g., v1.0, v1.1.0
7+
8+
jobs:
9+
create-release:
10+
name: Create GitHub Release
11+
runs-on: ubuntu-latest
12+
13+
needs: build # Ensure this job runs after the "Compile" job
14+
15+
steps:
16+
- name: Checkout Repository
17+
uses: actions/checkout@v4
18+
19+
- name: Download and Rename Linux Artifact
20+
uses: actions/download-artifact@v4
21+
with:
22+
name: ${{ github.event.repository.name }}-linux
23+
path: ./artifacts
24+
- run: mv ./artifacts/mari0_ae-linux ./artifacts/alesan99s_entities_${{ github.ref_name }}.AppImage
25+
26+
- name: Download and Rename macOS Artifact
27+
uses: actions/download-artifact@v4
28+
with:
29+
name: ${{ github.event.repository.name }}-macos
30+
path: ./artifacts
31+
- run: mv ./artifacts/mari0_ae-macos ./artifacts/alesan99s_entities_${{ github.ref_name }}-macos.zip
32+
33+
- name: Download and Rename Windows 64-bit Artifact
34+
uses: actions/download-artifact@v4
35+
with:
36+
name: ${{ github.event.repository.name }}-win64
37+
path: ./artifacts
38+
- run: mv ./artifacts/mari0_ae-win64 ./artifacts/alesan99s_entities_${{ github.ref_name }}-win64.zip
39+
40+
- name: Download and Rename Windows 32-bit Artifact
41+
uses: actions/download-artifact@v4
42+
with:
43+
name: ${{ github.event.repository.name }}-win32
44+
path: ./artifacts
45+
- run: mv ./artifacts/mari0_ae-win32 ./artifacts/alesan99s_entities_${{ github.ref_name }}-win32.zip
46+
47+
- name: Download and Rename Android Release APK
48+
uses: actions/download-artifact@v4
49+
with:
50+
name: ${{ github.event.repository.name }}-android-release
51+
path: ./artifacts
52+
- run: mv ./artifacts/${{ github.event.repository.name }}-android-release ./artifacts/alesan99s_entities_${{ github.ref_name }}.apk
53+
54+
- name: Download and Rename Source Code Artifact
55+
uses: actions/download-artifact@v4
56+
with:
57+
name: ${{ github.event.repository.name }}-source
58+
path: ./artifacts
59+
- run: mv ./artifacts/${{ github.event.repository.name }}-source ./artifacts/alesan99s_entities_${{ github.ref_name }}-source.zip
60+
61+
- name: Create Release
62+
id: create_release
63+
uses: actions/create-release@v1
64+
with:
65+
tag_name: ${{ github.ref_name }}
66+
release_name: Release ${{ github.ref_name }}
67+
draft: false
68+
prerelease: false
69+
generate_release_notes: true
70+
env:
71+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
72+
73+
- name: Upload Linux Artifact
74+
uses: actions/upload-release-asset@v1
75+
with:
76+
release_id: ${{ steps.create_release.outputs.id }}
77+
asset_path: ./artifacts/alesan99s_entities_${{ github.ref_name }}.AppImage
78+
asset_name: alesan99s_entities_${{ github.ref_name }}.AppImage
79+
asset_content_type: application/x-executable
80+
81+
- name: Upload macOS Artifact
82+
uses: actions/upload-release-asset@v1
83+
with:
84+
release_id: ${{ steps.create_release.outputs.id }}
85+
asset_path: ./artifacts/alesan99s_entities_${{ github.ref_name }}-macos.zip
86+
asset_name: alesan99s_entities_${{ github.ref_name }}-macos.zip
87+
asset_content_type: application/zip
88+
89+
- name: Upload Windows 64-bit Artifact
90+
uses: actions/upload-release-asset@v1
91+
with:
92+
release_id: ${{ steps.create_release.outputs.id }}
93+
asset_path: ./artifacts/alesan99s_entities_${{ github.ref_name }}-win64.zip
94+
asset_name: alesan99s_entities_${{ github.ref_name }}-win64.zip
95+
asset_content_type: application/zip
96+
97+
- name: Upload Windows 32-bit Artifact
98+
uses: actions/upload-release-asset@v1
99+
with:
100+
release_id: ${{ steps.create_release.outputs.id }}
101+
asset_path: ./artifacts/alesan99s_entities_${{ github.ref_name }}-win32.zip
102+
asset_name: alesan99s_entities_${{ github.ref_name }}-win32.zip
103+
asset_content_type: application/zip
104+
105+
- name: Upload Android Release APK
106+
uses: actions/upload-release-asset@v1
107+
with:
108+
release_id: ${{ steps.create_release.outputs.id }}
109+
asset_path: ./artifacts/alesan99s_entities_${{ github.ref_name }}.apk
110+
asset_name: alesan99s_entities_${{ github.ref_name }}.apk
111+
asset_content_type: application/vnd.android.package-archive
112+
113+
- name: Upload Source Code
114+
uses: actions/upload-release-asset@v1
115+
with:
116+
release_id: ${{ steps.create_release.outputs.id }}
117+
asset_path: ./artifacts/alesan99s_entities_${{ github.ref_name }}-source.zip
118+
asset_name: alesan99s_entities_${{ github.ref_name }}-source.zip
119+
asset_content_type: application/zip

‎editor.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -1654,7 +1654,7 @@ function editor_draw()
16541654
local tx, ty = rcp.x+rcp.path[i][1], rcp.y+rcp.path[i][2]
16551655
drawtrack(tx, ty, rcp.path[i][3], rcp.path[i][4])
16561656
--is object selected to be tracked? (d=default(entity),r=reverse,t=tile,tr=tile reverse)
1657-
if i ~= 1 and i ~= ismaptile(tx, ty) and (map[tx][ty][2] or rcp.path[i][5] == "t" or rcp.path[i][5] == "tr" or rcp.path[i][5] == "tf" or rcp.path[i][5] == "tfr") then
1657+
if i ~= 1 and ismaptile(tx, ty) and (map[tx][ty][2] or rcp.path[i][5] == "t" or rcp.path[i][5] == "tr" or rcp.path[i][5] == "tf" or rcp.path[i][5] == "tfr") then
16581658
local trackable = rcp.path[i][5] or "d"
16591659
if trackable ~= "" then
16601660
local dir = rcp.path[i][4]

‎main.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@ if debugconsole then debuginputon = true; debuginput = "print()"; print("DEBUG O
182182
local debugGraph,fpsGraph,memGraph,drawGraph
183183
local debugGraphs = false
184184

185-
VERSION = 13.2000
186-
VERSIONSTRING = "13.2 (8/10/24)"
185+
VERSION = 13.2002
186+
VERSIONSTRING = "13.2 (10/26/2024)"
187187
ANDROIDVERSION = 18
188188

189189
android = (love.system.getOS() == "Android" or love.system.getOS() == "iOS") --[DROID]

‎menu.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -1996,8 +1996,8 @@ function loadonlinemappacks()
19961996
local asset = {
19971997
type = "error",
19981998
name = "error",
1999-
author = "error",
2000-
description = "error",
1999+
author = "-",
2000+
description = "couldn't connect!",
20012001
download = {
20022002
url = "error",
20032003
filename = "error",

0 commit comments

Comments
 (0)