Ciro Continisio
08043a2c
3D Playground
4 年前
Ciro Continisio
a9617e2b
Toon shading v1
4 年前
Ciro Continisio
0788d614
Custom lighting shader tests
4 年前
Ciro Continisio
369c0864
Toon Shader v2 in progress
4 年前
Ciro Continisio
b0af5562
Toon shader done
Needs to be broken down into pieces for modularity
4 年前
Ciro Continisio
26b18669
Work and tests on toon shader, plants and rocks
4 年前
Ciro Continisio
4e9d1665
More art imported
4 年前
Ciro Continisio
009fdbd5
Even more art
4 年前
Ciro Continisio
3fb9738d
Knife, walking cane, lantern, pouch, Rockcritter
4 年前
Ciro Continisio
d250d874
Bush, shell, bamboo, big rock fixes
4 年前
Ciro Continisio
6d1b63ae
Reorganising assets
4 年前
Ciro Continisio
a06f9b30
Sample scene
Prefab creation, fixed rotation issue
4 年前
Ciro Continisio
43ebc212
Art reorganisation and cleanup
4 年前
Ciro Continisio
79a79de9
Imported Townsfolk, Pig Chick
More assets in the environment test scene
4 年前
Ciro Continisio
c06cb5d0
Removed and restructured most placeholder assets
4 年前
Ciro Continisio
fb97255e
Moved art assets
4 年前
Ciro Continisio
fb39de1a
Expression test
4 年前
Ciro Continisio
8bcb0d29
Imported directions sign, removed no_eyes tests
4 年前
Ciro Continisio
1e91c076
Added Flower, fixed Signpost, Rubble sizing
4 年前
Ciro Continisio
9df0bbc8
Lowerpoly Townsfolk, imported Sitar
4 年前
Ciro Continisio
24cc8443
Added crunch compression to all textures + Preset
4 年前
Ciro Continisio
e87c5fdd
Model fixes
Fixed rotation of Walking Cane and Lantern, applied property to StoneCritter Prefab
4 年前
Ciro Continisio
f76bc5ce
Imported Townsfolk_F, Animations
4 年前
Ciro Continisio
e1f2b62c
Imported rigged RockCritter, renaming
4 年前
Ciro Continisio
057b78d2
Torch, PotOverFire
4 年前
Ciro Continisio
a58c28d8
Cleanup of temp assets, removal of Terrain
4 年前
Smurjo
48c9e74e
earring for townsfolk
Added an Earring for townsfolk. It was build with Probuilder, exported to obj for some finishing touches with Blender, then saved as obj again. The material is a simple color.
The earring possibly needs to be placed somewhere else once the townfolk is rigged. Which begs the question whether they can move their ears...
4 年前
Ciro Continisio
886fb594
Tweaks to the earring
4 年前
GitHub
0d06a95f
Added wind sensitiveness (green channel) on vertex color of nature FBX assets ( #156 )
* Palm tree wind vertex color layer
Added vertex color to Palm tree mesh
* Added wind sensivity vertex color on nature assets
* Added wind sensivity vertex color on nature assets
4 年前
Ciro Continisio
03ff96ac
New test scenes
Big testing scene with Polybrush terrain, small test scene with just primitives
4 年前
Chema Damak
54306cec
Added localization package
4 年前
Ciro Continisio
c28c6bc6
New Pig and RockCritter animations
4 年前
Ciro Continisio
8504c55f
PigChef plays idle and walk animations
Created action to set a bool parameter on the state machine
4 年前
Ciro Continisio
38b89476
Added PostProcessing support
4 年前
Ciro Continisio
f0dc54d3
Fix CM bug, tweaks
4 年前
Ciro Continisio
2c91dabf
Merge branch 'art-assets' into big-merge
# Conflicts:
# UOP1_Project/Assets/Prefabs/Props/PotOverFire.prefab
4 年前
Ciro Continisio
e8f4a6e7
Imported BardHare
4 年前
Ciro Continisio
ecf3b2ef
Art updates
Imported chest, fixed Phoenix Chick, fixed BardHare
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 年前
kgc00
781633e3
Merge remote-tracking branch 'upstream/main' into main
4 年前
treivize
572e0cdd
Added Transparent support on ToonShading and Glass Shader for the lantern
4 年前
Ciro Continisio
7705382e
Merge branch 'main' into state-machine-improvements
# Conflicts:
# UOP1_Project/Assets/Prefabs/Pig.prefab
4 年前
kgc00
c4dabcbe
merge
4 年前
treivize
ae2c58ed
Fixed Lantern.fbx scale and rotation
4 年前
Ciro Continisio
8de2f73f
Moved stray materials and textures
4 年前
Ciro Continisio
26747ac5
Merge branch 'treivize/feature/art/transparent_support' into art-assets
4 年前
Ciro Continisio
e5e7acc6
Merge branch 'art-assets' into main
4 年前
Ciro Continisio
bbca6fd1
Imported rigged Phoenix Chick + 2 animations
4 年前
treivize
bb0dafff
Added Slime Critter and new Toon shader to add Fresnel effect on it
4 年前
treivize
e2449c18
[WIP] Plant Critter - Model UV Color Rig Animations
4 年前
Smurjo
e13fb58d
Sombrero for townsfolk
Sombrero for townsfolk to make them look more unique - suitable for one-sided rendering.
4 年前
treivize
245438bb
Fixed Fresnel effect done before outline and add water like movement
4 年前
treivize
4b202e5f
[WIP] Better UV, Rig and Texture
4 年前
Smurjo
488d5b71
Added curls and low quality sombrero
The curly hair and the sombrero are intended as accessoires to make the townsfolk more unique
4 年前
treivize
612432c6
Added Slime Critters variants and final Toon_Fresnel Shader
4 年前
treivize
884f78d8
[WIP] Update animations Idle, Warn, Alert and Attack
4 年前
Smurjo
86bfbbeb
adding ear hair
Tuffs of air hair for individualizing townsfolk.
4 年前
treivize
449795a4
Add latest texture
4 年前
treivize
f1cf3605
Simplify Toon_Fresnel shader - move Direct Specular to Lightning Model
4 年前
treivize
b5ba51b4
Added meshed eyes with animation for them
4 年前
treivize
d21bf195
Fix prefabs and FBX import
4 年前
treivize
93d46d23
Added spawning, injured and faint animations to plant critter
4 年前
kgc00
253b73a3
Merge remote-tracking branch 'upstream/main' into main
4 年前
andytouch
a397d578
Art: Added Detail Masks for Main Characters. Added DetailMaskTint Shader Graph.
4 年前
Chema Damak
597b3f7b
Merge branch 'localization' into main
4 年前
treivize
896fc63a
Removed eyes from Plant Critter and set up a proper animator
4 年前
kgc00
7b04a609
Merge branch 'main' into simple-menu-controls
4 年前
treivize
e9e05bd8
Updated Alert animation and clean up branch
4 年前
Ciro Continisio
7be88cca
Removed script Character, moved StateMachine SOs
4 年前
Chema Damak
3aaa37cc
Add UI system, Inventory UI and update Inventory System
4 年前
Ciro Continisio
58d65aa2
Merge remote-tracking branch 'tech-mkt/main' into pr-bashing
4 年前
Ciro Continisio
12f2649c
Talk animation re-implemented
4 年前
Ciro Continisio
3e2ad7f2
Integrated dust particles
4 年前
Ciro Continisio
f8f9e0b0
Event system refactoring
4 年前
Ciro Continisio
07d58711
Boat, Fry king
4 年前
Ciro Continisio
6804ad52
Boat, Fry king, Lantern fixes
4 年前
Ciro Continisio
11c7a35b
Pig chef fixed animations
4 年前
Ciro Continisio
b5de134f
New art demo scene
4 年前
Ciro Continisio
ce5b07db
Fry king in scene, Loading tweaks
4 年前
Ciro Continisio
21cfe483
Art showcase tweaks
4 年前
Ciro Continisio
05095f49
Merge remote-tracking branch 'tech-mkt/art-assets' into pr-bashing
4 年前
Ciro Continisio
826ef58b
AudioSystem functionality
4 年前
jamieTSC
549a8569
+ added 4 new wildflowers (meshes, Material, texture and prefabs)
4 年前
jamieTSC
dd7ca1cc
+ added more wildflowers
+ added vertex painting for correction wind
+ added mask map for Andy's shader variants
4 年前
treivize
0728a4c6
Merge branch 'art-assets' into feature/art/pant_critter
4 年前
GitHub
14e737cc
Merge pull request #1 from UnityTechnologies/art-assets
Art assets
4 年前
Ciro Continisio
8c8cc61d
Fixed boat hierarchy
4 年前
Llaczky
955d7516
Nature Assets Fix V1.2
- Changes in the Textures, Topology and pivots
-Different types of plants and one big house.
4 年前
Eduardo de Albuquerque
70705bfb
Created hammer model and texture
4 年前
Smurjo
ae5ffec8
hair color mask material, old lady hairdo and glass, moustache, and shell bowl
Various art assets to make the townsfolk more unique. Bowl made from a giant shell.
4 年前
Eduardo de Albuquerque
5a311bc8
Updated the outline value to 2 as recommended in the Art Guidelines and created a prefab
4 年前
Llaczky
a05af5c2
Merge branch 'main' into art-assets
4 年前
GitHub
e09986b8
Merge branch 'main' into fix/object-pool
4 年前
Llaczky
b9257924
TownAssets
More enviroment 3D assets.
-Small house in the same style.
-Empty market stands
-Small market items for decoration
-A door.
4 年前
Ciro Continisio
09419cf4
Tweaks, dither shader
4 年前
Ciro Continisio
71b3bcca
Merge branch 'art-assets' of https://github.com/Llaczky/open-project-1 into art-assets
4 年前
Ciro Continisio
a0ac9ece
Imported and tweaked extra vegetation
4 年前
Ciro Continisio
b414fbe0
Merge branch 'art-assets' into main
4 年前
Ciro Continisio
36980642
Merge branch 'HammerTool' of https://github.com/erizzoalbuquerque/open-project-1 into art-assets
4 年前
Ciro Continisio
c1c36a96
Imported hammer
4 年前
Ciro Continisio
2dd78eab
Merge branch 'art-assets' of https://github.com/Smurjo/open-project-1 into art-assets
4 年前
Ciro Continisio
821a306a
Imported accessories
4 年前
Ciro Continisio
ab1e315f
Merge branch 'art-assets' of https://github.com/JamieNooten/open-project-1 into art-assets
4 年前
Ciro Continisio
291ae413
New flowers, fixes
Switched many small assets to bake with light probes instead of lightmaps
4 年前
Ciro Continisio
1d26bec4
Merge branch 'main' into state-machine-improvements
4 年前
treivize
df2ab2a2
Merge branch 'art-assets' into feature/art/slime_critter
4 年前
Eduardo de Albuquerque
8845aa98
Merge branch 'main' into HollowBoatEffect
# Conflicts:
# UOP1_Project/Assets/Settings/Graphics/ToonRendererData.asset
# UOP1_Project/ProjectSettings/TagManager.asset
4 年前
Ciro Continisio
420aec35
Imported new rocks, asset fixes
Tweaked size of some trees
4 年前
Eduardo de Albuquerque
3cb4982d
Added a mask geometry to the project and updated boat prefab
4 年前
Ciro Continisio
d9dd5e5e
Tweaked RenderFeatures
4 年前
Ciro Continisio
ce50c2eb
Merge branch 'art-assets' of github.com:UnityTechnologies/open-project-1 into art-assets
4 年前
Ciro Continisio
ded7ec7c
Merge branch 'feature/art/pant_critter' of https://github.com/treivize/open-project-1 into pr-bash
4 年前
Ciro Continisio
5dd0e2e5
Small tweaks to the material and animator
4 年前
Ciro Continisio
163fb9ae
Merge branch 'feature/art/slime_critter' of https://github.com/treivize/open-project-1 into pr-bash
4 年前
Ciro Continisio
0661be42
Re-preffabbed the slimes
4 年前
Ciro Continisio
1413811f
Material properties
4 年前
Ciro Continisio
bd14256e
Material and prefab tweaks
4 年前
Ciro Continisio
d4366a3d
Rebaked scenes, removed directional lightmaps
4 年前
GitHub
5a9a452f
Fix Plant Critter mesh scaling and name ( #239 )
4 年前
GitHub
19a7c4c5
Upgrade to 2020.2.13b ( #247 )
4 年前
Ciro Continisio
101906b4
Townsfolk_M animations, Palm2
4 年前
Dane Byrd
bd72e4e6
Merge remote-tracking branch 'UnityTechnologies/art-assets' into art-assets
4 年前
Ciro Continisio
f588e37a
New tree type
4 年前
GitHub
7559c2e4
[WIP] Added some table furniture ( #233 )
* Added some table furnitures
* Corrected all furniture prefabs to be prefab variant
4 年前
Dane Byrd
8ae0f49f
Remove Albedo Influence on Specular Light Brightness
Swapping the order of the multiply and add nodes in the ToonShading subgraph to multiply albedo by diffuse light alone, then add specular highlights.
Along with this is the need ability to control specular light transparency, which can now be done using the Specular Color property's alpha channel.
4 年前
GitHub
6bf8be1d
Added back recklol Dissolve effect ( #217 )
* Added recklol dissolve effect with some tweaks
* Added names to dissolve outputs
* Added a dissolve effect option in contextual menu and add alpha cutoff in Toon_Disolve
4 年前
Ciro Continisio
b6de1aab
Merge branch 'art-assets' of https://github.com/Smurjo/open-project-1 into pr-bash
4 年前
Ciro Continisio
3def478b
Imported Smurjo's models, reorganised folders
4 年前
Ciro Continisio
11189097
Merge remote-tracking branch '_tech-mkt/art-assets' into art-assets
4 年前
Ciro Continisio
efd5063f
Imported latest town assets
4 年前
GitHub
74658126
Added Frying Pan asset ( #252 )
* Added Frying pan assets
* Changed material smothness
4 年前
GitHub
8c61e1d3
Updated furnishing texture and colliders on furniture ( #251 )
4 年前
Ciro Continisio
e7641175
Merge branch 'art-assets' of https://github.com/daneobyrd/open-project-1 into daneobyrd-art-assets
4 年前
Ciro Continisio
de401a73
Shader tweaks and reorganisation
4 年前
Ciro Continisio
019c7796
Merge branch 'art-assets' into main
4 年前
Ciro Continisio
6a16876d
Relocated stray assets
4 年前
Amel
8c488723
updated pig chef animator controller for pick up animation
4 年前
Ciro Continisio
d62d8e9e
Merge branch 'main' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Prefabs/PrototypingTree.prefab.meta
# UOP1_Project/Assets/Samples.meta
# UOP1_Project/Assets/Samples/Polybrush.meta
# UOP1_Project/Assets/Samples/ProBuilder/4.4.0/Universal Render Pipeline Support/Material/ProBuilder Default URP.mat.meta
# UOP1_Project/Assets/Scenes/ArtShowcase/LightingData.asset.meta
# UOP1_Project/Assets/Scenes/ArtShowcase/ReflectionProbe-0.exr.meta
# UOP1_Project/Assets/Scenes/CharController.unity.meta
# UOP1_Project/Assets/Scenes/CharController/LightingData.asset
# UOP1_Project/Assets/Scenes/CharController/LightingData.asset.meta
# UOP1_Project/Assets/Scenes/CharController/ReflectionProbe-0.exr.meta
# UOP1_Project/Assets/Scenes/Locations/Beach/LightingData.asset
# UOP1_Project/Assets/Scenes/TestingGround.unity.meta
# UOP1_Project/Assets/Scenes/Whiteboxing/Beach/Proposal_1/BeachWhiteboxing_1_optimized.unity.meta
# UOP1_Project/Assets/Scenes/Whiteboxing/Beach/Proposal_1/BeachWhiteboxing_1_opt...
4 年前
GitHub
5c82e99e
Merge pull request #2 from UnityTechnologies/main
import changes from main
4 年前
Ciro Continisio
2e18946e
Imported ground textures
4 年前
Smurjo
c6862e6f
palm leaf set and lobster
Prefabs for the cooking festival
4 年前
Ciro Continisio
443b4a6c
New FryKing animations and prefab
4 年前
Ciro Continisio
648aa035
First setup
4 年前
Amel
90998767
Merge remote-tracking branch 'origin/Inventory' into interaction
4 年前
Ciro Continisio
e7b2e446
New art assets
4 年前
Dan Young
268ab82e
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
Ciro Continisio
6c55468b
Skybox experiments
4 年前
Ciro Continisio
2b770690
ClearSky skybox
4 年前
Amel
2c9810c9
Merge branch 'main' into interaction
4 年前
Chema Damak
8a166bf0
Merge branch 'interaction' of https://github.com/UnityTechnologies/open-project-1 into interaction
4 年前
uChema
6434aa7b
Renaming and cleaning folders
4 年前
Amel Negra
96e4f244
Merge remote-tracking branch 'origin/interaction' into interaction
4 年前
Amel Negra
370a7993
Merge remote-tracking branch 'origin/main' into interaction
4 年前
Amel Negra
9bae4220
Merge remote-tracking branch 'origin/interaction' into main
4 年前
Ciro Continisio
77242d26
Merge branch 'main' of github.com:UnityTechnologies/open-project-1 into main
# Conflicts:
# UOP1_Project/Assets/Scenes/TestingGround.unity
4 年前
Ciro Continisio
716120b4
Bushes, new Fern plant
4 年前
Ciro Continisio
5f6fe538
Merge branch 'main' of https://github.com/Smurjo/open-project-1 into pr-bash
4 年前
Ciro Continisio
cd138aa3
Imported lobster, palm leaf set, tavern owner's hair
4 年前
Ciro Continisio
2149cc50
AnimationRigging setup, lantern grab clip
4 年前
Ciro Continisio
1645ed7d
Added BardHare and FryKing animations
4 年前
Ciro Continisio
e3f6f31a
Added Run and Faint animation for PigChef, implemented Run as BlendTree
4 年前
Dan Young
7ce66d74
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
Amel Negra
a3fdb227
Merge branch 'main' into whiteboxing
4 年前
uChema
f9f6593b
Basis for QuestSystem WIP
4 年前
Bartha Szabolcs
3476d6ab
Added new Accessory: Unibrow
Unibrow is a new accessory, similiar in style to the moustache, intended to use the same textures.
4 年前
lpchow
9946260e
Add anims for slimecritter, create animcontroller, update its prefab with latest rig
4 年前
Ciro Continisio
d80af9c6
Imported new art
Fern2, Shell2 and Shell3, new faint animation
4 年前
HarshNarayanJha
e1f4210f
A Wooden Bench to Sit and eat
4 年前
GitHub
b196db3a
General Map Whiteboxing_1 ( #294 )
4 年前
Ciro Continisio
6294ecab
Merge branch 'art-assets' into pr-bash
4 年前
treivize
a4dc96e7
Initial Plant Critter combat system - Get Hit - Killed
4 年前
Dan Young
038d588e
Oven from DanTen66
Here is the Oven that I have been working on with Albedo, Material and a Prefab Variant. I am including the .meta files just in case.
You mentioned not to adjust the material shader, though this one has an outline and from what I understand the buildings and enviroment are not supposed to.
4 年前
uChema
79e39b28
Merging Dialogue branching to the Quest System.
4 年前
Ciro Continisio
7e93f4c9
Bush texture update
4 年前
GitHub
d0298f3d
Merge pull request #3 from UnityTechnologies/art-assets
Art assets
4 年前
Smurjo
178053c0
Almonds, artichokes, cucumbers, lemons, onions, oranges, truffles, vanilla
Almonds, artichokes, cucumbers, lemons, onions, oranges, truffles, vanilla
4 年前
Smurjo
50b64a9a
added ginger, applied transform at Blender fbx export for almonds, artichokes, cucumber and lemons
added ginger
applied transform at Blender fbx export for almonds, artichokes, cucumber and lemons
moved prefabs to prefab folder "food"
4 年前
Smurjo
0c706b8e
applied transform at Blender fbx export for oranges, onions, truffles and vanilla
applied transform at Blender fbx export for oranges, onions, truffles and vanilla
moved prefabs to prefab folder
4 年前
HarshNarayanJha
06438a1a
Pulled from upstream/main
4 年前
Amel Negra
c444c501
Merge remote-tracking branch 'origin/main' into scenes-re-architecture
4 年前
Smurjo
10477f56
Added maize
It's the same texture for all, 1024x1024.
Triangles:
- maize cob 640
- single grain 88
- maize in box 1630
4 年前
HarshNarayanJha
37b819b9
Revisioned The Bench
4 年前
Smurjo
61e85048
Added mangetout
2 slightly different versions plus one with the ends cut off
The texture is 1024x1024.
Triangles:
mangetout pod (2 versions) 380 and 290
mangetout cooked 134
mangetout in box 2885
4 年前
Ciro Continisio
1f10f375
Merge branch 'art-assets' into pr-bash
4 年前
Smurjo
90fe71a7
critter eggs, critter seeds and chicolade
Fantasy food ingredients obtained from critters.
4 年前
Amel Negra
9bd8609f
Added filled circle sprite
4 年前
Amel Negra
a98227d6
images for loading screen tests
4 年前
Amel Negra
a60986ee
updated loading screen
4 年前
Amel Negra
e8d73e33
Merge branch 'scenes-re-architecture' into main
4 年前
Ciro Continisio
b15b206e
Merge branch 'main' of https://github.com/HarshNarayanJha/open-project-1 into pr-bash
4 年前
Ciro Continisio
ef68d3e0
Imported WoodenBench
4 年前
Ciro Continisio
e6e1f38f
Merge branch 'feature/sub/plant_critter_combat_system' of https://github.com/treivize/open-project-1 into pr-bash
4 年前
Ciro Continisio
6592ba26
Tweaks
Protagonist now moves to Idle state after attack, with the right timing
4 年前
Ciro Continisio
162a06e3
Refactoring, renaming, comments
4 年前
Ciro Continisio
6e9237b6
Walkling cane as weapon, tweaks to animations
4 年前
Ciro Continisio
7c088a1f
Merge branch 'pr-bash' into main
4 年前
Ciro Continisio
1cd999fc
Merge branch 'art-assets' of https://github.com/lpchow/open-project-1 into pr-bash
4 年前
Ciro Continisio
9429e445
Imported SlimeCritter animations
4 年前
GitHub
54240307
Devlog 3: Handling complex input ( #307 )
Project upgrade to 2021.1
4 年前
Ciro Continisio
c6c67ff0
New sound effects
Wired new sound effects: jump, pickup, swing cane and footsteps
Laid the foundation work for more
Script playing sfx on player from animation clips
4 年前
Ciro Continisio
e05d8586
Tweaks to Pig's walk
4 年前
Ciro Continisio
49f39298
Imported new animations
4 年前
Ciro Continisio
6e1104f0
Merge branch 'pr-bash' into main
4 年前
Ciro Continisio
2fdc2b25
More animations
4 年前
Ciro Continisio
46a89483
More animations
4 年前
Ciro Continisio
71186bf9
Merge branch 'art-assets' into main
# Conflicts:
# UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef.controller
4 年前
uChema
c28d9833
Merge branch 'main' into QuestSystem
4 年前
Ciro Continisio
4b89665c
Wind shader improved and painted more meshes
4 年前
GitHub
54f79bad
Added slime critter behavior ( #312 )
* Slime Critter initial behavior
* Added slime critter behavior
4 年前
Ciro Continisio
183fdac0
Merge remote-tracking branch 'tech-mkt/main' into main
4 年前
Dan Young
eb670224
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
Nathan V
82b90ca9
Created a Farmer Hat for Accessories
Added a prefab, model, and a texture for the Farmer Hat.
4 年前
GitHub
faf70fc8
Slime critter propel attack ( #315 )
4 年前
GitHub
71fe0c78
Update PigChef TransitionTable, Jumping and Sliding mechanics ( #310 )
* Update PigChef_TransitionTable.asset
Changes:
- From Idle
- To Sliding
- ~~IsActuallyMoving~~
- To JumpAscending
- ~~IsSliding~~
- From Walking
- **To Sliding (moved above To JumpAscending)**
- To JumpAscending
- ~~IsSliding~~
* Reordered Walking and Idle states transitions.
- To Sliding
- To JumpAscending
- To JumpDescending
- To Attack
- To PickUp
- To Talk
- To Walking/Idle
* Update PigChef.controller
Updated PigChef Animator controller to reflect the changes to the TransitionTable:
- Added transition from Walking to Collect on PickUp trigger.
- Added transition from Walking to Talking when IsTalking is True.
* Added MidSliding State
The MidSliding State is added to prevent the state machine from going back and forth between Sliding and JumpDescending when not needed.
* Major changes to player sliding and aerial movement, bug fixes, and adjustments...
4 年前
Ciro Continisio
c691552b
Merge branch 'pr-bash' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Samples.meta
4 年前
Ciro Continisio
2f001d27
Prefab tweaks
4 年前
Ciro Continisio
1c9c17d2
Reorganisation
4 年前
Ciro Continisio
2c375fd1
Merge branch 'art-assets' of https://github.com/MortyJHin/open-project-1 into pr-bash
4 年前
Ciro Continisio
30e58a35
Farmer hat tweaks
4 年前
Ciro Continisio
01b4cabf
Food and vegetables
# Conflicts:
# UOP1_Project/Packages/packages-lock.json
# UOP1_Project/ProjectSettings/PackageManagerSettings.asset
# UOP1_Project/ProjectSettings/ProjectVersion.txt
4 年前
Ciro Continisio
bba6e8cc
Merge branch 'art-assets' of https://github.com/danten66/open-project-1 into pr-bash
4 年前
Ciro Continisio
4ca6acbc
Oven in scene
4 年前
Ciro Continisio
81be45e7
Merge branch 'art-assets' of https://github.com/BarthaSzabolcs/open-project-1 into main
4 年前
Dane Byrd
c6beedc4
Merge branch 'art-assets' into ground_shader
4 年前
uChema
0f397e96
Merge branch 'main' into QuestSystem
4 年前
Smurjo
9b89eaca
Whiteboxing with reduced size
Scene "GeneralMapReduced". Including art asset "BigFallenTreeWithLeaves" which serves to block the path until the player has finished the tutorial quest.
4 年前
Ciro Continisio
5ca74ffe
Beach and Glade midboxing
4 年前
Ciro Continisio
a30ece4a
Merge branch 'pr-bash' into art-assets
4 年前
Ciro Continisio
bd2b6359
Midboxing again
4 年前
Ciro Continisio
b60fe6c7
Tweaks and bamboos
4 年前
Yohann Puyhaubert
07983754
Added Slime Critter droplets when moving
4 年前
GitHub
81481d8b
Merge pull request #4 from UnityTechnologies/main
update my local branch
4 年前
Smurjo
456c7bdd
Whiteboxing of general map in medium size divided into 6 scenes
- contains minimalistic scene loading and unloading scripts only for trying this out
- contains small editor tool to create views. Don't delete deactivated objects in spawn scene if you want to update the views. There is the issue that the created views are too dark, I suspect it is a problem between the Texture2D-Format and the RenderTexture-Format - I would appreciate advice which formats to use.
- contains few additional art assets like shiitake mushrooms, big trees, bushes and creepers. The bushes are intended only for the whiteboxing to be replaced with more elaborate art assets later. The creepers and big trees are to be refined somewhat if we decide to use them.
To try out the map open the spawn scene and press play in the editor. Make sure all scenes were added to the build settings.
4 年前
Ciro Continisio
e5f66cfc
Tweaks, removing doppler effect
4 年前
alex
2f536097
Merge remote-tracking branch 'upstream/main' into main
4 年前
Ciro Continisio
01f30d5a
Imported animations and art
4 年前
Ciro Continisio
e633636d
More animations
4 年前
GitHub
762d050f
Merge pull request #6 from UnityTechnologies/main
Updating my branch
4 年前
Yohann Puyhaubert
a5261cf1
Combat System - Added player getting hit and killed states
4 年前
Smurjo
df03afb9
Merge branch 'main' of https://github.com/Smurjo/open-project-1 into main
4 年前
Ciro Continisio
1690f35f
PigChef jump fixes, particles on jump liftoff
4 年前
Yohann Puyhaubert
ed7d963f
Added Player Cane Hit variant and enabling attack based on animation events
4 年前
Ciro Continisio
e85967c7
Refined PigChef walk animation
4 年前
Ciro Continisio
0d4b9d8a
Refactoring, moved items
4 年前
Ciro Continisio
b7e86dc9
Merge branch 'main' of https://github.com/AlexandreGheraibia/open-project-1 into main
# Conflicts:
# UOP1_Project/Assets/Prefabs/Characters/Pig/Interaction.prefab
# UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab
4 年前
Ciro Continisio
3d4ab5fa
Merge branch 'feature/combat-player-get-hit' of https://github.com/treivize/open-project-1 into pr-bash
# Conflicts:
# UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab
# UOP1_Project/Assets/Prefabs/Characters/PlantCritter.prefab
# UOP1_Project/Assets/Prefabs/Characters/SlimeCritter_Base.prefab
4 年前
Ciro Continisio
7ea6bfdf
Merge branch 'feature/player-cane-hit-anim-variant' of https://github.com/treivize/open-project-1 into pr-bash
# Conflicts:
# UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AttackTrigger.asset
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AttackTrigger.asset.meta
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AttackTrigger_OnEnter.asset
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AttackTrigger_OnEnter.asset.meta
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsAttacking_False_OnEnter.asset
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsAttacking_True_OnEnter.asset.meta
4 年前
Ciro Continisio
28d4d3bb
Attack system overhaul
4 年前
Ciro Continisio
761001e0
Merge branch 'art/slime-critter-droplet' of https://github.com/treivize/open-project-1 into pr-bash
4 年前
uChema
7ece782e
Merge branch 'main' into QuestSystem
4 年前
Ciro Continisio
ff1bfdd1
Imported new animations
4 年前
Nathan V
3ba4a5e6
More Accessories
Clothes:
Belt
Cavalier Hat
Lappvattnet
RuffCollar
ToolBelt
Tudor
Items:
HayStraw
Lute
PanFlute
PitchFork
Tambourine
4 年前
Chema Damak
e7bcdcfd
Fixing the merge
4 年前
Ciro Continisio
7cd4ce12
Merge remote-tracking branch 'tech-mkt/main' into pr-bash
4 年前
GitHub
d07ee56f
Merge pull request #1 from UnityTechnologies/main
Latest changes
4 年前
GitHub
b5417125
Merge pull request #7 from UnityTechnologies/main
Updating my local repository
4 年前
Smurjo
e7c4b415
Added cooking festival to whiteboxing of medium scale map
whiteboxing as shown in https://youtu.be/TnBEHHI2FtA
4 年前
Ciro Continisio
6acf65d7
Tweaked emission graph, added textures
4 年前
Yohann Puyhaubert
0b3da4fa
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
4 年前
Ciro Continisio
bd33c8df
Merge branch 'main' of https://github.com/Smurjo/open-project-1 into pr-bash
4 年前
Ciro Continisio
477798f0
Relocated temp assets in whiteboxing folder
4 年前
Yohann Puyhaubert
068abd40
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
4 年前
Ciro Continisio
f023e9d4
Imported polished animations
4 年前
Ciro Continisio
7087fd8d
Relocated source PSDs
4 年前
GitHub
1a55f5b1
More Accessories ( #358 )
Clothes:
Belt
Cavalier Hat
Lappvattnet
RuffCollar
ToolBelt
Tudor
Items:
HayStraw
Lute
PanFlute
PitchFork
Tambourine
4 年前
RTBRuhan
9dadf27e
Created Fence
I am not sure if the material is set properly. And I have used 4k texture for them. Here 👇 is the link to download the model project. Please feel free to do anything with it 😊 and stay healthy.
https://drive.google.com/file/d/1_V9Np0h9emKdIrJ0cd4HNZq2FenlYn-P/view?usp=sharing
4 年前
GitHub
c20ffd23
Added slash effect when player is triggering an attack ( #356 )
* Added slash effect when player is triggering an attack
* Corrected after merge from main
* renamed script to correct typing mistake
Co-authored-by: Amel Negra <amel.negra@unity3d.com>
4 年前
Amel Negra
7bc138f1
Merge remote-tracking branch 'MortyJHin/art-assets' into main
4 年前
Bronson Zgeb
a19b2328
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Ciro Continisio
2f0661e3
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Ciro Continisio
646874a1
Merge branch 'art-assets' of https://github.com/RTBRuhan/open-project-1 into pr-bash
4 年前
Ciro Continisio
e59508f5
Imported fence assets
4 年前
Ciro Continisio
05b8a006
Merge branch 'main' into art-assets
4 年前
Bronson Zgeb
80efbc3c
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Amel Negra
2e6b1d55
Merge remote-tracking branch 'origin/main' into main
4 年前
Ciro Continisio
07f4bf25
Music playing
4 年前
Ciro Continisio
cdc832d0
Reorganised Addressables
4 年前
Ciro Continisio
26ab9830
Fixed CaneSwing SFX, new toon Slash effect
4 年前
uChema
3d4fdc12
UI Integration (WIP)
4 年前
uChema
5e51d58b
UI Improvements
4 年前
Yohann Puyhaubert
460eb34c
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
4 年前
uChema
7321e9d0
UI Integration (WIP)
4 年前
Kyle Minors
1bec3630
Updated water shader added.
Stored with a new plane, material and timeline asset.
4 年前
uChema
da6359bd
small improvements
4 年前
Ciro Continisio
91a763b7
Updated project to 2020 LTS
4 年前
Ciro Continisio
a68b6c07
Water values reinstated
4 年前
Yohann Puyhaubert
b7bb56dd
Fix attack logic to consume attack from animation events
4 年前
Ciro Continisio
50a25f4a
Merge branch 'main' into 2020-lts
4 年前
uChema
5bb0b53c
Fixing some UIs / Adding localized preview image for the items
4 年前
Ciro Continisio
bfe7e497
New fire effect
4 年前
uChema
627867d3
UI Tweeks + some items descriptions
4 年前
Carlos Anderson
aadc5919
Add beer keg model, material, and prefab
3 年前
uChema
7abf0997
WIP - UI Integration
3 年前
Ciro Continisio
09ce5d71
Tweaks
4 年前
Carlos Anderson
65674583
Add cutting board model, material, and prefab
3 年前
Ciro Continisio
475acb43
Revised animations
4 年前
Ciro Continisio
16e743f5
Merge remote-tracking branch 'tech-mkt/main' into main
4 年前
Ciro Continisio
2eabe55e
Outlines removed
4 年前
Amel Negra
5464088e
Merge branch 'feature/combat-update-consume-input' into main
4 年前
Ciro Continisio
544c3cc9
Eliminated some outlins
3 年前
GitHub
c0b2931f
Merge pull request #1 from UnityTechnologies/main
Update fork
3 年前
Ciro Continisio
ea50928b
Character animations
3 年前
Ciro Continisio
31a3eba6
Character animations
3 年前
Ciro Continisio
e81c0ea8
Material work
3 年前
Ciro Continisio
864de4dc
Leftover files
3 年前
Ciro Continisio
c0e6aa2f
New painted skybox
3 年前
Brett
848058e8
Merge remote-tracking branch 'upstream/main' into main
3 年前
Ciro Continisio
ccbaa8cd
Recreating clips with staff
3 年前
Ciro Continisio
f52bd332
Skybox v2
3 年前
Ciro Continisio
61a9901f
Sub state machines
Idle variations implemented, Cane hits compiled into sub-state
3 年前
Ciro Continisio
107a317d
Land added
3 年前
Ciro Continisio
148520ea
Animation tweaks
3 年前
Ciro Continisio
236a03cd
Skyboxes
3 年前
Ciro Continisio
8e91ed4b
Acceleration/Deceleration for character
3 年前
Ciro Continisio
6683b1e2
Torches, shader changes
3 年前
Ciro Continisio
eaff6ea8
Fire, embers, smoke
3 年前
Ciro Continisio
753835bc
Night sky, sunset
3 年前
Ciro Continisio
58aa7cff
Material and texture tweaks
3 年前
Ciro Continisio
847a1352
Rock shader with grass or sand
3 年前
Ciro Continisio
7f0a24a9
Grass and Sand adjustments
3 年前
Ciro Continisio
293f994f
Merge branch 'graphic-rework'
3 年前
GitHub
6f7ba06a
Added L0D Models for Townsfolk ( #394 )
Created L0D Models for the Male/Female Townsfolk.
They are located in Art/Townsfolk_(M/L) in a FBX and Prefabs that have Animators attached to them.
3 年前
Amel
77827673
Renamed LOD
3 年前
Amel
75d340a3
Merge remote-tracking branch 'redcurry/art-assets' into main
3 年前
Amel
79a9f0bb
Updated new models materials to URP Unlit and assigning the base maps
3 年前
Amel
3aab4f7e
Updated materials on new props to use Toon shader
3 年前
Ciro Continisio
a1bec1ec
Random idle for PigChef
Added script to randomise idle animation, small fix for the transition to jump, plus transitions between the two idles
3 年前
uChema
997b50ae
Merge branch 'main' into pr/393
3 年前
Amel
7b1ed2b2
Merge branch 'main' into UI
3 年前
Amel
4857849f
Added pigChef attack avatar mask
3 年前
uChema
129eaee3
Control Dialogue with keyboard/controller
3 年前
uChema
e4b71f99
Add controls
3 年前
Amel
c17eea45
Added Upper-body attack layer to PigChef controller
3 年前
uChema
5c109f22
Fix Items / Condense Localization tables. NB : Quests are not working anymore
3 年前
Amel
72040b36
Getting hit update
3 年前
Amel
8c7c6a9c
Now possible to jump and attack
3 年前
Amel Negra
75180244
Merge remote-tracking branch 'origin/main' into main
3 年前
uChema
0db80293
Change disabled and Selected button graphics. Add reset UI when reloaded
3 年前
uChema
84d13891
Merge branch 'main' into UI
3 年前
Ciro Continisio
76adf666
Tweaks to plants
All 3D models of vegetation have been tweaked in size, and have proper green channel for wind. Removed isolated mesh assets.
3 年前
Amel
551d6066
Working on Townsfolk Animator Controller
3 年前
uChema
0ed45c81
Add Collectible Prefab
3 年前
Ciro Continisio
3bd54bf1
New colliders for BigRocks and BigTree
3 年前
Ciro Continisio
6dbe9c46
Trees collider tweaks
3 年前
uChema
20cfec67
clean up folders
3 年前
Ciro Continisio
2d718f1c
Merge branch 'main' into vegetation-tweaks
# Conflicts:
# UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
3 年前
Ciro Continisio
f40bd45e
Phoenix Chick 2.0
3 年前
Ciro Continisio
05c41c7f
Rebaked scenes
3 年前
Ciro Continisio
95e2789c
Tweaked protagonist attack
Now moving very slowly while attacking
3 年前
uChema
e76a2bb9
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
uChema
53e43844
Renaming folders + Add UI Art Assets
3 年前
Ciro Continisio
0f056131
Improved pickup animation
Fine tuned state machine timing, added Pickup to Idle transition in Animator
3 年前
GitHub
509abae6
Add small bridge model, material, and prefab ( #423 )
3 年前
Ciro Continisio
6620446f
Navigation-related prefab tweaks
3 年前
Amel Negra
e0ede3d5
Merge branch 'main' into AmelMain
3 年前
Ciro Continisio
8f5b1bdb
Refined PigChef animations
3 年前
Ciro Continisio
17caa017
Cleanup
3 年前
Amel Negra
7004ced9
Updating townsfolk F and M prefabs
3 年前
uChema
3ce06cf5
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Ciro Continisio
bc17972b
Merge branch 'main' into iet
# Conflicts:
# UOP1_Project/Packages/manifest.json
3 年前
Amel Negra
c094f333
Merge branch 'main' into AmelMain
3 年前
uChema
cf9b5d2c
WIP Settings menu
3 年前
uChema
b52c1a1f
Add UI to Main Menu + Add Popup + Working on Settings
3 年前
Amel Negra
203ad8de
Renamed ''idle 2'' RockCritter animation to ''Alert ''
3 年前
uChema
167ca847
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Amel Negra
738b219b
Adding exit to idle from talk in the Animator Controller
3 年前
Ciro Continisio
e4d15d8c
Relocated whiteboxing scenes and folders
3 年前
Amel Negra
ddcc378c
Merge branch 'main' into AmelMain
3 年前
Amel Negra
f71fd525
wip bard hare animator
3 年前
Amel Negra
b770e356
bard hare animator controller
3 年前
Amel Negra
21715b8e
bard hare animator controller
3 年前
Amel
30038c42
Bard hare Animator controller and Prefab update
3 年前
Amel
811a6012
Bard hare state machine wip
3 年前
Amel Negra
ce10fdea
Bard hare state machine working
3 年前
Amel Negra
8151f1b5
Merge remote-tracking branch 'origin/main' into AmelMain
3 年前
Amel Negra
8ff69edb
Bard hare animator controller tweaking
3 年前
uChema
127bd54d
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Ciro Continisio
350159af
Merge branch 'main' into whiteboxing
3 年前
Amel Negra
abfb3081
Rock Critter Animator Override Controller
3 年前
Amel Negra
db4289a0
removing old rock critter controller
3 年前
Amel Negra
5552969c
adding attack in place anim to test for rock critter
3 年前
Amel Negra
a1965f75
added events to attack anim
3 年前
Amel Negra
4d800711
replace with new attack anim on rock critter override controller
3 年前
Amel Negra
99871ed8
temporarily using the idle animation for the rock critter faint
3 年前
Amel Negra
0f2334d3
removing broken attack in place anim
3 年前
Amel Negra
6bb088d5
Attack animation works
3 年前
Amel Negra
348c8c14
Merge branch 'AmelMain' into main
3 年前
uChema
c24dd21f
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 年前
uChema
52a617fe
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Ciro Continisio
4a525440
Scene separated
3 年前
Ciro Continisio
42b7725e
Connected almost all scenes
Missing TownMarket and TownUpper
3 年前
Amel Negra
a83290a1
Bard Hare Animator Controller separating jump up and down from talk
3 年前
uChema
75076141
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Amel Negra
ef760f6d
Fry King Animator controller done
3 年前
Ciro Continisio
e6dcfc27
Merge branch 'main' into whiteboxing
3 年前
Ciro Continisio
49a9a175
Baked all location scenes
3 年前
Amel Negra
8d75ed88
Phoenix Chick Animator Controller
3 年前
Amel Negra
0b4f451f
Merge branch 'AmelMain' into main
3 年前
uChema
aa88e701
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
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
3 年前
Ciro Continisio
5636f0a4
Improvements to vertex ground shader
Now world-space coordinates
3 年前
Ciro Continisio
23bd82d4
Beach landmass painting v1
3 年前
Ciro Continisio
ebe81a73
Worldbuilding in progress
Landmasses vertex paint, water plane tweaks
3 年前
Amel
2897f987
Added revive trigger for Animator Controller to fit snooze state for Rock Critter
3 年前
Ciro Continisio
a2299fee
Water shaders, landmasses
3 年前
Amel
73a43775
Critters state machines adjustments
3 年前
Ciro Continisio
5cc9de68
Beach changes, worldbuilding
Light settings, shader changes, prefab tweaks, model tweaks
3 年前
Amel
901da185
Renaming critter states to fit both slime and rock critters
3 年前
uChema
ad0bf614
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Ciro Continisio
6bf9cfe1
Merge remote-tracking branch 'tech-mkt/main'
3 年前
Ciro Continisio
47ed0d6a
Merge branch 'main' into worldbuilding
3 年前
Ciro Continisio
17ad7091
Random tint shader
Added wind to random position tint shader
3 年前
Ciro Continisio
c22729d3
More worldbuilding
Full bake of all scenes
3 年前
GitHub
47348d31
Bridges and Earrings(Mesh, Material, and Prefabs) ( #429 )
Added more accessories for the [Accessories for Townsfolk card]
I also added the Bridge with the Side Railings.
3 年前
uChema
735363c3
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Amel
6f206e69
Merge remote-tracking branch 'origin/main' into mainAmel
3 年前
Amel
5fade22f
Adding audio events for plant critter on fbx
3 年前
Amel
973f4804
Adding audio events to slime critter fbx
3 年前
Amel
90c6c12d
Adding attack event for rock critter on animation (not fbx) since it's made in Unity
3 年前
Amel
681e36ce
Adding audio events to fbxs on rock critter
3 年前
Amel
fecdb9df
Merge branch 'main' into mainAmel
3 年前
Amel Negra
7654f9e8
Merge remote-tracking branch 'amel-unity/main' into main
3 年前
uChema
d0523373
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Amel Negra
50f5eeab
Adding animation events for audio
3 年前
Amel
8f750556
Added getting hit and faint sounds for protagonist
3 年前
Amel
050b37e4
Updating bard hare with sing short and long sfx SOs and updated FBXs
3 年前
Amel
43ef6d4e
Townsfolk F and M now talk as long as the animation plays
3 年前
Amel
29cb354f
Legendary Chef now talk as long as the animation plays
3 年前
Amel
de5ce681
Pig chef audio event added to fbx and pushing prefab
3 年前
Ciro Continisio
59efe5a3
Rock prefabs
3 年前
Ciro Continisio
71481135
Shader and lighting tweaks
3 年前
Ciro Continisio
4bd4a06c
Lightmap rebakes
3 年前
Ciro Continisio
53d9fe16
Scene work
3 年前
Ciro Continisio
85c5bf58
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Prefabs/Gameplay/CameraSystem.prefab
# UOP1_Project/Assets/Scenes/Locations/Beach.unity
3 年前
Ciro Continisio
8167037b
Worldbuilding
3 年前
Ciro Continisio
c0958996
Updated project to 2020.3.12f1
Updated relevant packages
Fixed 2 animation clips that behaved differently
3 年前
Ciro Continisio
38af1d45
PigChef tweaks
Added jump and land sfx
Jump animation now broken in 3 states (liftoff, in air, land)
Added extra late transition between cane swings, so the character is never waiting idle too long when the attack button is pressed
3 年前
uChema
eab4c107
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Ciro Continisio
2e9fcf21
BigTree shadow caster tweaks
Created custom shadow casting geometry for BigTrees, to get more light in the forest
3 年前
Ciro Continisio
dc51f9ac
More scenery work
3 年前
Ciro Continisio
51187a9d
Location work
3 年前
Ciro Continisio
587a2230
Worldbuilding
Scenes, rocks, waterfalls, foam, ...
Added fog
Rebaked all lighting
3 年前
uChema
d36df8f3
Adding save to disk on questline update
3 年前
Ciro Continisio
80582a3d
Skyboxes for Forest and Forest Entrance
3 年前
uChema
71dcdcfd
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Ciro Continisio
1b98a3e3
Merge branch 'main' of github.com:UnityTechnologies/open-project-1
3 年前
Ciro Continisio
d2ffcb9e
Added IK and new animations for BardHare
Adeed IK to the legs
Created new Sing_Sitting and Sing_Sitting2 sing variations
Created a new Listening animation starting from a talk one
3 年前
Ciro Continisio
f8947aa6
Sound tweaks and timing
Tweaked SFX timing on animation clips
3 年前
GitHub
a30ef766
Added Statue(Mesh, Material, and Prefabs) ( #458 )
Statue was a contribution that was discussed in the forums and not based on any codecks card. The name I do have for him is from a Youtube Video, so I don't have any ideas for an original name if needed.
Meshes and Prefabs are in their specific folders.
Please delete the questions below, and type the answers in their place instead
3 年前
uChema
b768a7dc
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Ciro Continisio
44bdea11
Fixed landing SFX playing when attacking in the air
3 年前
uChema
b4892bfe
Merge with main
3 年前
uChema
4413ebd5
Adding missing items + missing questline to a finite quest. Fixing errors.
Use TestingInventory with TestingGround_Questline scene to test the full quest
3 年前
Ciro Continisio
e7a11cf3
Interactables for Beach, Hill and Farms
3 年前
Nathan V
a1b0eb29
Modifying Railed Bridge Meshes
This PR was based on a discussion on the Forums, where I modified the bridges for specific reasons, such as having support beams to reach the ground or no support beams to make the bridge look like it's floating.
Longer Beams: https://forum.unity.com/threads/3d-art-assets.980892/page-7
No Support Beams: https://forum.unity.com/threads/3d-art-assets.980892/page-8
3 年前
Ciro Continisio
ba483324
Ayud and Felfel looks
3 年前
Ciro Continisio
56d5c554
Tweaks to glow shader
Fresnel influence is now controllable
3 年前
Ciro Continisio
509b93fe
Removed ForestEntrance scene
3 年前
Ciro Continisio
472b2651
Merge branch 'main' of https://github.com/MortyJHin/open-project-1 into worldbuilding
3 年前
Ciro Continisio
60b486d5
Scene work
3 年前
Ciro Continisio
3835c521
Skybox and water tweaks
Now endless water plane!
3 年前
Ciro Continisio
056f6536
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/BardHare.prefab
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/BardHare.prefab.meta
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/FryKing.prefab
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/FryKing.prefab.meta
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/Townsfolk_1.prefab.meta
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/Townsfolk_2.prefab.meta
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/Townsfolk_3.prefab
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/Townsfolk_3.prefab.meta
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/Townsfolk_4.prefab.meta
# UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/Ayud.prefab.meta
# UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/BardHare-Maqam.prefab
# UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/BardHare-Maqam.prefab.meta
# UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/BardHare.pr...
3 年前
Ciro Continisio
5ef923fb
Material and model tweaks
3 年前
Amel Negra
d25a7fc5
Adding black image png for cutscenes fade in and out
3 年前
uChema
718b6321
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Amel Negra
cdba81f2
Pushing animations, ACs and prefabs tweaked for cutscenes
3 年前
Amel Negra
a156875a
Merge remote-tracking branch 'origin/main' into main
3 年前
Amel Negra
d9d8d631
Adding talk sfx events to pig chef talk clips
3 年前
uChema
02a13eae
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
itsLevi0sa
340dd8dc
Merge branch 'main' into CaveWhiteboxing
3 年前
Ciro Continisio
984180df
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/02a28a9c355f4fac879be8ab591f1a6a.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/0f35a51a6d884c8ab30219b5a3b05de7.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/108b5a6e887748a1875141cf7eefbf8e.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/177f1a363471462daaaa7e27712e2b77.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/17f9a240deb94feb8a71fae200bf7ff1.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/26347a43a1d94f6eba6efb6ca3d40208.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/2ab75110e077404aaaa2789feb3cc82e.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/2f392744e4d142f7a81da2a69bdaa99f.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/512005dcb52a4d588ffc91db589f24ff.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/61ff26a351934...
3 年前
Ciro Continisio
1aeed5db
Water mill
3 年前
Ciro Continisio
33395788
RockCritter egg and Gold RockCritter egg
3 年前
Ciro Continisio
d3537763
Art assets
Tweaked wooden bench UVs and texture, created Campfire prefab out of PotOverFire
3 年前
Ciro Continisio
8e056bbc
Wok
Added wok model, created composite wok cooking prefab, added CookingSteam fx
3 年前
Amel Negra
a676cd5d
Merge remote-tracking branch 'origin/main' into main
3 年前
Ciro Continisio
81c9fb97
Graphic work (mostly Cave)
3 年前
Ciro Continisio
25505e81
Worldbuilding
3 年前
Ciro Continisio
65a539ba
Art tweaks
3 年前
Ciro Continisio
e693d85c
Worldbuilding
3 年前
Ciro Continisio
c0d04e7a
TownMarket
3 年前
Amel Negra
a60d5a44
Adding Townsfolk NPCs prefab variants examples
3 年前
Amel Negra
e9f4e34e
Merge remote-tracking branch 'origin/main' into main
3 年前
Amel
c426ce61
Keeping only one event called for sfx during talk animations
3 年前
Ciro Continisio
b8f152c8
Beach light fixes and rebaked lightmaps
3 年前
Amel
e69dc93c
Added start state to townsfolk AC
3 年前
Amel Negra
e611f40c
Adding rock critter snooze animation
3 年前
Amel Negra
42e6bd08
Adding phoenix chick nibbling and sneezing animations
3 年前
Amel Negra
f6c9e887
Rock critter snooze state tweaking after animation integration
3 年前
Amel
1f2da108
Adding new celebration animations
3 年前
Amel
4b681a41
Adding more towsfolk variants for the crowd
3 年前
Amel Negra
b3541b2e
Updated townsfolk example prefab
3 年前
uChema
90cc66d9
Merge branch 'main' of https://github.com/uChema/open-project-1 into main
3 年前
uChema
4ad4a353
Settings System
3 年前
uChema
dc07bb35
Merge remote-tracking branch 'upstream/main' into main
3 年前
GitHub
c0237ad9
Merge branch 'UnityTechnologies:main' into main
3 年前
uChema
378fc807
Merge branch 'main' of https://github.com/uChema/open-project-1 into main
3 年前
uChema
0e1137be
Adding Icons + New Interaction system
3 年前
uChema
f29c7129
Add Icons placeholders - Set Game Scene UI - Add Aggro System
3 年前
uChema
92cb047d
Merge remote-tracking branch 'upstream/main' into main
3 年前
Amel Negra
c1cee660
Moved common F and M animations of townsfolk on a new folder
3 年前
Amel Negra
667efa1d
Added farming animation with wip example
3 年前
uChema
3854e2ed
Art folder reorg
3 年前
Amel
2addb8d8
Added and integrated new attack animation for plant critter
3 年前
Amel Negra
ec0654b5
Plant critter attack animation v2 integration
3 年前
Amel Negra
b8e46c19
New farming animation in-place with Timeline example
3 年前
uChema
5ad05c8e
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
uChema
5c14c0b9
Update Switch tab button display to show both controls
3 年前
Ciro Continisio
ad5d889a
First batch of icons
3 年前
Ciro Continisio
7fdb5bae
Merge branch 'main' into UI-icons
3 年前
Ciro Continisio
96ae1f52
Reorganised folders
3 年前
Ciro Continisio
cfc7ad66
Inventory icons pt 2
3 年前
GitHub
20443cb5
Added Short Stone Wall(Mesh, Material, and Prefabs) ( #492 )
This includes:
A prefab of a Stone Wall Section
Stone Wall Mesh/Prefab
And a piece that you can attach on the sides of the walls
3 年前
Ciro Continisio
30e472a6
Work on night scene
3 年前
Ciro Continisio
b74f3140
More Runtime Anchor refactoring, other SO additions
Also fixed bug with RuntimeAnchors
Fixed BardHare state machine (error on Animator parameter)
3 年前
Ciro Continisio
c62d8542
Renamed all FryKing assets to LegendaryChef
3 年前
Ciro Continisio
d1b015ee
Removed empty layer on PigChef animator
3 年前
Ciro Continisio
f0d72306
Moving files and tweaks
3 年前