Skip to content

Light sources interaction #581

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

Draft
Ayomideabdulazeez wants to merge 28 commits into
base: dev
Choose a base branch
from
Draft

Light sources interaction #581

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
81120f7
lightsources forward and top animations added
Ayomideabdulazeez Nov 16, 2023
f4588a4
Removed corrupted player scene
Ayomideabdulazeez Dec 23, 2023
dffb889
Merge branch 'dev' into light_sources_interaction
Ayomideabdulazeez Dec 23, 2023
a9851b7
Some basic fixes to light sources branch
Ayomideabdulazeez Dec 23, 2023
b5a8f7a
Mainhand interaction implemented
Ayomideabdulazeez Dec 23, 2023
0bd61e2
More changes to interactable light sources hold animations
Ayomideabdulazeez Dec 23, 2023
66310ce
Finished interactable light source holdings
Ayomideabdulazeez Dec 23, 2023
fa73cfa
Merge branch 'dev' into light_sources_interaction
Ayomideabdulazeez Dec 30, 2023
5c29117
Added new torch and lantern hold animations
Ayomideabdulazeez Dec 30, 2023
a3e56dd
Offhand interactable light animations added
Ayomideabdulazeez Dec 30, 2023
643aed6
Some more light sources changes done
Ayomideabdulazeez Dec 30, 2023
58c38fd
Made some few changes and updates
Ayomideabdulazeez Dec 30, 2023
82d5eb6
Added a value for use_hold_treshold
Ayomideabdulazeez Jan 5, 2024
e172ce5
Merge remote-tracking branch 'upstream/dev' into light_sources_intera…
Ayomideabdulazeez Jan 6, 2024
f1cca89
Merge remote-tracking branch 'upstream/dev' into light_sources_intera…
Ayomideabdulazeez Jan 6, 2024
d20b8e5
Merge branch 'dev' into light_sources_interaction
Ayomideabdulazeez Jan 14, 2024
3064b70
Added the new torch.glb animations for light sources holding
Ayomideabdulazeez Jan 14, 2024
06a13b7
removed torch.glb unnecessary glb file
Ayomideabdulazeez Jan 14, 2024
04319b9
Removed on timer timout from the candle.gd
Ayomideabdulazeez Jan 14, 2024
67168c6
cleaned up the light sources script and made the light source interac…
Ayomideabdulazeez Jan 14, 2024
66c3792
Allow turning off the light with the light sources
Ayomideabdulazeez Jan 14, 2024
14d0bb1
Doing the player.tscn cleanups
Ayomideabdulazeez Jan 14, 2024
9383778
Dev player added
Ayomideabdulazeez Jan 14, 2024
edcab39
Player animation cleanups done
Ayomideabdulazeez Jan 14, 2024
dcd53c4
Merge branch 'dev' into light_sources_interaction
Ayomideabdulazeez Jan 18, 2024
c739d0e
You can now hold 2 items at once
Ayomideabdulazeez Jan 21, 2024
e8be6bb
Added more logic to the weapon holding
Ayomideabdulazeez Jan 21, 2024
673fe76
Some item holding changes done
Ayomideabdulazeez Jan 24, 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
344 changes: 172 additions & 172 deletions resources/animations/item_holding_horizontal_left.tres
View file
Open in desktop

Large diffs are not rendered by default.

345 changes: 172 additions & 173 deletions resources/animations/item_holding_horizontal_right.tres
View file
Open in desktop

Large diffs are not rendered by default.

344 changes: 172 additions & 172 deletions resources/animations/item_holding_vertical_left.tres
View file
Open in desktop

Large diffs are not rendered by default.

344 changes: 172 additions & 172 deletions resources/animations/item_holding_vertical_right.tres
View file
Open in desktop

Large diffs are not rendered by default.

1,202 changes: 1,202 additions & 0 deletions resources/animations/lantern_top.tres
View file
Open in desktop

Large diffs are not rendered by default.

1,202 changes: 1,202 additions & 0 deletions resources/animations/lantern_top_forward.tres
View file
Open in desktop

Large diffs are not rendered by default.

1,202 changes: 1,202 additions & 0 deletions resources/animations/lantern_top_forward_left.tres
View file
Open in desktop

Large diffs are not rendered by default.

1,202 changes: 1,202 additions & 0 deletions resources/animations/lantern_top_left.tres
View file
Open in desktop

Large diffs are not rendered by default.

1,202 changes: 1,202 additions & 0 deletions resources/animations/torch_top.tres
View file
Open in desktop

Large diffs are not rendered by default.

1,202 changes: 1,202 additions & 0 deletions resources/animations/torch_top_forwards.tres
View file
Open in desktop

Large diffs are not rendered by default.

1,202 changes: 1,202 additions & 0 deletions resources/animations/torch_top_forwards_left.tres
View file
Open in desktop

Large diffs are not rendered by default.

1,202 changes: 1,202 additions & 0 deletions resources/animations/torch_top_left.tres
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions resources/models/characters/movement_and_aiming.glb
View file
Open in desktop

This file was deleted.

Loading