Amel Negra
|
9bae4220
|
Merge remote-tracking branch 'origin/interaction' into main
|
4 年前 |
Amel Negra
|
370a7993
|
Merge remote-tracking branch 'origin/main' into interaction
|
4 年前 |
Amel Negra
|
96e4f244
|
Merge remote-tracking branch 'origin/interaction' into interaction
|
4 年前 |
uChema
|
8525f14c
|
[Bot] Automated dotnet-format update
|
4 年前 |
uChema
|
bbcf3752
|
Add control over cooking when near pot
|
4 年前 |
uChema
|
e5dbebfb
|
clening assets folder
|
4 年前 |
Amel Negra
|
564a406f
|
Added new interaction scene example
|
4 年前 |
uChema
|
c51b9a34
|
Merge branch 'interaction' of https://github.com/UnityTechnologies/open-project-1 into interaction
|
4 年前 |
Amel Negra
|
77df437f
|
Removed old comments from InteractionManager
|
4 年前 |
uChema
|
6434aa7b
|
Renaming and cleaning folders
|
4 年前 |
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 年前 |
rainaldisatria
|
3bf061d4
|
Use CustomBaseEditor class in AnimatorParameterActionSOEditor.cs
|
4 年前 |
Amel
|
2807218f
|
bard hare in interaction example scene for talk interaction test
|
4 年前 |
rainaldisatria
|
0cc94ef8
|
Use CustomBaseEditor class in GameSceneSOEditor.cs
|
4 年前 |
Amel
|
be977071
|
[Bot] Automated dotnet-format update
|
4 年前 |
rainaldisatria
|
aeba46f4
|
Create CustomBaseEditor.cs
Custom base editor class. Inherited from Editor class.
Contains handy method to use.
|
4 年前 |
Ciro Continisio
|
6c55468b
|
Skybox experiments
|
4 年前 |
Amel
|
5418926e
|
added null check before event raise on interaction
|
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 年前 |
Ciro Continisio
|
443b4a6c
|
New FryKing animations and prefab
|
4 年前 |
Smurjo
|
c6862e6f
|
palm leaf set and lobster
Prefabs for the cooking festival
|
4 年前 |
Ciro Continisio
|
2e18946e
|
Imported ground textures
|
4 年前 |
GitHub
|
5c82e99e
|
Merge pull request #2 from UnityTechnologies/main
import changes from main
|
4 年前 |
Ciro Continisio
|
6a16876d
|
Relocated stray assets
|
4 年前 |
Ciro Continisio
|
429592f6
|
Leftover lightmaps
|
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 年前 |