Eduardo de Albuquerque
170ed7e3
Merge branch 'PuffParticle' into main
4 年前
treivize
e2449c18
[WIP] Plant Critter - Model UV Color Rig Animations
4 年前
treivize
bb0dafff
Added Slime Critter and new Toon shader to add Fresnel effect on it
4 年前
Ciro Continisio
9bb7eeb2
Forgot Settings.json files
4 年前
Ciro Continisio
a92fcd1f
Removed lantern from the middle of the scene
4 年前
kgc00
f6474b49
undid prefab change
4 年前
Ciro Continisio
bbca6fd1
Imported rigged Phoenix Chick + 2 animations
4 年前
kgc00
b06aad3e
updates
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 年前
GitHub
afec2f17
Remove unused ReorderableList implementation ( #181 )
* Remove confusing ReorderableList
* Removed unused custom Inspector
Co-authored-by: Ciro Continisio <ciro@unity3d.com>
4 年前
kgc00
781633e3
Merge remote-tracking branch 'upstream/main' into main
4 年前
Ciro Continisio
6a57501a
Merge branch 'Smurjo/art-assets' into art-assets
# Conflicts:
# UOP1_Project/Assets/Art/Accessories.meta
# UOP1_Project/Assets/Art/Accessories/Earring.meta
# UOP1_Project/Assets/Art/Accessories/Earring/Earring.fbx
# UOP1_Project/Assets/Art/Accessories/Earring/Earring.fbx.meta
# UOP1_Project/Assets/Art/Accessories/Earring/Earring.mat
# UOP1_Project/Assets/Art/Accessories/Earring/Earring.mat.meta
# UOP1_Project/Assets/Art/Accessories/Earring/Earring.prefab
# UOP1_Project/Assets/Art/Accessories/Earring/Earring.prefab.meta
4 年前
Rainaldi Satria
b62977f8
[Bot] Automated dotnet-format update
4 年前
Ciro Continisio
ecf3b2ef
Art updates
Imported chest, fixed Phoenix Chick, fixed BardHare
4 年前
GitHub
957c4a1c
Fix/dialogue line not shown in custom timeline track ( #180 )
* Fix DialogueLine not shown in custom TimelineTrack
* Make example scene.
* Delete not used script: DialogueMixerBehaviour.cs
* Push uncommited changes
* Fix minor bug
while timeline is playing, click on ExampleCutscene object, you get an error. This prevent that error.
* Inverted the checks
In preparation for making the tool work also in Edit mode
Co-authored-by: Ciro Continisio <ciro@unity3d.com>
4 年前
GitHub
aaf14e64
fix: Project won't compile due to a reference to UnityEditor ( #157 ) ( #169 )
* fix: Project won't compile due to a reference to UnityEditor (#157 )
* #157 improved code readability
4 年前
kgc00
4740b5b7
[Bot] Automated dotnet-format update
4 年前
GitHub
e7a3f51c
Dialogue system event fix ( #162 )
* changed input phase check to match best practices
* refactored system to go through input reader. properly unsubscribing from events in dialogue system
* Nitpick on the naming
Co-authored-by: Ciro Continisio <ciro@unity3d.com>
4 年前
Ciro Continisio
d8761506
Merge remote-tracking branch 'tech-mkt/main' into main
4 年前
Ciro Continisio
e155c0a6
Added camera dummy, fixed issue with player Prefab tag
4 年前
Ciro Continisio
6803546e
[Bot] Automated dotnet-format update
4 年前
Ciro Continisio
3b44ba51
Upgraded project to 2019.4.14f1, imported new packages
4 年前
Ciro Continisio
cd7fea82
Tweaks, cleaning
4 年前
Ciro Continisio
10258092
Merge remote-tracking branch 'tech-mkt/art-assets' into big-merge
4 年前
Ciro Continisio
e8f4a6e7
Imported BardHare
4 年前
Ciro Continisio
09e99006
Merge remote-tracking branch 'tech-mkt/main' into big-merge
4 年前
Ciro Continisio
2c91dabf
Merge branch 'art-assets' into big-merge
# Conflicts:
# UOP1_Project/Assets/Prefabs/Props/PotOverFire.prefab
4 年前
Ciro Continisio
43e2ab42
Merge remote-tracking branch 'tech-mkt/main' into big-merge
4 年前
kgc00
96983fe8
doc
4 年前
uChema
2aa92a2d
Merge
4 年前
Ciro Continisio
f0dc54d3
Fix CM bug, tweaks
4 年前
kgc00
bd5cb2d6
removed ununsed var
4 年前
Brett
53a29ad3
Localize TMP font
LocalizeTMProFontEvent.cs - Component to localize a TMP_FontAsset
LocalizeComponent_TMProFont.cs - TextmeshProUGUI context menu "Localize String And Font"
4 年前