Skip to content

Jonny's new branch #345

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

Open
JonnyTheKing-3 wants to merge 28 commits into
base: master
Choose a base branch
from
Open

Jonny's new branch #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
5c9d120
SuperJump
JonnyTheKing-3 Apr 7, 2023
1a762ae
Merge branch 'master' into Jonny'sNewBranch
JonnyTheKing-3 Apr 8, 2023
c24f5c6
Updated Jump Script with a few things
JonnyTheKing-3 Apr 8, 2023
f2f339a
Merge branch 'master' into Jonny'sNewBranch
JonnyTheKing-3 Apr 11, 2023
122e845
Merge branch 'master' into Jonny'sNewBranch
JonnyTheKing-3 Apr 13, 2023
562b8f6
Merge branch 'master' into Jonny'sNewBranch
JonnyTheKing-3 Apr 28, 2023
c4ecab4
WindPush script
JonnyTheKing-3 Apr 29, 2023
ed60c97
Merge branch 'master' into Jonny'sNewBranch
JonnyTheKing-3 Apr 29, 2023
0dceb21
meta files + player action
poetahto May 25, 2023
81c1cef
merge
poetahto May 25, 2023
e9ff2f1
merge
poetahto Jun 6, 2023
778e0bc
style changes
poetahto Jun 6, 2023
d53d22d
Merge branch 'master' into Jonny'sNewBranch
JonnyTheKing-3 Jun 13, 2023
2ca147a
Started the Ghost-A-Light Brain script
JonnyTheKing-3 Jun 13, 2023
59a37ec
Merge branch 'Jonny'sNewBranch' of https://github.com/AztecGameLab/Lo…
JonnyTheKing-3 Jun 13, 2023
6b8830b
GhostALight Brain
JonnyTheKing-3 Jun 13, 2023
3adeb57
Merge branch 'master' into Jonny'sNewBranch
JonnyTheKing-3 Jun 20, 2023
cf8ef5c
Merge branch 'master' into Jonny'sNewBranch
JonnyTheKing-3 Jun 20, 2023
748098c
GhostALight Brain script finished
JonnyTheKing-3 Jun 20, 2023
aee6169
merge and testing
poetahto Jul 4, 2023
6d12c77
Merge branch 'master' into Jonny'sNewBranch
JonnyTheKing-3 Jul 12, 2023
fa848a7
Merge branch 'master' into Jonny'sNewBranch
JonnyTheKing-3 Jul 19, 2023
85d4a2f
Merge branch 'Jonny'sNewBranch' of https://github.com/AztecGameLab/Lo…
JonnyTheKing-3 Jul 20, 2023
4f3300c
ForestLake Aquanot testing
JonnyTheKing-3 Jul 20, 2023
365454f
Merge branch 'master' into Jonny'sNewBranch
JonnyTheKing-3 Jul 20, 2023
99f48ec
KillEnemy Script
JonnyTheKing-3 Jul 20, 2023
18e85d8
Merge branch 'master' into Jonny'sNewBranch
JonnyTheKing-3 Jul 26, 2023
198d931
Merge branch 'master' into Jonny'sNewBranch
JonnyTheKing-3 Aug 8, 2023
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
362 changes: 13 additions & 349 deletions Assets/Graphics/Characters/Gardenr/Gardener/Gardener.png.meta
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions Assets/Levels/Forest/ForestLake.meta
View file
Open in desktop

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

Loading