Skip to content

Attack animations #15

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.

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
wants to merge 152 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
152 commits
Select commit Hold shift + click to select a range
f1bf455
First Commit/Setup
kedrickfudala Sep 17, 2024
001c900
working demo
Gloocas Sep 21, 2024
2d33fa2
Fixed deprecated tilemap
kedrickfudala Sep 25, 2024
79dd52b
basic player controller, blank demo room added
Gloocas Sep 27, 2024
b87451d
Moved Changes from Vincent to Vincent2
VincentChan22 Sep 27, 2024
55ea080
Project Settings
JoeyGiordano Sep 28, 2024
3b58b10
Item Functionality First Try
JoeyGiordano Sep 28, 2024
9d8f0f4
Item and Stats Functionality
JoeyGiordano Sep 28, 2024
ba98c8d
Item and Stats Manager Refined Ready To Use
JoeyGiordano Sep 29, 2024
e090c2b
Merge branch 'develop' into Vincent2
VincentChan22 Sep 29, 2024
355c9a2
Merge pull request #1 from UVASGD/JoeyG_03
Gloocas Sep 29, 2024
7ffb7e8
Merge branch 'develop' of https://github.com/UVASGD/fall-2024-hallow-…
VincentChan22 Oct 3, 2024
9bdf7f8
Bump project version from 4.2 to 4.3
Arti-Dev Oct 3, 2024
15dc2fd
Delete old item script
Arti-Dev Oct 3, 2024
c0aa50f
Remove redundant player scene
Arti-Dev Oct 3, 2024
929426e
Create a very early item directory
Arti-Dev Oct 4, 2024
47f692b
Scene switching architecture
JoeyGiordano Oct 4, 2024
ca3be98
Push to avoid loss
JoeyGiordano Oct 6, 2024
d0f2581
Saving again
JoeyGiordano Oct 6, 2024
b556799
Fully Function GameContainer and Scene Switching
JoeyGiordano Oct 6, 2024
9e10f40
basic controller support
stick-h Oct 8, 2024
d20df23
Revert "basic controller support"
stick-h Oct 8, 2024
b6c0485
basic controller support
stick-h Oct 8, 2024
ff02992
Merge branch 'develop' into Vincent2
VincentChan22 Oct 9, 2024
e216db4
controls menu
stick-h Oct 9, 2024
0828d19
Some progress for item system with status effect
VincentChan22 Oct 10, 2024
518bbb6
Rename to item selector
Arti-Dev Oct 10, 2024
4c228c7
Update the early item selector
Arti-Dev Oct 10, 2024
5002123
Completed Workable Item StatusEffect system
VincentChan22 Oct 10, 2024
83a416b
Merge pull request #2 from UVASGD/JoeyG_03
Gloocas Oct 10, 2024
9a52b68
Add test item
Arti-Dev Oct 10, 2024
e079ae2
Create item button scene
Arti-Dev Oct 10, 2024
9e399e3
moved scripts to script folder
stick-h Oct 11, 2024
0f5ade6
controller input remapping
stick-h Oct 11, 2024
646a971
automatic controller swapping
stick-h Oct 17, 2024
99cc9ec
Update settings.gd
stick-h Oct 17, 2024
e640bb4
Update settings.gd
stick-h Oct 17, 2024
277f7cc
Move item resources to their own directory
Arti-Dev Oct 17, 2024
0efb436
Automatically load items into menu
Arti-Dev Oct 18, 2024
6b1705d
Implemented Attack System (Might have Bugs)
lyrics00 Oct 18, 2024
45bb08d
Use a FlowContainer
Arti-Dev Oct 19, 2024
472c935
Make menu scrollable
Arti-Dev Oct 19, 2024
c87155f
Toggle Item Selector visibility
Arti-Dev Oct 19, 2024
fd09d12
Add ItemSelector to demoRoom
Arti-Dev Oct 19, 2024
0a1fa13
Organization
Arti-Dev Oct 19, 2024
da987a8
Fix a filepath error
Arti-Dev Oct 19, 2024
b7fc521
Added additional functions to the status effect system
VincentChan22 Oct 21, 2024
aacd1de
Merge branch 'develop' into Vincent2
VincentChan22 Oct 21, 2024
050d63b
Moved status effect initialization code from player to statusEffectMa…
VincentChan22 Oct 21, 2024
133f8cf
Merge pull request #6 from UVASGD/Vincent2
Gloocas Oct 24, 2024
d1bdfd4
Merge branch 'develop' into arti-item-selector
Gloocas Oct 24, 2024
ff65d4f
Merge pull request #5 from UVASGD/arti-item-selector
Gloocas Oct 24, 2024
e8be0bc
Merge branch 'develop' into Haseeb-01
Gloocas Oct 24, 2024
74e1fd0
Merge pull request #7 from UVASGD/Haseeb-01
Gloocas Oct 24, 2024
acc9043
Add item selector portal
Arti-Dev Oct 26, 2024
ed7b7cc
Merge branch 'develop' into arti-item-selector
Arti-Dev Oct 26, 2024
379769b
Set demo room as main scene
Arti-Dev Oct 26, 2024
e567dd6
should be class_name
Arti-Dev Oct 26, 2024
0508b30
Change itemselector to only open when players stand in its portal
Arti-Dev Oct 26, 2024
78066d3
Merge pull request #8 from UVASGD/develop
stick-h Oct 26, 2024
5ca5c8c
small change
stick-h Oct 26, 2024
e36d67a
Update input_button.gd
stick-h Oct 26, 2024
cb516ed
Merge pull request #10 from UVASGD/Haseeb-01
stick-h Oct 26, 2024
4e76c3d
deviceID swapping upon controller disconnection
stick-h Oct 26, 2024
cbaa596
Finalized the Item system
VincentChan22 Oct 31, 2024
e9ee395
Commented out test input
VincentChan22 Oct 31, 2024
e695361
controls menu controller input display, scaling window fix
stick-h Nov 2, 2024
04cc65e
Update project.godot
stick-h Nov 2, 2024
2f3e960
Merge pull request #11 from UVASGD/Haseeb-01
Gloocas Nov 2, 2024
6cf144d
added projectile movement for mage
lyrics00 Nov 2, 2024
3a5a302
Merge branch 'develop' into Vincent5
Gloocas Nov 2, 2024
38041ef
Merge pull request #12 from UVASGD/Vincent5
Gloocas Nov 2, 2024
ced76dc
Merge pull request #13 from UVASGD/develop
stick-h Nov 2, 2024
44cf3e0
Update project.godot
stick-h Nov 2, 2024
562ae66
Revert "Update project.godot"
stick-h Nov 2, 2024
249acdb
Update project.godot
stick-h Nov 2, 2024
f0ce418
Revert "Update project.godot"
stick-h Nov 2, 2024
1231d6e
Revert "Merge pull request #13 from UVASGD/develop"
stick-h Nov 2, 2024
63a49ac
scene manager
kedrickfudala Nov 2, 2024
1a544ee
Reapply "Merge pull request #13 from UVASGD/develop"
stick-h Nov 2, 2024
cb6533c
Revert "Reapply "Merge pull request #13 from UVASGD/develop""
stick-h Nov 2, 2024
b2f2c8c
Merge branch 'develop' into Kuthan-02
lyrics00 Nov 2, 2024
7613a7b
Reapply "Reapply "Merge pull request #13 from UVASGD/develop""
stick-h Nov 2, 2024
3c73029
new item system bug fixes
stick-h Nov 2, 2024
240ccc7
made player dodge mechanics
lyrics00 Nov 7, 2024
26deb99
Merge pull request #14 from UVASGD/Haseeb-01
Arti-Dev Nov 8, 2024
23b9b44
Item Selector bugfixes
stick-h Nov 2, 2024
dcc3801
scene manager update, new font, working on tilemap
kedrickfudala Nov 8, 2024
13fa696
Merge branch 'Haseeb-01' of https://github.com/UVASGD/fall-2024-hallo…
stick-h Nov 8, 2024
3a790be
Added Framework for each character as well as animations and their ow…
lyrics00 Nov 8, 2024
c5e693d
settings menu bug fixes
stick-h Nov 9, 2024
9cc318c
character select work
kedrickfudala Nov 9, 2024
b7ef708
Add lots of animation files
Arti-Dev Nov 14, 2024
d4a4e82
Add walk/idle animations for ghost_kid
Arti-Dev Nov 14, 2024
f80ec2d
Rename animation method
Arti-Dev Nov 14, 2024
c156b37
Add ghost_monster sprites
Arti-Dev Nov 14, 2024
ab3e445
Add pumpkin kid sprites
Arti-Dev Nov 14, 2024
4b23eec
select screen
kedrickfudala Nov 15, 2024
44c5706
test player script update
quintinlevy Nov 15, 2024
2d063b4
added all player script parts
quintinlevy Nov 15, 2024
d89664a
Hurtbox and Hitbox
quintinlevy Nov 15, 2024
88bb002
projectile skeleton
quintinlevy Nov 16, 2024
23cd7bb
attacking not finished
quintinlevy Nov 16, 2024
af92d85
add attack scenes
quintinlevy Nov 16, 2024
6da3e3a
Add ghost kid attack animations
Arti-Dev Nov 16, 2024
f9f3371
fixed character select
kedrickfudala Nov 16, 2024
ff9ce33
test player attack
quintinlevy Nov 16, 2024
8c40fec
Merge pull request #20 from UVASGD/Haseeb-01
Gloocas Nov 16, 2024
e64faf6
Merge pull request #21 from UVASGD/arti-animation-player
Gloocas Nov 16, 2024
f2c233c
thinking before testing
quintinlevy Nov 16, 2024
38c4495
empty
quintinlevy Nov 16, 2024
71c9277
character select background
kedrickfudala Nov 16, 2024
16f2310
get rid of useless method
quintinlevy Nov 16, 2024
95e341f
please dont break, changed code:
quintinlevy Nov 16, 2024
24ae5a3
removed useless function
quintinlevy Nov 16, 2024
82346ae
Merge pull request #22 from UVASGD/develop
stick-h Nov 16, 2024
285bc6d
hasseb controls implemented
quintinlevy Nov 16, 2024
d58e9eb
some changes to player scripts to add extra movement animations.
lyrics00 Nov 16, 2024
8773726
fixed vector issue
quintinlevy Nov 16, 2024
7ac64ba
Merge branch 'develop' into Quintin_3
Arti-Dev Nov 16, 2024
04ee009
player attacks implemented
quintinlevy Nov 16, 2024
626c975
settings menu visual changes
stick-h Nov 16, 2024
6388f2d
Merge pull request #23 from UVASGD/Ked
kedrickfudala Nov 16, 2024
35d6d29
Merge branch 'develop' into Quintin_3
kedrickfudala Nov 16, 2024
87e8b1a
Merge pull request #24 from UVASGD/Quintin_3
kedrickfudala Nov 16, 2024
a1d65b7
Merge branch 'develop' into Haseeb-01
kedrickfudala Nov 16, 2024
d383541
Merge pull request #25 from UVASGD/Haseeb-01
kedrickfudala Nov 16, 2024
a2a8d84
BIG MERGE
kedrickfudala Nov 16, 2024
0e050d0
Merge pull request #28 from UVASGD/Ked
kedrickfudala Nov 16, 2024
62a6b6e
removed temp files
kedrickfudala Nov 16, 2024
52e89fa
Merge pull request #29 from UVASGD/Ked
kedrickfudala Nov 16, 2024
0177f26
Update game_container.gd
stick-h Nov 16, 2024
3d1cc0f
Merge pull request #30 from UVASGD/develop
stick-h Nov 16, 2024
b919bd1
Moved changes from Vincent6
VincentChan22 Nov 16, 2024
255586b
Merge pull request #31 from UVASGD/Vincent6
VincentChan22 Nov 16, 2024
bb8951c
Fixed bug due to legacy code
VincentChan22 Nov 16, 2024
08033d4
Merge pull request #32 from UVASGD/Vincent6
VincentChan22 Nov 16, 2024
9d4b118
Added item logic into player and attempted to connect stuff
VincentChan22 Nov 16, 2024
8d2b9c1
Minor changes to remove some warnings
VincentChan22 Nov 16, 2024
aacc8b7
A fix for the item system in player script
VincentChan22 Nov 16, 2024
9b73cca
hopefully fixed the item stat to use the new stats system
VincentChan22 Nov 16, 2024
5a9fec9
Merge pull request #33 from UVASGD/Vincent6
Gloocas Nov 16, 2024
68bf9fc
player instantiation and collision
stick-h Nov 16, 2024
1a86846
Update character_select.gd
stick-h Nov 16, 2024
bbe4c25
Added statuseffects
VincentChan22 Nov 16, 2024
bd72ed9
Merge branch 'develop' into Haseeb-01
stick-h Nov 16, 2024
5d7b205
Merge pull request #36 from UVASGD/Haseeb-01
stick-h Nov 16, 2024
fd8ce90
Update project.godot
stick-h Nov 16, 2024
df1eafd
Merge pull request #37 from UVASGD/Haseeb-01
stick-h Nov 16, 2024
15a2a83
Merge branch 'develop' into Vincent6
Gloocas Nov 16, 2024
6538cf6
Merge pull request #38 from UVASGD/Vincent6
Gloocas Nov 16, 2024
efd6bf3
Made some attack animations functionality and made the walk for the g…
3amBEANS Nov 16, 2024
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
  •  
  •  
  •  
