Ciro Continisio
|
9d833ec9
|
Removed random sample scenes
|
4 年前 |
Amel
|
bf0ea70e
|
Fixed plant critter attack rotation
|
4 年前 |
Ciro Continisio
|
5e90885b
|
Removing UserSettings from cache
|
4 年前 |
Ciro Continisio
|
5183e8cd
|
Reverted camera speed
|
4 年前 |
Ciro Continisio
|
72d88c0d
|
Merge branch 'main' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/AddressableAssetsData/OSX/addressables_content_state.bin.meta
# UOP1_Project/Assets/Scenes/Locations/Field_Farms.unity.meta
# UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
# UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/FryKing.meta
|
4 年前 |
uChema
|
aa88e701
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
4 年前 |
Amel Negra
|
0b4f451f
|
Merge branch 'AmelMain' into main
|
4 年前 |
Amel Negra
|
177559b8
|
Make sure that protagonist stops attacking when dying
|
4 年前 |
Amel Negra
|
fe1f23a8
|
Merge branch 'main' into AmelMain
|
4 年前 |
Amel Negra
|
4ac06b52
|
Merge remote-tracking branch 'origin/main' into AmelMain
|
4 年前 |
Amel Negra
|
a6e9748f
|
scene updates
|
4 年前 |
Amel Negra
|
586b9eed
|
Added noise for dialogue shot cameras of NPCs
|
4 年前 |
Amel Negra
|
9d9487e8
|
Pushing testing ground scene with NPCs positions adjustments
|
4 年前 |
Amel Negra
|
f4f39c50
|
Adding Dialogue shot VCam for the different NPC prefabs
|
4 年前 |
Amel Negra
|
8d75ed88
|
Phoenix Chick Animator Controller
|
4 年前 |
Amel Negra
|
36cba268
|
Fixed Fry King dialogue typo
|
4 年前 |
Amel Negra
|
d464d645
|
Added dialogue shot to step controller script
|
4 年前 |
Amel Negra
|
65d30a33
|
Merge remote-tracking branch 'origin/main' into AmelMain
|
4 年前 |
Amel Negra
|
365cc438
|
Added fry king to the scene
|
4 年前 |
Amel Negra
|
2ad7557f
|
Added collider + NPC tag and needed components for Fry King prefab
|
4 年前 |
Ciro Continisio
|
49a9a175
|
Baked all location scenes
|
4 年前 |
Amel Negra
|
a3194a18
|
Fry King state machine
|
4 年前 |
Ciro Continisio
|
474f2d07
|
Camera tweaks
|
4 年前 |
Amel Negra
|
1b0a6a80
|
pushing the rest
|
4 年前 |
uChema
|
10a19c7c
|
Move USS file to correct folder
|
4 年前 |
Ciro Continisio
|
7cdd29a5
|
Removal of unneded meta file
|
4 年前 |
Amel Negra
|
49e49849
|
Adding to Localized tables Fry King actor and dialogue to test
|
4 年前 |
uChema
|
f934ef08
|
Fix last commit
|
4 年前 |
Ciro Continisio
|
e6dcfc27
|
Merge branch 'main' into whiteboxing
|
4 年前 |
Amel Negra
|
ef760f6d
|
Fry King Animator controller done
|
4 年前 |
uChema
|
e132a119
|
Add a StepToDialogue function to the StepSO. Fix preview display in the Quest tool
|
4 年前 |
Amel Negra
|
176eb353
|
removing eat state from NPC since it will be used only in cut-scenes and not gameplay
|
4 年前 |
uChema
|
9e6b5587
|
Remove unused Events
|
4 年前 |
uChema
|
b73d6df4
|
Fix last commit + Make Interaction item resizable
|
4 年前 |
uChema
|
75076141
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
4 年前 |
Amel Negra
|
c2ffc760
|
pushing scene
|
4 年前 |
Amel Negra
|
f7ead9e8
|
updating scene after changes and adding new path config for townsfolk
|
4 年前 |
Amel Negra
|
75bbf9eb
|
new updated bard hare SM
|
4 年前 |
Amel Negra
|
a83290a1
|
Bard Hare Animator Controller separating jump up and down from talk
|
4 年前 |
Amel Negra
|
8dcae7ea
|
Adding animation timers conditions for jump up and down
|
4 年前 |
Amel Negra
|
2a5bdc6d
|
Jump up and down action for bard hare SM
|
4 年前 |
Amel Negra
|
7251f071
|
Added Start and end conversation states
|
4 年前 |
Amel Negra
|
946cf3fe
|
updating bard hare state machine with new changes from townsfolk v2 SM
|
4 年前 |
Amel Negra
|
0876b376
|
pushing the scene
|
4 年前 |
Amel Negra
|
11d46cd3
|
Townsfolk updated state machine
|
4 年前 |
Amel Negra
|
5a3c9f92
|
Is a new line displayed condition asset file
|
4 年前 |
Amel Negra
|
ffaf578b
|
Adding 3 new timers conditions for the townsfolk state machine
|
4 年前 |
Ciro Continisio
|
c5a28a1e
|
Addressable settings
|
4 年前 |
Amel Negra
|
eafd1d40
|
Adding Random time elapsed condition
|
4 年前 |
Ciro Continisio
|
be943453
|
Scenes are all connected
|
4 年前 |