Dan Young
|
7ce66d74
|
Merge remote-tracking branch 'upstream/art-assets' into art-assets
|
4 年前 |
Ciro Continisio
|
49acac4c
|
[Bot] Automated dotnet-format update
|
4 年前 |
Ciro Continisio
|
eec53055
|
Merge branch 'pr-bash' into main
# Conflicts:
# UOP1_Project/Assets/Scripts/Input/GameInput.cs
# UOP1_Project/Assets/Settings/Input/GameInput.inputactions
|
4 年前 |
Ciro Continisio
|
f6be0d86
|
Input and Camera tweaking
|
4 年前 |
Ciro Continisio
|
f96d9f1e
|
Input and Camera tweaking
|
4 年前 |
Ciro Continisio
|
26d5b059
|
Added the ability to run for keyboard players
|
4 年前 |
Ciro Continisio
|
5f933c13
|
Removed Localisation samples
|
4 年前 |
Ciro Continisio
|
e3f6f31a
|
Added Run and Faint animation for PigChef, implemented Run as BlendTree
|
4 年前 |
Ciro Continisio
|
1645ed7d
|
Added BardHare and FryKing animations
|
4 年前 |
Ciro Continisio
|
2a0d8691
|
Merge branch 'main' into pr-bash
|
4 年前 |
Ciro Continisio
|
2149cc50
|
AnimationRigging setup, lantern grab clip
|
4 年前 |
Ciro Continisio
|
cdab9c20
|
Merge branch 'main' of github.com:UnityTechnologies/open-project-1 into main
|
4 年前 |
Ciro Continisio
|
86b055e0
|
Merge remote-tracking branch 'amel-unity/main' into pr-bash
|
4 年前 |
Can Chen
|
34b69d6c
|
[Bot] Automated dotnet-format update
|
4 年前 |
Ciro Continisio
|
cd138aa3
|
Imported lobster, palm leaf set, tavern owner's hair
|
4 年前 |
GitHub
|
78c0f11a
|
"Editor window to quickly open scenes" task (#267)
* Added the Quick Scene Access Tool
* removed unused file
|
4 年前 |
Ciro Continisio
|
5f6fe538
|
Merge branch 'main' of https://github.com/Smurjo/open-project-1 into pr-bash
|
4 年前 |
GitHub
|
8490d386
|
Added editor for ScriptableObject with events. It allows to automatically show buttons for each event and raise them. (#256)
|
4 年前 |
Ciro Continisio
|
fed9be4d
|
Reintroduced camera noise
|
4 年前 |
GitHub
|
851182b5
|
"Replace" context-menu with a searchable popup (#223)
* "Replace" context-menu with a popup window
* [Bot] Automated dotnet-format update
* Selection interactive preview
* Whoops, wrong merge resolve
* [Bot] Automated dotnet-format update
* Show popup at screen mouse position
* Mini-previews on renderable objects + minor GUI improvements
* [Bot] Automated dotnet-format update
* Editors cache fix, remove dummy editor
* Destroy only cached editor
* Rename "ReplacePrefabTreeView" to "PrefabSelectionTreeView"
* catch ClearPreviewCache error
* fix null texture warning
* Fix popup fit on smaller screens
* Fix black frame when closing popup during repaint
* Expand folder on single-click
* Remove editor Destroy, as error is still showing inside try catch
* Revert delayed close, as it made popup not-closable in some cases
|
4 年前 |
Ciro Continisio
|
716120b4
|
Bushes, new Fern plant
|
4 年前 |
GitHub
|
0da85991
|
Update ReplaceTool.cs (#221)
|
4 年前 |
Ciro Continisio
|
757da81d
|
Removes spaces in scene names
|
4 年前 |
Ciro Continisio
|
9be54793
|
Reorganised scenes
|
4 年前 |
Ciro Continisio
|
77242d26
|
Merge branch 'main' of github.com:UnityTechnologies/open-project-1 into main
# Conflicts:
# UOP1_Project/Assets/Scenes/TestingGround.unity
|
4 年前 |
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 年前 |