Binary file added .DS_Store
Binary file not shown.
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Normalize EOL for all files that Git considers text files.
* text=auto eol=lf
61 changes: 2 additions & 59 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,59 +1,2 @@
# This .gitignore file should be placed at the root of your Unity project directory
#
# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
#
/[Ll]ibrary/
/[Tt]emp/
/[Oo]bj/
/[Bb]uild/
/[Bb]uilds/
/[Ll]ogs/
/[Mm]emoryCaptures/

# Never ignore Asset meta data
!/[Aa]ssets/**/*.meta

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

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

# Visual Studio cache directory
.vs/

# Gradle cache directory
.gradle/

# Autogenerated VS/MD/Consulo solution and project files
ExportedObj/
.consulo/
*.csproj
*.unityproj
*.sln
*.suo
*.tmp
*.user
*.userprefs
*.pidb
*.booproj
*.svd
*.pdb
*.mdb
*.opendb
*.VC.db

# Unity3D generated meta files
*.pidb.meta
*.pdb.meta
*.mdb.meta

# Unity3D generated file on crash reports
sysinfo.txt

# Builds
*.apk
*.unitypackage

# Crashlytics generated file
crashlytics-build.properties
# Godot 4+ specific ignores
.godot/
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# ProjectTemplate
This is a project template for SGD semester projects.
# Hallow's Thief

