Ciro Continisio
76cc2e8b
Merge branch 'ForestMaze' of https://github.com/itsLevi0sa/open-project-1 into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Scripts/UI/UIManager.cs
4 年前
Amel Negra
a186115b
Added IsInDialogue to step controller
4 年前
itsLevi0sa
77636c90
FiniteForest scene
Includes the Scene_FiniteForest folder that contains the Scene and the subfolders for the Lightmaps and the Skybox.
4 年前
Amel Negra
1bdfb7ff
Added townsfolk walking condition
4 年前
itsLevi0sa
e93b5e73
TransitionArea scene from Town to ForestMaze
Includes the Scene_TransitionArea folder that contains the Scene, the Lightmap folder and the Skybox folder.
4 年前
uChema
c3699920
Fix Subscribe/unsubscribe issue in UI. Implement Pause Menu with all its functions
4 年前
Amel Negra
bd7b83fa
Made Initial state an enum
4 年前
itsLevi0sa
5a4b5e30
[Bot] Automated dotnet-format update
4 年前
uChema
f77ecadd
Pause game when Pause
4 年前
Amel Negra
aef41f89
All townsfolk are intractable (removed variant)
4 年前
itsLevi0sa
3ce46f3a
InfiniteForest scene
Includes: Scene_InfiniteForest folder with the Scene and the Lightmaps subfolder. Also includes folders for:
Materials
MazeTiles prefabs
Scripts
4 年前
uChema
7828a4fe
Asset folder Clean up
4 年前
Amel Negra
57b64e83
Pushing scene to make townsfolk idle on start
4 年前
Ciro Continisio
617c7a6a
Quick fix on Quit popup
4 年前
Amel Negra
837dcf96
removed state machine added twice on prefab
4 年前
uChema
78eac924
Pause Screen
4 年前
Amel Negra
9a5842e7
removed not needed old prefabs
4 年前
uChema
30ea906a
Add close button to Settings and Credits screens
4 年前
Amel Negra
eb36a053
updating scene with new prefab
4 年前
uChema
167ca847
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Amel Negra
e8da7a59
Adding intractable prefabs for townsfolk we can interact with
4 年前
Amel Negra
203ad8de
Renamed ''idle 2'' RockCritter animation to ''Alert ''
4 年前
uChema
b52c1a1f
Add UI to Main Menu + Add Popup + Working on Settings
4 年前
Amel Negra
d0830611
Updating townsfolk prefab
4 年前
Ciro Continisio
9632e498
IET v3
4 年前
uChema
cf9b5d2c
WIP Settings menu
4 年前
Amel Negra
c094f333
Merge branch 'main' into AmelMain
4 年前
Ciro Continisio
bc17972b
Merge branch 'main' into iet
# Conflicts:
# UOP1_Project/Packages/manifest.json
4 年前
uChema
6ddc6d14
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
uChema
3c2d8e55
Fix UI Interaction
4 年前
GitHub
0e084a6f
[Bugfix] New condition prevents Critter from attacking when dialogue on ( #420 )
* New condition prevents Critter from attacking when dialogue on
* Remove test temp clutter
* Undo changes to testing ground
4 年前
uChema
7120f338
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Amel Negra
b330e005
Testing ground scene with new townsfolk behaviors
4 年前
Amel Negra
81b3de1b
Fix interaction
4 年前
uChema
3ce06cf5
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Amel Negra
7004ced9
Updating townsfolk F and M prefabs
4 年前
Ciro Continisio
b5a142b5
Updated to 2020.3.7f1
4 年前
Amel Negra
ebc69c75
New path configs for townsfolk walking
4 年前
Ciro Continisio
3855f0d6
Removed EditorUserSettings
4 年前
Amel Negra
cef038ad
Now townsfolk possible to idle, walk, talk and choose behavior from MB
4 年前
Ciro Continisio
17caa017
Cleanup
4 年前
Amel Negra
2e8f265c
After merge townsfolk back up
4 年前
Ciro Continisio
8f5b1bdb
Refined PigChef animations
4 年前
Amel Negra
5578a4b5
Fixing scene after merge
4 年前
Ciro Continisio
381edcb3
Double-sided toon shader
4 年前
Amel Negra
e0ede3d5
Merge branch 'main' into AmelMain
4 年前
Ciro Continisio
42e0d46a
Changes to TestingGround
4 年前
Ciro Continisio
6620446f
Navigation-related prefab tweaks
4 年前
GitHub
509abae6
Add small bridge model, material, and prefab ( #423 )
4 年前
GitHub
d8811c5e
Improve SOsQuickAccessToolWindow and rename to ScriptableObjectBrowser. ( #387 )
* Improve SOsQuickAccessToolWindow and rename to ScriptableObjectBrowser.
* Change button styles to have left text alignment for better readability.
* Implement alphabetize type sorting.
* Replace unnecessary TryGetValue() with ContainsKey().
* Add custom GUIStyle and double click to ping function.
4 年前