Amel
17dfe054
updated interaction manager
4 年前
Amel
d9da131e
Added interaction UI when interaction ends
4 年前
Amel
c4c8c250
Updates on interaction manager
4 年前
Amel
582ea351
Added interaction events and updated interaction manager
4 年前
Amel
4a5985db
[Bot] Automated dotnet-format update
4 年前
Amel
525d3f4e
Fixed event for interaction pick up
4 年前
Amel
5418926e
added null check before event raise on interaction
4 年前
Amel
be977071
[Bot] Automated dotnet-format update
4 年前
Chema Damak
2051a72a
Adding interaction UI + Events
4 年前
Chema Damak
e3274c8d
[Bot] Automated dotnet-format update
4 年前
Amel Negra
77df437f
Removed old comments from InteractionManager
4 年前
uChema
c51b9a34
Merge branch 'interaction' of https://github.com/UnityTechnologies/open-project-1 into interaction
4 年前
uChema
c128feff
Fix Dialogue branching and add UI
4 年前
uChema
a16fe655
Dialogue And Quest Managers + Refractoring some scripts
4 年前
uChema
748ff00f
Add a quest, and test; WIP
4 年前
uChema
edca0f63
Rename Task to Step
4 年前
Ciro Continisio
0f73b995
Renaming and refactoring on UI
4 年前
uChema
02abd5ef
Rename Folder
4 年前
uChema
e54c3d58
[Bot] Automated dotnet-format update
4 年前
uChema
2fbe347a
Merge branch 'QuestSystem' of https://github.com/UnityTechnologies/open-project-1 into QuestSystem
4 年前
uChema
88cf490e
Fix interaction Manager
4 年前
Ciro Continisio
84e76f64
Fixes, typos and tweaks
4 年前
Ciro Continisio
7c088a1f
Merge branch 'pr-bash' into main
4 年前
Ciro Continisio
c6c67ff0
New sound effects
Wired new sound effects: jump, pickup, swing cane and footsteps
Laid the foundation work for more
Script playing sfx on player from animation clips
4 年前
uChema
008bad73
Fix Merge
4 年前
Dan Young
eb670224
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
Ciro Continisio
c691552b
Merge branch 'pr-bash' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Samples.meta
4 年前
GitHub
f29b25de
Added support to multiple overlapping interactions ( #301 )
* Added support to multiple overlapping interactions
* Changed Stack for LinkedList
4 年前
Yohann Puyhaubert
34a837d3
[Bot] Automated dotnet-format update
4 年前
GitHub
81481d8b
Merge pull request #4 from UnityTechnologies/main
update my local branch
4 年前
GitHub
f91be74c
Fix input caching ( #339 )
* StopMovement every update instead of on entering Idle State
* Fix input caching
A simple fix using coroutines to clear any cached input the frame after it was trigggered.
* Added Action to clear input cache
Reverted the changes to `Protagonist.cs` and `InteractionManager.cs` that were made to clear the input cached and instead put it all together in a single Action and added it to the Idle and Walking states.
* [Bot] Automated dotnet-format update
4 年前
alex
2f536097
Merge remote-tracking branch 'upstream/main' into main
4 年前
alex
9fd881be
Fix Interaction System doesn't follow the FSM
4 年前
alex
eeb88b72
Fix Interaction System doesn't follow the FSM
4 年前
Ciro Continisio
38827f46
Merge remote-tracking branch '_tech-mkt/main' into main
4 年前
GitHub
762d050f
Merge pull request #6 from UnityTechnologies/main
Updating my branch
4 年前
Smurjo
df03afb9
Merge branch 'main' of https://github.com/Smurjo/open-project-1 into main
4 年前
alex
374a3a6b
Fix Interaction System doesn't follow the FSM
4 年前
Ciro Continisio
b7e86dc9
Merge branch 'main' of https://github.com/AlexandreGheraibia/open-project-1 into main
# Conflicts:
# UOP1_Project/Assets/Prefabs/Characters/Pig/Interaction.prefab
# UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab
4 年前
Ciro Continisio
19c74b30
[Bot] Automated dotnet-format update
4 年前
Ciro Continisio
57258669
Merge branch 'main' into pr-bash
4 年前
uChema
7ece782e
Merge branch 'main' into QuestSystem
4 年前
uChema
7f7c4818
Fix Merge
4 年前
Ciro Continisio
7cd4ce12
Merge remote-tracking branch 'tech-mkt/main' into pr-bash
4 年前
GitHub
d07ee56f
Merge pull request #1 from UnityTechnologies/main
Latest changes
4 年前
GitHub
b5417125
Merge pull request #7 from UnityTechnologies/main
Updating my local repository
4 年前
GitHub
c0b2931f
Merge pull request #1 from UnityTechnologies/main
Update fork
4 年前
uChema
20cfec67
clean up folders
4 年前
Ciro Continisio
2d718f1c
Merge branch 'main' into vegetation-tweaks
# Conflicts:
# UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
4 年前
Amel Negra
e0ede3d5
Merge branch 'main' into AmelMain
4 年前
uChema
8a2721d9
Setting Questline + rename SO's files
4 年前
uChema
f29c7129
Add Icons placeholders - Set Game Scene UI - Add Aggro System
3 年前
Amel
bad6196e
Fixed talk interaction enabled forever after cutscenes
3 年前
uChema
8760a221
Select first Item in Inventory when Inventory Open
3 年前
Amel
cb4d2d6e
E interaction disabled during cutscenes
3 年前
Ciro Continisio
7fdb5bae
Merge branch 'main' into UI-icons
3 年前
Ciro Continisio
6b104b55
Mega code cleanup
3 年前