This is a Github repository for Hallow's Thief, an SGD semester project.
Binary file added assets/backgrounds/Character_Selection.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions assets/backgrounds/Character_Selection.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://c44cemfbuaipe"
path="res://.godot/imported/Character_Selection.png-684af16c22119085af579684ddf35e83.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/backgrounds/Character_Selection.png"
dest_files=["res://.godot/imported/Character_Selection.png-684af16c22119085af579684ddf35e83.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file added assets/fonts-shaders/Ldfcomicsans-jj7l.ttf
Binary file not shown.
34 changes: 34 additions & 0 deletions assets/fonts-shaders/Ldfcomicsans-jj7l.ttf.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="font_data_dynamic"
type="FontFile"
uid="uid://dinbulumadtqh"
path="res://.godot/imported/Ldfcomicsans-jj7l.ttf-91ce707e677e5335108a5932834a8d03.fontdata"

[deps]

source_file="res://assets/fonts-shaders/Ldfcomicsans-jj7l.ttf"
dest_files=["res://.godot/imported/Ldfcomicsans-jj7l.ttf-91ce707e677e5335108a5932834a8d03.fontdata"]

[params]

Rendering=null
antialiasing=1
generate_mipmaps=false
disable_embedded_bitmaps=true
multichannel_signed_distance_field=false
msdf_pixel_range=8
msdf_size=48
allow_system_fallback=true
force_autohinter=false
hinting=1
subpixel_positioning=1
oversampling=0.0
Fallbacks=null
fallbacks=[]
Compress=null
compress=true
preload=[]
language_support={}
script_support={}
opentype_features={}
Binary file added assets/fonts-shaders/PixelifySans-Regular.ttf
Binary file not shown.
34 changes: 34 additions & 0 deletions assets/fonts-shaders/PixelifySans-Regular.ttf.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="font_data_dynamic"
type="FontFile"
uid="uid://sdvvpxumorh1"
path="res://.godot/imported/PixelifySans-Regular.ttf-348002a40cc069bffb958eca7ae41d5b.fontdata"

[deps]

source_file="res://assets/fonts-shaders/PixelifySans-Regular.ttf"
dest_files=["res://.godot/imported/PixelifySans-Regular.ttf-348002a40cc069bffb958eca7ae41d5b.fontdata"]

[params]

Rendering=null
antialiasing=1
generate_mipmaps=false
disable_embedded_bitmaps=true
multichannel_signed_distance_field=false
msdf_pixel_range=8
msdf_size=48
allow_system_fallback=true
force_autohinter=false
hinting=1
subpixel_positioning=1
oversampling=0.0
Fallbacks=null
fallbacks=[]
Compress=null
compress=true
preload=[]
language_support={}
script_support={}
opentype_features={}
Binary file added assets/tiles/BaseRoomTiles.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions assets/tiles/BaseRoomTiles.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://cqcwfcwamles7"
path="res://.godot/imported/BaseRoomTiles.png-9f9348003549d369951a9f03b7c612df.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/tiles/BaseRoomTiles.png"
dest_files=["res://.godot/imported/BaseRoomTiles.png-9f9348003549d369951a9f03b7c612df.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
1 change: 1 addition & 0 deletions icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 37 additions & 0 deletions icon.svg.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://dekh4a6t8uq3j"
path="res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://icon.svg"
dest_files=["res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
svg/scale=1.0
editor/scale_with_editor_scale=false
editor/convert_colors_with_editor_theme=false
Loading