Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #10

Merged
merged 77 commits into from
Aug 14, 2023
Merged

Dev #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
3fe93c3
Models update
max-bacon Jun 12, 2023
f81dd44
Lighting
max-bacon Jun 12, 2023
4bbc604
Fix the mess
max-bacon Jun 12, 2023
de91ddb
Fix actions with wally-package-types
max-bacon Jun 12, 2023
e5581df
Undo wally-package-types fix
max-bacon Jun 12, 2023
a235575
Checkpoint anim working
max-bacon Jun 13, 2023
330a7a3
Update
max-bacon Jun 18, 2023
e99a545
map update
max-bacon Jun 20, 2023
de808c1
Update
max-bacon Jun 21, 2023
0e24c44
Rbxlx -> rbxl and covert to Lync
max-bacon Jul 7, 2023
12c18d4
dos
max-bacon Jul 7, 2023
31f8c8a
Fixes
max-bacon Jul 7, 2023
b34d89a
test
max-bacon Jul 8, 2023
9a75de4
Workflow
max-bacon Jul 8, 2023
d053b39
fix
max-bacon Jul 8, 2023
b8c8de9
fix 2
max-bacon Jul 8, 2023
7eb3a22
back
max-bacon Jul 8, 2023
48e1390
fix?
max-bacon Jul 8, 2023
e7aadd8
fix
max-bacon Jul 8, 2023
dfffd0c
a
max-bacon Jul 8, 2023
229552d
b
max-bacon Jul 8, 2023
25a6083
new
max-bacon Jul 8, 2023
2b0a55d
asd
max-bacon Jul 8, 2023
961d0c3
pls be the fix
max-bacon Jul 8, 2023
8f54b7e
fix
max-bacon Jul 8, 2023
c9bee56
fix
max-bacon Jul 8, 2023
a9b324c
fixesss
max-bacon Jul 8, 2023
9600d4c
?
max-bacon Jul 8, 2023
4a28ec6
test
max-bacon Jul 8, 2023
4949a7e
aasdddd hw
max-bacon Jul 8, 2023
0c3649f
test 2
max-bacon Jul 8, 2023
36fe5e6
fixes
max-bacon Jul 8, 2023
c9649c4
Update
max-bacon Jul 8, 2023
37bf68d
Lync/Lync
max-bacon Jul 8, 2023
7972990
test
max-bacon Jul 8, 2023
ccad00e
no latest
max-bacon Jul 8, 2023
de3d100
Versions
max-bacon Jul 8, 2023
5017246
update
max-bacon Jul 11, 2023
8d80975
images
max-bacon Jul 11, 2023
07ff8f3
Change lune files and add spinners
max-bacon Jul 13, 2023
0da3ab3
Cannot del dir :)
max-bacon Jul 13, 2023
27a8e4b
Done with dummies
max-bacon Jul 13, 2023
1092f30
Done w dummy
max-bacon Jul 13, 2023
3935f7e
Spinning dummy completed
max-bacon Jul 14, 2023
c2b8bcb
set spawn back to 0
max-bacon Jul 14, 2023
9baefaa
Start with the stone monsters
max-bacon Jul 15, 2023
606d3fc
Update formatting
max-bacon Jul 15, 2023
0bc21dc
Fire Monster Wall stage
max-bacon Jul 19, 2023
fcb065a
Add loose log
max-bacon Jul 20, 2023
66fd893
Still hella broken lol
max-bacon Jul 21, 2023
530c573
Lightning done
max-bacon Jul 22, 2023
fe0dd6a
Fixes to have Rojo and Lync and setup other stuff
max-bacon Jul 23, 2023
bf41b12
fix workflows
max-bacon Jul 23, 2023
6135af3
Update with SwingingAxe
max-bacon Jul 28, 2023
f2d5a8b
Start stuffs
max-bacon Jul 29, 2023
ab2147e
Ninja star DONE
max-bacon Jul 30, 2023
b2780e5
Ninja stars done
max-bacon Jul 31, 2023
85d1e20
Fix holes in map
max-bacon Jul 31, 2023
3b8928e
Update timing stuff
max-bacon Aug 1, 2023
3f3fa0a
Dynamite donezo
max-bacon Aug 1, 2023
d135be5
Make it much easier yes
max-bacon Aug 2, 2023
96c2465
Map fixes too!
max-bacon Aug 2, 2023
973e388
HELLA updates
max-bacon Aug 3, 2023
e2c5171
Update tag list
max-bacon Aug 3, 2023
8c5c1e5
Fixes i needa fix promises
max-bacon Aug 3, 2023
e7dead1
Update kinda big thx cutest
max-bacon Aug 9, 2023
2287c5b
pls fix asap
max-bacon Aug 11, 2023
904c2d5
did this fix?
max-bacon Aug 11, 2023
07f0d79
did dis fix
max-bacon Aug 11, 2023
fe1389a
Fixed
max-bacon Aug 11, 2023
f860213
does this work?!
max-bacon Aug 11, 2023
2369b56
test?
max-bacon Aug 12, 2023
dceab4d
Update
max-bacon Aug 12, 2023
7e9e647
Fixed!
max-bacon Aug 12, 2023
b7930cb
Fix2
max-bacon Aug 12, 2023
a56d136
is fix? lets test yes!
max-bacon Aug 14, 2023
0c4a1d1
Update yamls
max-bacon Aug 14, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
22 changes: 16 additions & 6 deletions .github/workflows/deploy_dev.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Deploy Dev
name: Deploy Dev (Lync)

