grimstoner
|
fa26a41e
|
Fixed bug #440
Moved the code that instantiates the _instantiatedImages to the SetPagination method.
|
3 年前 |
Amel Negra
|
36cba268
|
Fixed Fry King dialogue typo
|
3 年前 |
|
Amel Negra
|
d464d645
|
Added dialogue shot to step controller script
|
3 年前 |
|
Amel Negra
|
65d30a33
|
Merge remote-tracking branch 'origin/main' into AmelMain
|
3 年前 |
|
Amel Negra
|
365cc438
|
Added fry king to the scene
|
3 年前 |
|
Amel Negra
|
2ad7557f
|
Added collider + NPC tag and needed components for Fry King prefab
|
3 年前 |
|
Amel Negra
|
a3194a18
|
Fry King state machine
|
3 年前 |
|
Amel Negra
|
1b0a6a80
|
pushing the rest
|
3 年前 |
|
Amel Negra
|
49e49849
|
Adding to Localized tables Fry King actor and dialogue to test
|
3 年前 |
|
Amel Negra
|
ef760f6d
|
Fry King Animator controller done
|
3 年前 |
|
Amel Negra
|
176eb353
|
removing eat state from NPC since it will be used only in cut-scenes and not gameplay
|
3 年前 |
uChema
|
9e6b5587
|
Remove unused Events
|
3 年前 |
|
uChema
|
b73d6df4
|
Fix last commit + Make Interaction item resizable
|
3 年前 |
|
uChema
|
75076141
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
3 年前 |
|
Amel Negra
|
c2ffc760
|
pushing scene
|
3 年前 |
|
Amel Negra
|
f7ead9e8
|
updating scene after changes and adding new path config for townsfolk
|
3 年前 |
|
Amel Negra
|
75bbf9eb
|
new updated bard hare SM
|
3 年前 |
|
Amel Negra
|
a83290a1
|
Bard Hare Animator Controller separating jump up and down from talk
|
3 年前 |
|
Amel Negra
|
8dcae7ea
|
Adding animation timers conditions for jump up and down
|
3 年前 |
|
Amel Negra
|
2a5bdc6d
|
Jump up and down action for bard hare SM
|
3 年前 |
|
Amel Negra
|
7251f071
|
Added Start and end conversation states
|
3 年前 |
|
Amel Negra
|
946cf3fe
|
updating bard hare state machine with new changes from townsfolk v2 SM
|
3 年前 |
|
Amel Negra
|
0876b376
|
pushing the scene
|
3 年前 |
|
Amel Negra
|
11d46cd3
|
Townsfolk updated state machine
|
3 年前 |
|
Amel Negra
|
5a3c9f92
|
Is a new line displayed condition asset file
|
3 年前 |
|
Amel Negra
|
ffaf578b
|
Adding 3 new timers conditions for the townsfolk state machine
|
3 年前 |
|
Amel Negra
|
eafd1d40
|
Adding Random time elapsed condition
|
3 年前 |
Ciro Continisio
|
be943453
|
Scenes are all connected
|
3 年前 |
|
Amel Negra
|
75e90368
|
Adding new condition script for when a new line is displayed
|
3 年前 |
|
Ciro Continisio
|
42b7725e
|
Connected almost all scenes
Missing TownMarket and TownUpper
|
3 年前 |
|
Amel Negra
|
3794c8dd
|
Filling the townsfolk talkingTo arrays
|
3 年前 |
|
uChema
|
b13a9a92
|
Refactor and rearrange folders
|
3 年前 |
|
Ciro Continisio
|
4a525440
|
Scene separated
|
3 年前 |
|
uChema
|
46aad295
|
Fixing bug in Button selection (Confirmation Popup)
|
3 年前 |
|
Ciro Continisio
|
eed33324
|
ForestEntrance landmass
|
3 年前 |
|
Ciro Continisio
|
d41e7e87
|
Merge branch 'whiteboxing'
# Conflicts:
# UOP1_Project/UserSettings/EditorUserSettings.asset
|
3 年前 |
|
uChema
|
52a617fe
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
3 年前 |
|
Amel Negra
|
c0a90df6
|
Rock critter keeps walk animation on alert
|
3 年前 |
|
Amel Negra
|
aec6fa7d
|
Townsfolk using another walk path
|
3 年前 |
|
Amel Negra
|
ac509ab2
|
Merge remote-tracking branch 'origin/main' into main
|
3 年前 |
|
uChema
|
66b47933
|
Default Button improvement
|
3 年前 |
|
Amel Negra
|
52d6b39f
|
post merge bard hare fix
|
3 年前 |
|
uChema
|
c24dd21f
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
3 年前 |
|
Amel Negra
|
35ef2889
|
Fixing merge conflicts
|
3 年前 |
|
Amel Negra
|
c7f86452
|
Merge remote-tracking branch 'origin/main' into main
|
3 年前 |
|
Amel Negra
|
348c8c14
|
Merge branch 'AmelMain' into main
|
3 年前 |
|
Amel Negra
|
6bb088d5
|
Attack animation works
|
3 年前 |
|
Amel Negra
|
0f2334d3
|
removing broken attack in place anim
|
3 年前 |
|
Amel Negra
|
e0700a24
|
slowing walk speed for slime critter
|
3 年前 |
|
Amel Negra
|
99871ed8
|
temporarily using the idle animation for the rock critter faint
|
3 年前 |
