Skip to content

Liz #8

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
Throjnx wants to merge 14 commits into
base: main
Choose a base branch
from
Open

Liz #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d213c00
Making new branch
elizabethleia Dec 13, 2022
528153f
Added ground texture
elizabethleia Dec 14, 2022
d2abbfa
Merge pull request #7 from elizabethleia/Eliz_branch
ClementLSW Dec 14, 2022
ccde72c
boop
otmpx Dec 14, 2022
83e7717
Please WORK
Throjnx Dec 14, 2022
a23746a
Merge branch 'main' into Liz
Throjnx Dec 14, 2022
314c5a0
Merge remote-tracking branch 'origin/Owen' into Liz
Throjnx Dec 15, 2022
a7fc18d
Merge branch 'main' into Liz
Throjnx Dec 15, 2022
1d58fc3
why are there so many conflicts :(
Throjnx Dec 15, 2022
38807d6
why are there compile errors aaah
Throjnx Dec 15, 2022
be32901
Revert "Merge branch 'main' into Liz"
Throjnx Dec 15, 2022
5ddcec4
Revert "why are there compile errors aaah"
Throjnx Dec 15, 2022
d2c6029
Overwriting my branch with main pls work
Throjnx Dec 15, 2022
cb88bc1
fuck it I'm posting on main from now on :(
Throjnx Dec 15, 2022
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
0 Assets/Sprites/Textures.meta → Assets/Materials/Textures.meta
View file
Open in desktop
File renamed without changes.
0 ...s/Sprites/Textures/Ground003_2K_Color.jpg → ...Materials/Textures/Ground003_2K_Color.jpg
View file
Open in desktop
File renamed without changes
0 ...ites/Textures/Ground003_2K_Color.jpg.meta → ...ials/Textures/Ground003_2K_Color.jpg.meta
View file
Open in desktop
File renamed without changes.
0 ...s/Sprites/Textures/Ground057_2K_Color.jpg → ...Materials/Textures/Ground057_2K_Color.jpg
View file
Open in desktop
File renamed without changes
0 ...ites/Textures/Ground057_2K_Color.jpg.meta → ...ials/Textures/Ground057_2K_Color.jpg.meta
View file
Open in desktop
File renamed without changes.
0 .../Sprites/Textures/Leather027_2K_Color.jpg → ...aterials/Textures/Leather027_2K_Color.jpg
View file
Open in desktop
File renamed without changes
0 ...tes/Textures/Leather027_2K_Color.jpg.meta → ...als/Textures/Leather027_2K_Color.jpg.meta
View file
Open in desktop
File renamed without changes.
0 ...ts/Sprites/Textures/Metal027_2K_Color.jpg → .../Materials/Textures/Metal027_2K_Color.jpg
View file
Open in desktop
File renamed without changes
0 ...rites/Textures/Metal027_2K_Color.jpg.meta → ...rials/Textures/Metal027_2K_Color.jpg.meta
View file
Open in desktop
File renamed without changes.
0 ...s/Sprites/Textures/Metal046B_2K_Color.jpg → ...Materials/Textures/Metal046B_2K_Color.jpg
View file
Open in desktop
File renamed without changes
0 ...ites/Textures/Metal046B_2K_Color.jpg.meta → ...ials/Textures/Metal046B_2K_Color.jpg.meta
View file
Open in desktop
File renamed without changes.
Binary file added Assets/Materials/Textures/groundtexture.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
135 changes: 135 additions & 0 deletions Assets/Materials/Textures/groundtexture.png.meta
View file
Open in desktop

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

0 Assets/Sprites/Textures/tree_air.png → Assets/Materials/Textures/tree_air.png
View file
Open in desktop
File renamed without changes
16 changes: 2 additions & 14 deletions Assets/Sprites/Textures/tree_air.png.meta → Assets/Materials/Textures/tree_air.png.meta
View file
Open in desktop

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

0 Assets/Sprites/Textures/tree_earth.png → Assets/Materials/Textures/tree_earth.png
View file
Open in desktop
File renamed without changes
16 changes: 2 additions & 14 deletions Assets/Sprites/Textures/tree_earth.png.meta → ...ts/Materials/Textures/tree_earth.png.meta
View file
Open in desktop

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

0 Assets/Sprites/Textures/tree_fire.png → Assets/Materials/Textures/tree_fire.png
View file
Open in desktop
File renamed without changes
16 changes: 2 additions & 14 deletions Assets/Sprites/Textures/tree_fire.png.meta → Assets/Materials/Textures/tree_fire.png.meta
View file
Open in desktop

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

0 Assets/Sprites/Textures/tree_water.png → Assets/Materials/Textures/tree_water.png
View file
Open in desktop
File renamed without changes
16 changes: 2 additions & 14 deletions Assets/Sprites/Textures/tree_water.png.meta → ...ts/Materials/Textures/tree_water.png.meta
View file
Open in desktop

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

78 changes: 0 additions & 78 deletions Assets/Prefabs/ChargeIcon.prefab
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Assets/Prefabs/Enemies/FSM Test.prefab.meta
View file
Open in desktop

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

12 changes: 12 additions & 0 deletions Assets/Prefabs/PrimaryAbilities.meta
View file
Open in desktop

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

Loading