grimstoner
|
fa26a41e
|
Fixed bug #440
Moved the code that instantiates the _instantiatedImages to the SetPagination method.
|
4 年前 |
uChema
|
8b7ce38c
|
Create questlines
|
3 年前 |
Ciro Continisio
|
40eb1567
|
Merge remote-tracking branch 'tech-mkt/main'
|
4 年前 |
|
Ciro Continisio
|
8e42748b
|
ProBuilder meshes
|
4 年前 |
|
Ciro Continisio
|
8a8f42df
|
ProBuilder meshes
|
4 年前 |
|
Ciro Continisio
|
c22729d3
|
More worldbuilding
Full bake of all scenes
|
4 年前 |
|
Ciro Continisio
|
17ad7091
|
Random tint shader
Added wind to random position tint shader
|
4 年前 |
|
Ciro Continisio
|
b50f7789
|
Shaders upgraded
|
4 年前 |
|
Ciro Continisio
|
0b530052
|
ProBuilder meshes update
|
4 年前 |
|
Ciro Continisio
|
edf6638e
|
Packages updated
|
4 年前 |
|
Ciro Continisio
|
e84872d3
|
Merge branch 'needle-tools-move-multi-compile-to-hlsl' into worldbuilding
|
4 年前 |
|
Ciro Continisio
|
0cf6d134
|
Merge branch 'move-multi-compile-to-hlsl' of https://github.com/needle-tools/open-project-1 into needle-tools-move-multi-compile-to-hlsl
# Conflicts:
# UOP1_Project/Assets/Shaders/Toon_Ground_VertexColour.shadergraph
|
4 年前 |
|
Ciro Continisio
|
47ed0d6a
|
Merge branch 'main' into worldbuilding
|
4 年前 |
|
Ciro Continisio
|
6bf9cfe1
|
Merge remote-tracking branch 'tech-mkt/main'
|
4 年前 |
|
uChema
|
ad0bf614
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
4 年前 |
Amel
|
9be5ccca
|
Removed unneeded transition from slime critter state machine
|
4 年前 |
|
Ciro Continisio
|
f5afc4ea
|
Scenery
|
4 年前 |
|
Amel
|
901da185
|
Renaming critter states to fit both slime and rock critters
|
4 年前 |
|
Ciro Continisio
|
5cc9de68
|
Beach changes, worldbuilding
Light settings, shader changes, prefab tweaks, model tweaks
|
4 年前 |
|
Amel
|
73a43775
|
Critters state machines adjustments
|
4 年前 |
|
Ciro Continisio
|
a2299fee
|
Water shaders, landmasses
|
4 年前 |
|
Amel
|
2897f987
|
Added revive trigger for Animator Controller to fit snooze state for Rock Critter
|
4 年前 |
|
Ciro Continisio
|
ebe81a73
|
Worldbuilding in progress
Landmasses vertex paint, water plane tweaks
|
4 年前 |
|
Amel
|
33211714
|
Using new rock critter state machine on the prefab
|
4 年前 |
|
Ciro Continisio
|
bad80c8c
|
Updated ProBuilder and Polybrush
Also enabled ProBuilder experimental features
|
4 年前 |
|
Amel
|
1ab16620
|
Adding new snooze state with its actions and conditions for rock critter
|
4 年前 |
|
Ciro Continisio
|
23bd82d4
|
Beach landmass painting v1
|
4 年前 |
|
Amel
|
9a3e73a6
|
Added reset health SO action
|
4 年前 |
|
Ciro Continisio
|
5636f0a4
|
Improvements to vertex ground shader
Now world-space coordinates
|
4 年前 |
|
Amel
|
a42be588
|
Moving slime critter specific actions and states in separate folders
|
4 年前 |
|
uChema
|
50525348
|
Fix Quest Tool : Add Remove buttons and AddDialogue Buttons
|
4 年前 |
Felix Herbst
|
cdd82f3d
|
Add multi_compile keywords to CustomLighting.hlsl, remove ShaderGraph keywords that did the same
list comes from Lit.shader, "Universal Pipeline keywords" section
|
4 年前 |
|
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 年前 |