on:
push:
Expand All @@ -9,18 +9,28 @@ jobs:

deploy:
name: Deploy
runs-on: ubuntu-latest
runs-on: windows-latest
steps:
- name: Checkout code

- name: Install Node.js
uses: actions/setup-node@v3

- name: Checkout repo
uses: actions/checkout@v3

- name: Checkout Lync
uses: actions/checkout@master
with:
repository: Iron-Stag-Games/Lync
path: Lync

- uses: ok-nick/setup-aftman@v0.3.0
name: Install Aftman
with:
token: ${{ secrets.GITHUB_TOKEN }}

- run: wally install

- run: rojo build -o game.rbxlx

- run: rbxcloud experience publish -f game.rbxlx -p ${{ secrets.DEV_PLACE_ID }} -u ${{ secrets.DEV_UNIVERSE_ID }} -t published -a ${{ secrets.API_KEY }}
- run: node "Lync/Lync/index.js" lync.project.json OFFLINE

- run: rbxcloud experience publish -f BuildScripts/Build/Build.rbxl -p ${{ secrets.DEV_PLACE_ID }} -u ${{ secrets.DEV_UNIVERSE_ID }} -t published -a ${{ secrets.API_KEY }}
22 changes: 16 additions & 6 deletions .github/workflows/deploy_prod.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Deploy Prod
name: Deploy Prod (Lync)

on:
push:
Expand All @@ -9,18 +9,28 @@ jobs:

deploy:
name: Deploy
runs-on: ubuntu-latest
runs-on: windows-latest
steps:
- name: Checkout code

- name: Install Node.js
uses: actions/setup-node@v3

- name: Checkout repo
uses: actions/checkout@v3

- name: Checkout Lync
uses: actions/checkout@master
with:
repository: Iron-Stag-Games/Lync
path: Lync

- uses: ok-nick/setup-aftman@v0.3.0
name: Install Aftman
with:
token: ${{ secrets.GITHUB_TOKEN }}

- run: wally install
- run: rojo build -o game.rbxlx

- run: node "Lync/Lync/index.js" lync.project.json OFFLINE

- run: rbxcloud experience publish -f game.rbxlx -p ${{ secrets.PROD_PLACE_ID }} -u ${{ secrets.PROD_UNIVERSE_ID }} -t published -a ${{ secrets.API_KEY }}
22 changes: 16 additions & 6 deletions .github/workflows/deploy_stage.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Deploy Stage
name: Deploy Stage (Lync)

on:
push:
Expand All @@ -9,18 +9,28 @@ jobs:

deploy:
name: Deploy
runs-on: ubuntu-latest
runs-on: windows-latest
steps:
- name: Checkout code

