Amel Negra
|
e446a5a7
|
edited townsfolk script to move methods to step controller
|
4 年前 |
|
Amel Negra
|
ddcc378c
|
Merge branch 'main' into AmelMain
|
4 年前 |
|
Amel Negra
|
a63051d7
|
wip
|
4 年前 |
|
Amel Negra
|
3dad5079
|
Townsfolk to stop talking when protagonist talks to others in conversation
|
4 年前 |
|
Amel Negra
|
d516a82f
|
Debugging agent issue not finding path
|
4 年前 |
|
Amel Negra
|
13e2f4ef
|
renamed initial state to state
|
4 年前 |
|
Amel Negra
|
ab253bb8
|
adjusting colliders so characters don't go through each other when talking
|
4 年前 |
|
Amel Negra
|
2855090c
|
Pushing the scene with the changes
|
4 年前 |
|
Amel Negra
|
84d448b1
|
Reordered Townsfolk M prefab components to match F prefab
|
4 年前 |
|
Amel Negra
|
0a180847
|
Adding talking to protagonist state and needed changes
|
4 年前 |
|
Amel Negra
|
738b219b
|
Adding exit to idle from talk in the Animator Controller
|
4 年前 |
|
Amel Negra
|
6e88180e
|
pushing changes on scene
|
4 年前 |
|
Amel Negra
|
b2351dfa
|
renamed InitialState variable
|
4 年前 |
|
Amel Negra
|
1f8d4c95
|
Updated prefabs to add new event from step controller
|
4 年前 |
|
Amel Negra
|
a186115b
|
Added IsInDialogue to step controller
|
4 年前 |
|
Amel Negra
|
1bdfb7ff
|
Added townsfolk walking condition
|
4 年前 |
|
Amel Negra
|
bd7b83fa
|
Made Initial state an enum
|
4 年前 |
|
Amel Negra
|
aef41f89
|
All townsfolk are intractable (removed variant)
|
4 年前 |
|
Amel Negra
|
57b64e83
|
Pushing scene to make townsfolk idle on start
|
4 年前 |
|
Amel Negra
|
837dcf96
|
removed state machine added twice on prefab
|
4 年前 |
|
Amel Negra
|
9a5842e7
|
removed not needed old prefabs
|
4 年前 |
uChema
|
30ea906a
|
Add close button to Settings and Credits screens
|
4 年前 |
|
Amel Negra
|
eb36a053
|
updating scene with new prefab
|
4 年前 |
|
uChema
|
167ca847
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
4 年前 |
|
Amel Negra
|
e8da7a59
|
Adding intractable prefabs for townsfolk we can interact with
|
4 年前 |
|
Amel Negra
|
203ad8de
|
Renamed ''idle 2'' RockCritter animation to ''Alert ''
|
4 年前 |
|
uChema
|
b52c1a1f
|
Add UI to Main Menu + Add Popup + Working on Settings
|
4 年前 |
|
Amel Negra
|
d0830611
|
Updating townsfolk prefab
|
4 年前 |
Ciro Continisio
|
9632e498
|
IET v3
|
4 年前 |
|
uChema
|
cf9b5d2c
|
WIP Settings menu
|
4 年前 |
|
Amel Negra
|
c094f333
|
Merge branch 'main' into AmelMain
|
4 年前 |
|
Ciro Continisio
|
bc17972b
|
Merge branch 'main' into iet
# Conflicts:
# UOP1_Project/Packages/manifest.json
|
4 年前 |
|
uChema
|
6ddc6d14
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
4 年前 |
|
uChema
|
3c2d8e55
|
Fix UI Interaction
|
4 年前 |
GitHub
|
0e084a6f
|
[Bugfix] New condition prevents Critter from attacking when dialogue on (#420)
* New condition prevents Critter from attacking when dialogue on
* Remove test temp clutter
* Undo changes to testing ground
|
4 年前 |
|
uChema
|
7120f338
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
4 年前 |
|
Amel Negra
|
b330e005
|
Testing ground scene with new townsfolk behaviors
|
4 年前 |
|
Amel Negra
|
81b3de1b
|
Fix interaction
|
4 年前 |
|
uChema
|
3ce06cf5
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
4 年前 |
|
Amel Negra
|
7004ced9
|
Updating townsfolk F and M prefabs
|
4 年前 |
|
Ciro Continisio
|
b5a142b5
|
Updated to 2020.3.7f1
|
4 年前 |
|
Amel Negra
|
ebc69c75
|
New path configs for townsfolk walking
|
4 年前 |
|
Ciro Continisio
|
3855f0d6
|
Removed EditorUserSettings
|
4 年前 |
|
Amel Negra
|
cef038ad
|
Now townsfolk possible to idle, walk, talk and choose behavior from MB
|
4 年前 |
|
Ciro Continisio
|
17caa017
|
Cleanup
|
4 年前 |
|
Amel Negra
|
2e8f265c
|
After merge townsfolk back up
|
4 年前 |
|
Ciro Continisio
|
8f5b1bdb
|
Refined PigChef animations
|
4 年前 |
|
Amel Negra
|
5578a4b5
|
Fixing scene after merge
|
4 年前 |
|
Ciro Continisio
|
381edcb3
|
Double-sided toon shader
|
4 年前 |
|
Amel Negra
|
e0ede3d5
|
Merge branch 'main' into AmelMain
|
4 年前 |
