Amel Negra
47e3af25
Renamed UI scene to gameplay scene
4 年前
Amel
9c207f58
testing ground scene cleaning
4 年前
Amel
fe4de3b9
updated example scene for interaction
4 年前
Amel
ceeb6c1e
Added collider on bard hare prefab
4 年前
Chema Damak
eaac2446
[Bot] Automated dotnet-format update
4 年前
Chema Damak
1cd68b6d
Add an on Interaction Ended Event raise
4 年前
Amel
f194e62b
[Bot] Automated dotnet-format update
4 年前
Amel
1fa4000f
Adding initialization script
4 年前
Amel
f8264168
updated event name for interaction ended
4 年前
Chema Damak
e3274c8d
[Bot] Automated dotnet-format update
4 年前
Chema Damak
76c0c04b
Fix last commit
4 年前
Chema Damak
8a166bf0
Merge branch 'interaction' of https://github.com/UnityTechnologies/open-project-1 into interaction
4 年前
Amel
2c9810c9
Merge branch 'main' into interaction
4 年前
Chema Damak
2051a72a
Adding interaction UI + Events
4 年前
Amel
2807218f
bard hare in interaction example scene for talk interaction test
4 年前
Amel
be977071
[Bot] Automated dotnet-format update
4 年前
Amel
5418926e
added null check before event raise on interaction
4 年前
Chema Damak
e73d3ecf
[Bot] Automated dotnet-format update
4 年前
Chema Damak
8871d820
Changed Events to Event Channels
4 年前
Amel
525d3f4e
Fixed event for interaction pick up
4 年前
Amel
8d423ac9
post merge fixes
4 年前
Amel
90998767
Merge remote-tracking branch 'origin/Inventory' into interaction
4 年前
Amel
3357822c
start talking interaction event name updated
4 年前
Ciro Continisio
443b4a6c
New FryKing animations and prefab
4 年前
Amel
4a5985db
[Bot] Automated dotnet-format update
4 年前
Ciro Continisio
2e18946e
Imported ground textures
4 年前
Amel
8c488723
updated pig chef animator controller for pick up animation
4 年前
Ciro Continisio
6a16876d
Relocated stray assets
4 年前
Amel
6180d823
Added pick up trigger action to state machine
4 年前
Ciro Continisio
429592f6
Leftover lightmaps
4 年前
Amel
c7031006
Added timer pick animation condition and is picking up condition
4 年前
Ciro Continisio
1fadd410
Merge branch 'add-testscene-trap' into main
# Conflicts:
# UOP1_Project/Assets/Scenes/TestingGround_Small.unity
# UOP1_Project/Assets/Scenes/TestingGround_Small/LightingData.asset
# UOP1_Project/Assets/Scenes/TestingGround_Small/Lightmap-0_comp_dir.png
# UOP1_Project/Assets/Scenes/TestingGround_Small/Lightmap-0_comp_light.exr
# UOP1_Project/Assets/Scenes/TestingGround_Small/Lightmap-1_comp_dir.png
# UOP1_Project/Assets/Scenes/TestingGround_Small/Lightmap-1_comp_light.exr
4 年前
Amel
6d8abc2f
Added pickup state to state machine
4 年前
Ciro Continisio
4ea5a7a5
[Bot] Automated dotnet-format update
4 年前
Amel
cc52237b
Added isPickingUp SO condition to state machine
4 年前
Ciro Continisio
5aaad3c6
Merge branch 'Location-Loader-issue-229-fix' into main
4 年前
Amel
71613a40
pushing interaction example scene
4 年前
Ciro Continisio
019c7796
Merge branch 'art-assets' into main
4 年前
Amel
582ea351
Added interaction events and updated interaction manager
4 年前
Ciro Continisio
de401a73
Shader tweaks and reorganisation
4 年前
GitHub
3bc90607
Add files via upload
4 年前
Amel
0425ffa3
removed comment from Interaction UI event channel
4 年前
Ciro Continisio
e7641175
Merge branch 'art-assets' of https://github.com/daneobyrd/open-project-1 into daneobyrd-art-assets
4 年前
GitHub
1cf74e5d
Shading style wiki images
4 年前
Amel
7b9aca97
Added dialogue event type
4 年前
John McAllister
8c6e7df0
[Bot] Automated dotnet-format update
4 年前
Amel
ae316a87
Added item event type
4 年前
GitHub
e9c2c909
State Machine - Proposed fix for Issue 228 ( #227 )
* Added Sliding to JumpAscending
Player was unable to jump if sliding which caused the player to get stuck in geometry/holes.
* Added IsActuallyMoving Condition SO and update PigChef Transition Table
IsActuallyMovingSO evaluates character movement by the character controller's velosity.sqrMagnitude. Returns true if the character controller is moving beyond the threshold. Characters can no longer jump while sliding but can jump if they get stuck.
* Update .gitignore
* Small fixes
Reconnected disconnected assets in the TransitionTable, reverted changes on the .gitignore, added multiplication in threshold verification equation
Co-authored-by: Ciro Continisio <ciro@unity3d.com>
4 年前
Amel
54956501
pickUp state in states folder
4 年前
Ciro Continisio
7303c4fe
Merge branch 'main' into art-assets
4 年前