Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
7dc509b
Merge pull request #5 from cybardev/main
cybardev Mar 9, 2024
4672436
re: update meta
nazy00 Mar 9, 2024
89da583
Merge branch 'nazy00-dev' of https://github.com/cybardev/Noctrun into…
nazy00 Mar 9, 2024
6fd49ec
re: unity artifacts
cybardev Mar 9, 2024
3359a61
Merge pull request #9 from cybardev/cy-dev
cybardev Mar 9, 2024
d2b0b69
re: moving background, directory tree
cybardev Mar 9, 2024
8bc782b
re: remove redundancies
cybardev Mar 9, 2024
2f690b1
feat: added gecho enemy
nazy00 Mar 16, 2024
ba541e6
fix: despawner behaviour
cybardev Mar 16, 2024
06115d8
Merge branch 'cy-dev' into spawner-dev
cybardev Mar 17, 2024
77c6a0b
Merge branch 'Romina03-dev' into cy-dev
cybardev Mar 17, 2024
a37cf63
feat: create enemy prefab, update directory structure
nazy00 Mar 23, 2024
31c44cf
Merge pull request #10 from cybardev/spawner-dev
cybardev Mar 23, 2024
3ddf432
re: consistent layer naming
nazy00 Mar 23, 2024
52621d2
re: consistent ground colour
nazy00 Mar 23, 2024
2e3aed9
Merge branch 'spawner-dev' into nazy00-dev
cybardev Mar 23, 2024
56f7da8
Merge pull request #13 from cybardev/nazy00-dev
cybardev Mar 23, 2024
c7789fb
feat: diversify enemy prefabs
nazy00 Mar 23, 2024
3ab69f8
Merge branch 'spawner-dev' of https://github.com/cybardev/Noctrun int…
nazy00 Mar 23, 2024
593db4d
feat: added enemy sprites
nazy00 Mar 26, 2024
9de0340
re: moving sprite files
nazy00 Mar 26, 2024
39e8657
re: gitignore and package changes
cybardev Mar 30, 2024
cbbfc26
Merge pull request #18 from cybardev/Romina03-dev
Romina03 Mar 31, 2024
da69450
re: gitignore and package changes
cybardev Mar 30, 2024
6590e26
re: remove redundant folder
cybardev Mar 31, 2024
a30cef8
re: adjust enemy scale
cybardev Mar 31, 2024
efea0ca
Merge pull request #15 from cybardev/spawner-dev
cybardev Mar 31, 2024
231abb7
feat: add death screen
cybardev Mar 31, 2024
09b1a3b
re: unity settings update
cybardev Mar 31, 2024
03efb74
re: consistent tag names
cybardev Mar 31, 2024
6eb1818
Merge pull request #19 from cybardev/cy-dev
cybardev Mar 31, 2024
3e005d6
Merge pull request #20 from cybardev/nazy00-dev
cybardev Mar 31, 2024
54499bc
Revert "Various updates"
cybardev Mar 31, 2024
3ca7824
re: gitignore and package changes
cybardev Mar 30, 2024
e69be2b
Merge pull request #21 from cybardev/revert-20-nazy00-dev
cybardev Mar 31, 2024
299aed7
re: remove redundantly tracked files
cybardev Mar 31, 2024
2c0183d
Merge pull request #22 from cybardev/nazy00-dev
cybardev Mar 31, 2024
3d8f580
Merge pull request #23 from cybardev/main
cybardev Mar 31, 2024
a9bf586
Merge pull request #24 from cybardev/cy-dev
cybardev Mar 31, 2024
0395ff2
Merge pull request #20 from cybardev/nazy00-dev
cybardev Mar 31, 2024
9d6cb5d
re: remove redundantly tracked files
cybardev Mar 31, 2024
dffb7b9
re: adjust enemy tags
cybardev Mar 30, 2024
21c8d42
Merge pull request #25 from cybardev/main
cybardev Mar 31, 2024
700d669
feat: ignore TextMeshPro files from language stats
cybardev Mar 31, 2024
d9866e6
Update .gitattributes
cybardev Mar 31, 2024
d2c40a5
feat: add game icon to build
cybardev Apr 1, 2024
6613583
feat: create build workflow
cybardev Apr 1, 2024
2c7e92f
re: only enable macOS and WebGL builds for now
cybardev Apr 1, 2024
bfe653b
feat: deploy WebGL build to GitHub Pages
cybardev Apr 1, 2024
4a9463e
fix: typo
cybardev Apr 1, 2024
84967f7
re: give name to deploy job
cybardev Apr 1, 2024
8d26e97
fix: update upload artifact workflow version
cybardev Apr 1, 2024
10955aa
re: re-enable Windows and Linux builds
cybardev Apr 1, 2024
1028d18
feat: auto rebuild on PR merge to main
cybardev Apr 1, 2024
e634254
fix: use simpler deploy step for WebGL
cybardev Apr 1, 2024
12391b3
Create CNAME
cybardev Apr 1, 2024
f872e0c
fix: use proper token permissions
cybardev Apr 1, 2024
4648f3b
Merge branch 'main' of github.com:cybardev/Noctrun
cybardev Apr 1, 2024
eae9acd
re: remove CNAME from main
cybardev Apr 1, 2024
8b3adb9
re: add names to workflow steps
cybardev Apr 1, 2024
22b2253
fix: token permissions
cybardev Apr 1, 2024
7bcc820
fix: publish correct directory to GitHub Pages
cybardev Apr 1, 2024
9ccaf4d
feat: add cname for custom domain
cybardev Apr 1, 2024
6a6f93f
fix: use no compression
cybardev Apr 1, 2024
76269b0
feat: add player sprites, fix player movement
nazy00 Apr 1, 2024
3140665
feat: fix enemy collider
nazy00 Apr 1, 2024
cd89a2f
re: change speed values
nazy00 Apr 2, 2024
a6122a6
Merge pull request #26 from cybardev/main
cybardev Apr 2, 2024
9fed8b5
Merge pull request #27 from cybardev/nazy00-dev
cybardev Apr 2, 2024
e3bd8bc
Merge pull request #28 from cybardev/cy-dev
cybardev Apr 2, 2024
ab13781
re: rename project in build settings and disable splash screen
cybardev Apr 2, 2024
3b35559
re: add member roles
cybardev Apr 2, 2024
b3cba83
feat: add falling sprite
nazy00 Apr 2, 2024
6238c98
re: adjust player position
nazy00 Apr 2, 2024
59f5642
re: update var names to reflect enemy spawning
cybardev Apr 2, 2024
1f82529
feat: credits menu screen
cybardev Apr 2, 2024
c046a9e
re: formatting
cybardev Apr 2, 2024
002f486
Merge pull request #29 from cybardev/nazy00-dev
cybardev Apr 2, 2024
a54c56f
Merge branch 'cy-dev' of github.com:cybardev/Noctrun into cy-dev
cybardev Apr 2, 2024
b2706d6
fix: remove player land state at start
cybardev Apr 2, 2024
4102dfd
re: BG scroll speed consistent between UI and script
cybardev Apr 2, 2024
1dff481
re: enemy speed consistent between UI and script
cybardev Apr 2, 2024
5b6bdbc
re: scene config changes for last 3 commits
cybardev Apr 2, 2024
438ce3e
re: directory organization
cybardev Apr 2, 2024
e093b89
re: formatting
cybardev Apr 2, 2024
264e1f8
re: update var names to reflect enemy spawning
cybardev Apr 2, 2024
204f3e7
re: add eyes glowing in darkness
cybardev Apr 2, 2024
d62800a
re: edit btm enemy sprite
nazy00 Apr 2, 2024
adb29b8
re: edit top enemy sprite
nazy00 Apr 2, 2024
68f8b55
Merge branch 'nazy00-dev' into cy-dev
cybardev Apr 2, 2024
1e06376
Merge pull request #31 from cybardev/cy-dev
cybardev Apr 2, 2024
0612c18
re: add outline around player sprites
nazy00 Apr 2, 2024
3ec7ebd
Merge branch 'nazy00-dev' into cy-dev
cybardev Apr 2, 2024
8fb24fd
re: disable splash screen
cybardev Apr 2, 2024
3b7f6e3
fix: attach new sprites to player
cybardev Apr 2, 2024
19c2ea4
Merge pull request #33 from cybardev/cy-dev
cybardev Apr 2, 2024
920e298
re: switch to PWA template for WebGL
cybardev Apr 2, 2024
ba15d5a
re: switch to Default template for WebGL
cybardev Apr 2, 2024
f1ab9b4
Merge pull request #35 from cybardev/cy-dev
cybardev Apr 2, 2024
c8e48a3
fix: switch to Default WebGL template
cybardev Apr 2, 2024
9d38f94
Merge pull request #38 from cybardev/cybardev-patch-1
cybardev Apr 2, 2024
8041353
re: show relevant filetypes in VS Code
cybardev Apr 2, 2024
c4fc479
Merge pull request #39 from cybardev/cybardev-patch-2
cybardev Apr 2, 2024
b813c5c
Create LICENSE
cybardev Apr 2, 2024
54616fc
Merge pull request #40 from cybardev/add-license
cybardev Apr 2, 2024
8e48869
Update README.md
cybardev Apr 3, 2024
1dc7599
Merge pull request #41 from cybardev/license-info
cybardev Apr 3, 2024
cd19676
docs: add controls and credits section
cybardev Apr 7, 2024
213e69b
re: show PDFs in VS Code
cybardev Apr 7, 2024
c165ed8
docs: add controls and credits section
cybardev Apr 7, 2024
1a615dc
re: show PDFs in VS Code
cybardev Apr 7, 2024
a0e375d
Merge branch 'main' into cy-dev
cybardev Apr 7, 2024
21fb636
re: add menu control description
cybardev Apr 7, 2024
209ec62
Merge pull request #43 from cybardev/cy-dev
cybardev Apr 7, 2024
d5cd849
docs: update readme
cybardev Apr 7, 2024
020a2c2
docs: document known bug and add gameplay description
cybardev Apr 7, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# ignore TextMesh Pro files from language statistics
Assets/TextMesh[[:space:]]Pro/** linguist-vendored
72 changes: 72 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
name: Build and Upload Artifacts

on:
# Rebuild on merged pull requests
pull_request:
branches:
- main

# Allows running this workflow manually from the Actions tab
workflow_dispatch:

jobs:
build:
name: Build for ${{ matrix.targetPlatform }}
runs-on: ubuntu-latest
environment: build

# Grant GITHUB_TOKEN the permissions required to make a Pages deployment
permissions:
contents: write # to upload WebGL build to GitHub Pages
pages: write # to deploy to Pages
id-token: write # to verify the deployment originates from an appropriate source

strategy:
fail-fast: false
matrix:
targetPlatform:
- StandaloneWindows64 # Build for Windows
- StandaloneOSX # Build for macOS (Intel)
- StandaloneLinux64 # Build for Linux
- WebGL # Build for WebGL

steps:
# Checkout
- name: Checkout repository
uses: actions/checkout@v4
with:
lfs: false

# Cache
- name: Cache Unity packages
uses: actions/cache@v3
with:
path: Library
key: Library-${{ matrix.targetPlatform }}
restore-keys: Library-x

# Build
- name: Build with Unity Builder
uses: game-ci/unity-builder@v4
env:
UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
with:
targetPlatform: ${{ matrix.targetPlatform }}

# Output
- name: Upload build artifacts
uses: actions/upload-artifact@v4
with:
name: Build-${{ matrix.targetPlatform }}
path: build/${{ matrix.targetPlatform }}

# Deploy (WebGL)
- name: Deploy WebGL build to GitHub Pages
if: ${{ matrix.targetPlatform == 'WebGL' }}
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./build/WebGL/WebGL/
cname: noctrun.cybar.dev
11 changes: 2 additions & 9 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,12 @@
"**/*.unityproj": true,
"**/*.dll": true,
"**/*.exe": true,
"**/*.pdf": true,
"**/*.pdf": false,
"**/*.mid": true,
"**/*.midi": true,
"**/*.wav": true,
"**/*.gif": true,
"**/*.ico": true,
"**/*.jpg": true,
"**/*.jpeg": true,
"**/*.png": true,
"**/*.psd": true,
"**/*.tga": true,
"**/*.tif": true,
Expand All @@ -36,13 +33,10 @@
"**/*.MA": true,
"**/*.obj": true,
"**/*.OBJ": true,
"**/*.asset": true,
"**/*.cubemap": true,
"**/*.flare": true,
"**/*.mat": true,
"**/*.meta": true,
"**/*.prefab": true,
"**/*.unity": true,
"build/": true,
"Build/": true,
"Library/": true,
Expand All @@ -51,10 +45,9 @@
"Obj/": true,
"Logs/": true,
"logs/": true,
"ProjectSettings/": true,
"UserSettings/": true,
"temp/": true,
"Temp/": true
},
"dotnet.defaultSolution": "Noctrun.sln"
}
}
8 changes: 8 additions & 0 deletions Assets/Images/Backgrounds/Materials.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

132 changes: 132 additions & 0 deletions Assets/Images/Backgrounds/Materials/forest.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: forest
m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: ced44b3ff5bc2d32688bb1b004a1cde9, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: ced44b3ff5bc2d32688bb1b004a1cde9, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AlphaClip: 0
- _AlphaToMask: 0
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
--- !u!114 &5658781130037677613
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
8 changes: 8 additions & 0 deletions Assets/Images/Backgrounds/Materials/forest.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Assets/Images/Backgrounds/forest.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions Assets/Images/Backgrounds/forest.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Assets/Images/Backgrounds/menu-bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions Assets/Images/Sprites/Enemies.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/Images/Sprites/Enemies/gecho.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading