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.

Sign up for GitHub

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

Merge cy-dev into nazy00-dev #19

Merged
merged 21 commits into from
Mar 31, 2024
Merged

Merge cy-dev into nazy00-dev #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
31c44cf
Merge pull request #10 from cybardev/spawner-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
62fc233
re: gitignore and package changes
cybardev Mar 30, 2024
6cc93d4
feat: add TextMeshPro for menu text
cybardev Mar 30, 2024
aa4d4f5
feat: add scripts for main menu
cybardev Mar 30, 2024
7224a67
re: add menu graphics
cybardev Mar 30, 2024
72f883b
feat: add main menu
cybardev Mar 30, 2024
ee4d4c6
feat: add game title to main menu
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
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,6 @@ crashlytics-build.properties
# Temporary auto-generated Android Assets
/[Aa]ssets/[Ss]treamingAssets/aa.meta
/[Aa]ssets/[Ss]treamingAssets/aa/*

# MacOS DS_Store
.DS_Store
72 changes: 0 additions & 72 deletions Assets/Animations/GechoEnemy.controller
View file
Open in desktop

This file was deleted.

Loading