rainaldisatria
|
a0293eb3
|
Merge remote-tracking branch 'upstream/main' into branching-feature-in-dialogue-system
|
4 年前 |
|
rainaldisatria
|
f7791e6d
|
Update BranchingExamples.unity
|
4 年前 |
Ciro Continisio
|
7f5780ce
|
[Bot] Automated dotnet-format update
|
4 年前 |
|
rainaldisatria
|
430d537b
|
Update InputReader.cs to safely invoke the event
|
4 年前 |
|
Ciro Continisio
|
3db2e782
|
Added the ability to talk
|
4 年前 |
|
rainaldisatria
|
85be34a1
|
Update DialogueManager.cs to support showing DialogueData and branching
|
4 年前 |
|
Ciro Continisio
|
383e85b3
|
Renamed variable in all Conditions and Actions
|
4 年前 |
|
rainaldisatria
|
b0513472
|
Adjust DialogueManager.cs to support branching
|
4 年前 |
|
Ciro Continisio
|
7be88cca
|
Removed script Character, moved StateMachine SOs
|
4 年前 |
|
rainaldisatria
|
d74551dd
|
Create DialogueTrigger.cs
|
4 年前 |
|
Ciro Continisio
|
d14b0e45
|
Cleanup
|
4 年前 |
|
rainaldisatria
|
8df7066a
|
Move and rename example scene name
|
4 年前 |
|
Ciro Continisio
|
77c86ba9
|
Merge remote-tracking branch 'tech-mkt/state-machine-improvements' into main
|
4 年前 |
|
rainaldisatria
|
0ec96c10
|
Create choice button prefab
|
4 年前 |
|
Ciro Continisio
|
1c3786bc
|
[Bot] Automated dotnet-format update
|
4 年前 |
|
rainaldisatria
|
40613066
|
Push more uncommited changes
|
4 年前 |
|
Ciro Continisio
|
89aa39ea
|
Fixed AudioManager in response to pool changes
|
4 年前 |
|
rainaldisatria
|
4065435a
|
Push uncommited changes
|
4 年前 |
treivize
|
449795a4
|
Add latest texture
|
4 年前 |
|
Ciro Continisio
|
0174edd5
|
Merge branch 'davejrodriguez/object-pool' into main
|
4 年前 |
|
rainaldisatria
|
53931d79
|
Make DialogueData for examples
|
4 年前 |
|
treivize
|
884f78d8
|
[WIP] Update animations Idle, Warn, Alert and Attack
|
4 年前 |
|
Ciro Continisio
|
fd892708
|
Ignored ProGrids settings
|
4 年前 |
|
rainaldisatria
|
6fabd6a2
|
Update DialogueDataSO.cs to support branching
|
4 年前 |
|
treivize
|
4b202e5f
|
[WIP] Better UV, Rig and Texture
|
4 年前 |
|
Ciro Continisio
|
ededb7c0
|
Merge branch 'state-machine-improvements' into main
|
4 年前 |
|
rainaldisatria
|
aa3e083b
|
Prepare example scene
|
4 年前 |
Eduardo de Albuquerque
|
170ed7e3
|
Merge branch 'PuffParticle' into main
|
4 年前 |
|
treivize
|
e2449c18
|
[WIP] Plant Critter - Model UV Color Rig Animations
|
4 年前 |
|
Ciro Continisio
|
9bb7eeb2
|
Forgot Settings.json files
|
4 年前 |
|
Ciro Continisio
|
a92fcd1f
|
Removed lantern from the middle of the scene
|
4 年前 |
|
Ciro Continisio
|
bbca6fd1
|
Imported rigged Phoenix Chick + 2 animations
|
4 年前 |
|
Ciro Continisio
|
e5e7acc6
|
Merge branch 'art-assets' into main
|
4 年前 |
kgc00
|
d631a06f
|
doc
|
4 年前 |
|
Ciro Continisio
|
26747ac5
|
Merge branch 'treivize/feature/art/transparent_support' into art-assets
|
4 年前 |
|
Ciro Continisio
|
e694237c
|
Added grouping in Toon
|
4 年前 |
|
kgc00
|
280989a8
|
was able to fix edge case #1
|
4 年前 |
|
Ciro Continisio
|
8de2f73f
|
Moved stray materials and textures
|
4 年前 |
|
kgc00
|
b19634e0
|
added to component menu
|
4 年前 |
|
treivize
|
e193a308
|
Fixed Lantern prefab
|
4 年前 |
|
Eduardo de Albuquerque
|
341c6a29
|
Refactory
|
4 年前 |
|
Ciro Continisio
|
782c5b99
|
[Bot] Automated dotnet-format update
|
4 年前 |
|
kgc00
|
7aa245f6
|
found fix for todo #2
|
4 年前 |
|
treivize
|
ae2c58ed
|
Fixed Lantern.fbx scale and rotation
|
4 年前 |
|
Eduardo de Albuquerque
|
27c66c95
|
Updated old particles and created walking particle
|
4 年前 |
|
Ciro Continisio
|
51aa0f82
|
Merge branch 'vishwah13/main' into main
|
4 年前 |
|
kgc00
|
c4dabcbe
|
merge
|
4 年前 |
|
Ciro Continisio
|
7705382e
|
Merge branch 'main' into state-machine-improvements
# Conflicts:
# UOP1_Project/Assets/Prefabs/Pig.prefab
|
4 年前 |
|
treivize
|
572e0cdd
|
Added Transparent support on ToonShading and Glass Shader for the lantern
|
4 年前 |
|
Eduardo de Albuquerque
|
6844b984
|
Created 3d model and prefab for landing particle and jumping particle
|
4 年前 |
