Skip to content

Tower defense #1

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

Tower defense #1

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
70bf881
Adds global vars, basic enemy spawning and pathing, some placeholders
cyu2019 Oct 5, 2022
7ad63b5
Adds 3D + shaking + some refactoring
cyu2019 Oct 15, 2022
f59b5da
Ignores library and hopefully fixes things
cyu2019 Oct 15, 2022
00a064f
fix libraries please
cyu2019 Oct 15, 2022
22b2c62
add Start and End UI
Oct 15, 2022
50bd3f0
fixes merges, ignores correct folders
Oct 15, 2022
63b497a
health bar addition
RiptideStar Oct 15, 2022
ff40824
Merge branch 'tower-defense' of github.com:pennupgrade/MinigameCollec…
RiptideStar Oct 15, 2022
74ae50e
Adds towers
cyu2019 Oct 15, 2022
6694ec6
fixing merge conflicts
cyu2019 Oct 15, 2022
b0e1e91
please remove logs and library once and for all
cyu2019 Oct 15, 2022
d500566
I left in a merge conflict i am dumb
cyu2019 Oct 15, 2022
c055b1f
Some tower fixes, MVP done
cyu2019 Oct 15, 2022
316d543
Adds Lighting, Button Sprites, Recorded MVP video
cyu2019 Oct 16, 2022
7577cff
10/22 changes, adds upgrading, ground texture, enemy sprites, various…
cyu2019 Oct 23, 2022
cb9ba54
fixes extra spawns bug
cyu2019 Nov 5, 2022
1da452c
Adds air strike, time slow, different enemy types
cyu2019 Nov 13, 2022
205f083
Better Tower AI, start UI, I forget what else I changed
cyu2019 Nov 14, 2022
94bfe74
adds sounds and some other small improvements
cyu2019 Nov 19, 2022
b5c4cad
cost balancing
cyu2019 Nov 19, 2022
b24e6a8
joaefjawoiven
cyu2019 Nov 19, 2022
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
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
31 changes: 20 additions & 11 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,35 @@
#
# Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore
#
/[Ll]ibrary/
/[Tt]emp/
/[Oo]bj/
/[Bb]uild/
/[Bb]uilds/
/[Ll]ogs/
/[Uu]ser[Ss]ettings/
./Library/
./Temp/
./Obj/
./Build/
./Builds/
./Logs/
./UserSettings/

Library/
Temp/
Obj/
Build/
Builds/
Logs/
UserSettings/


# MemoryCaptures can get excessive in size.
# They also could contain extremely sensitive data
/[Mm]emoryCaptures/
./MemoryCaptures/

# Recordings can get excessive in size
/[Rr]ecordings/
./Recordings/

# Uncomment this line if you wish to ignore the asset store tools plugin
# /[Aa]ssets/AssetStoreTools*
# /Assets/AssetStoreTools*

# Autogenerated Jetbrains Rider plugin
/[Aa]ssets/Plugins/Editor/JetBrains*
Assets/Plugins/Editor/JetBrains*

# Visual Studio cache directory
.vs/
Expand Down
8 changes: 8 additions & 0 deletions Assets/TowerDefense.meta
View file
Open in desktop

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

8 changes: 8 additions & 0 deletions Assets/TowerDefense/3d.meta
View file
Open in desktop

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

Binary file added Assets/TowerDefense/3d/MiniGame_BG_Scene.fbx
View file
Open in desktop
Binary file not shown.
106 changes: 106 additions & 0 deletions Assets/TowerDefense/3d/MiniGame_BG_Scene.fbx.meta
View file
Open in desktop

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

Loading