GitHub
87e0c403
Combat System - Critter/CritterSO scripts refactor using state machine capabilities and adding config SO ( #325 )
* Critter refactor using state machine capabilities and adding config SO
* Fixes following DeivSky's review
* Optimized NavMeshAgent null check
* Added abstractions between Critter script and ConfigSO
* Corrections following Amel review
* Split transition tables - move to fsm chasing and roaming settings
* Fixes on transition table
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
c0c06250
Merge branch 'minor-sm-changes' of https://github.com/DeivSky/open-project-1 into pr-bash
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 年前
uChema
7ece782e
Merge branch 'main' into QuestSystem
4 年前
GitHub
b5417125
Merge pull request #7 from UnityTechnologies/main
Updating my local repository
4 年前
Yohann Puyhaubert
bf1a236b
Added pathway NPC movement strategy
4 年前
Yohann Puyhaubert
22788ea0
Included pathway component to edit PathwayConfigSO
4 年前
Yohann Puyhaubert
273993ab
Made the handles pointing into the forward direction of the pathway
4 年前
Yohann Puyhaubert
6bee54e4
Update pathway config SO to work with the latest pathway editor changes
4 年前
Yohann Puyhaubert
b1d0c051
Correction following Alexandre review
4 年前
Amel Negra
67e5ce82
Merge remote-tracking branch 'treivize/feature/npc-pathway-movement' into main
4 年前
uChema
31d75482
Add controls. Switch Quest/Questline.cs names. And Button add Questline , quests, step
4 年前
Ciro Continisio
7235809c
Fixing small reimport issue
4 年前
Amel
7b1ed2b2
Merge branch 'main' into UI
4 年前
uChema
0ed45c81
Add Collectible Prefab
4 年前
Amel
e3220202
Path config for townsfolk
4 年前
Ciro Continisio
2d718f1c
Merge branch 'main' into vegetation-tweaks
# Conflicts:
# UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
4 年前
Amel Negra
6dda5831
WIP talking condition for townsfolks
4 年前
Amel Negra
e0ede3d5
Merge branch 'main' into AmelMain
4 年前
Amel Negra
cef038ad
Now townsfolk possible to idle, walk, talk and choose behavior from MB
4 年前
Amel Negra
ebc69c75
New path configs for townsfolk walking
4 年前
Amel
4717e2f5
wip
4 年前
Amel Negra
9171fe9b
Tweaking path way config and add short path one for faster tests
4 年前
uChema
127bd54d
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Ciro Continisio
350159af
Merge branch 'main' into whiteboxing
4 年前
Amel Negra
d19ce419
Adding rock critter configs
4 年前
Amel Negra
e0700a24
slowing walk speed for slime critter
4 年前
Amel Negra
348c8c14
Merge branch 'AmelMain' into main
4 年前
uChema
c24dd21f
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Amel Negra
f7ead9e8
updating scene after changes and adding new path config for townsfolk
4 年前
uChema
75076141
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Ciro Continisio
e6dcfc27
Merge branch 'main' into whiteboxing
4 年前
uChema
d36df8f3
Adding save to disk on questline update
4 年前
Ciro Continisio
1b98a3e3
Merge branch 'main' of github.com:UnityTechnologies/open-project-1
4 年前
Amel
8994f2dd
Organized SM configs in folders
4 年前
Amel
eab29e55
Smaller range for reward droppables when positioned
4 年前
uChema
0f212cd8
Add Questline Testing ground
4 年前
uChema
b768a7dc
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Ciro Continisio
d8f2c2f3
Merge branch 'main' into ciro
4 年前
uChema
8a2721d9
Setting Questline + rename SO's files
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
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 年前
itsLevi0sa
340dd8dc
Merge branch 'main' into CaveWhiteboxing
3 年前
Amel Negra
fa8cc2af
Added new path configs for slime critters on the Field_Farms scene
3 年前
Ciro Continisio
83ea7526
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Scenes/Locations/Field_Farms.unity
3 年前
Amel Negra
3cd151d4
Path config for going away during cutscene
3 年前
uChema
dc07bb35
Merge remote-tracking branch 'upstream/main' into main
3 年前
uChema
92cb047d
Merge remote-tracking branch 'upstream/main' into main
3 年前
uChema
57caaba3
Keep health between scenes
3 年前
Ciro Continisio
7fdb5bae
Merge branch 'main' into UI-icons
3 年前
Ciro Continisio
ed9498cd
Reorganised and renamed ScriptableObjects
3 年前
Ciro Continisio
6b104b55
Mega code cleanup
3 年前
Ciro Continisio
5af375fa
Various changes around health management
Fixed UIHealthBar reset hearts bug
Relocated UI event channels under the Health folder
Enemies no longer fire UpdateUI events
Fixed PigChef's missing sounds
3 年前