Ciro Continisio
6c55468b
Skybox experiments
4 年前
Amel
5418926e
added null check before event raise on interaction
4 年前
Dan Young
268ab82e
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
Ciro Continisio
9d3fb89a
Merge remote-tracking branch 'tech-mkt/state-machine-improvements' into main
4 年前
Chema Damak
e73d3ecf
[Bot] Automated dotnet-format update
4 年前
Amel Negra
770c4301
setup IK for the pig on the arms
4 年前
GitHub
76062a54
Fix/LocationSO not serialized properly ( #258 )
* Fix GameSceneSO not serialized properly.
* Add a reference to the script as a ObjectField in the GameSceneSO
To edit the code faster
* Fix typo
4 年前
Chema Damak
8871d820
Changed Events to Event Channels
4 年前
Ciro Continisio
e7b2e446
New art assets
4 年前
Amel
525d3f4e
Fixed event for interaction pick up
4 年前
Ciro Continisio
de0da3ef
ChefHat accessory
4 年前
Amel
8d423ac9
post merge fixes
4 年前
Ciro Continisio
13879ada
Small fixes
4 年前
Amel
90998767
Merge remote-tracking branch 'origin/Inventory' into interaction
4 年前
Ciro Continisio
648aa035
First setup
4 年前
Amel
3357822c
start talking interaction event name updated
4 年前
Ciro Continisio
443b4a6c
New FryKing animations and prefab
4 年前
Smurjo
c6862e6f
palm leaf set and lobster
Prefabs for the cooking festival
4 年前
Amel
4a5985db
[Bot] Automated dotnet-format update
4 年前
Ciro Continisio
2e18946e
Imported ground textures
4 年前
GitHub
5c82e99e
Merge pull request #2 from UnityTechnologies/main
import changes from main
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 年前
Amel
775466b3
Added pick up state to the state machine
4 年前
GitHub
8c61e1d3
Updated furnishing texture and colliders on furniture ( #251 )
4 年前
Amel
4f58bf1c
Added pick up sfx and play sound action
4 年前
GitHub
74658126
Added Frying Pan asset ( #252 )
* Added Frying pan assets
* Changed material smothness
4 年前
Amel
9918fbce
Interaction go on the pig is now a prefab
4 年前