- name: Install Node.js
uses: actions/setup-node@v3

- name: Checkout repo
uses: actions/checkout@v3

- name: Checkout Lync
uses: actions/checkout@master
with:
repository: Iron-Stag-Games/Lync
path: Lync

- uses: ok-nick/setup-aftman@v0.3.0
name: Install Aftman
with:
token: ${{ secrets.GITHUB_TOKEN }}

- run: wally install
- run: rojo build -o game.rbxlx

- run: node "Lync/Lync/index.js" lync.project.json OFFLINE

- run: rbxcloud experience publish -f game.rbxlx -p ${{ secrets.STAGE_PLACE_ID }} -u ${{ secrets.STAGE_UNIVERSE_ID }} -t published -a ${{ secrets.API_KEY }}
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,9 @@ temp/

*.rbxlx.lock
*.rbxl.lock

BuildScripts/Build/*

!BuildScripts/Build/.gitkeep

!default.base.rbxl
7 changes: 7 additions & 0 deletions .luaurc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"languageMode": "strict",
"lint": { "*": true, "LocalUnused": false, "FunctionUnused": false, "ImportUnused": false},
"lintErrors": true,
"typeErrors": true,
"globals": []
}
61 changes: 0 additions & 61 deletions .lune/extract.lua

This file was deleted.

68 changes: 68 additions & 0 deletions .lune/extract.luau
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
--[[

lune extract.luau

]]

local roblox = require("@lune/roblox")
local fs = require("@lune/fs")

local ignore = {
"Camera",
"Packages",
"Terrain",
}

local restrict = {}

local placeFile = fs.readFile(".lune/map.rbxl")
local game = roblox.deserializePlace(placeFile)

local function check(name, checkArr)
for _, c in pairs(checkArr) do
if c == name then
return true
end
end
return false
end

local function isFile(name: string)
-- print(name)
if fs.isFile(name .. ".rbxm") then
return true
else
return false
end
end

local function main(save: string, loc)
local Models = loc
fs.writeDir(save)

for _, entryName in fs.readDir(save) do
if fs.isFile(entryName) then
fs.removeFile(entryName)
end
end

for _, model in ipairs(Models:GetChildren()) do
print(model.Name)
if not check(model.Name, ignore) then
if isFile(save .. model.Name) and not check(model.Name, restrict) then
local i = 0
repeat
i = i + 1
until not isFile(save .. model.Name .. i)

fs.writeFile(save .. model.Name .. i .. ".rbxm", roblox.serializeModel({model}))
else
fs.writeFile(save .. model.Name .. ".rbxm", roblox.serializeModel({model}))
end
end
end
end

main("assets/Workspace/", game.Workspace)
main("assets/Lighting/", game.Lighting)
main("assets/ServerStorage/", game.ServerStorage)
38 changes: 0 additions & 38 deletions .lune/lighting-extract.lua

This file was deleted.

44 changes: 44 additions & 0 deletions .lune/lighting-extract.luau
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
--[[

lune lighting-extract.luau

]]

local roblox = require("@lune/roblox")
local fs = require("@lune/fs")

local save = "assets/Lighting/"

local placeFile = fs.readFile(".lune/map.rbxl")
local game = roblox.deserializePlace(placeFile)

local function isFile(name: string)
if fs.isFile(name .. ".rbxm") then
return true
else
return false
end
end

local Models = game.Lighting
fs.writeDir(save)

for _, entryName in fs.readDir(save) do
if fs.isFile(entryName) then
fs.removeFile(entryName)
end
end

for _, model in ipairs(Models:GetChildren()) do
print(model.Name)
if isFile(save .. model.Name) then
local i = 0
repeat
i = i + 1
until not isFile(save .. model.Name .. i)

fs.writeFile(save .. model.Name .. i .. ".rbxm", roblox.serializeModel({ model }))
else
fs.writeFile(save .. model.Name .. ".rbxm", roblox.serializeModel({ model }))
end
end
Binary file modified .lune/map.rbxl
Binary file not shown.
Loading