Chema Damak
54306cec
Added localization package
4 年前
Chema Damak
9e43c174
[Bot] Automated dotnet-format update
4 年前
Chema Damak
7653f891
Add localized Dialogue
4 年前
Chema Damak
04a8fa29
[Bot] Automated dotnet-format update
4 年前
Chema Damak
eea05022
Revert "[Bot] Automated dotnet-format update"
This reverts commit de9179553d8398b66e55565a91c1de91db43d51e.
4 年前
Chema Damak
6f3d6f8d
[Bot] Automated dotnet-format update
4 年前
Chema Damak
3aaa37cc
Add UI system, Inventory UI and update Inventory System
4 年前
Chema Damak
9bfb88e2
[Bot] Automated dotnet-format update
4 年前
Ciro Continisio
cd97a760
Removed warnings
4 年前
Amel
90998767
Merge remote-tracking branch 'origin/Inventory' into interaction
4 年前
Amel
8d423ac9
post merge fixes
4 年前
Chema Damak
8871d820
Changed Events to Event Channels
4 年前
Chema Damak
2051a72a
Adding interaction UI + Events
4 年前
Chema Damak
e3274c8d
[Bot] Automated dotnet-format update
4 年前
Chema Damak
1cd68b6d
Add an on Interaction Ended Event raise
4 年前
Chema Damak
eaac2446
[Bot] Automated dotnet-format update
4 年前
uChema
6434aa7b
Renaming and cleaning folders
4 年前
uChema
e5dbebfb
clening assets folder
4 年前
uChema
bbcf3752
Add control over cooking when near pot
4 年前
uChema
8525f14c
[Bot] Automated dotnet-format update
4 年前
Amel Negra
96e4f244
Merge remote-tracking branch 'origin/interaction' 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 年前
Dan Young
7ce66d74
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
Amel Negra
a3fdb227
Merge branch 'main' into whiteboxing
4 年前
uChema
79e39b28
Merging Dialogue branching to the Quest System.
4 年前
uChema
c852ab5b
Update Cutscenes to use Event Channels
4 年前
uChema
c128feff
Fix Dialogue branching and add UI
4 年前
GitHub
d0298f3d
Merge pull request #3 from UnityTechnologies/art-assets
Art assets
4 年前
uChema
a16fe655
Dialogue And Quest Managers + Refractoring some scripts
4 年前
uChema
748ff00f
Add a quest, and test; WIP
4 年前
uChema
edca0f63
Rename Task to Step
4 年前
uChema
b2cf2c5b
Refractoring
4 年前
Amel Negra
c444c501
Merge remote-tracking branch 'origin/main' into scenes-re-architecture
4 年前
uChema
02abd5ef
Rename Folder
4 年前
uChema
e54c3d58
[Bot] Automated dotnet-format update
4 年前
uChema
2fbe347a
Merge branch 'QuestSystem' of https://github.com/UnityTechnologies/open-project-1 into QuestSystem
4 年前
IroncladLandship
ac869e64
UI Fade in and out code and implementation
This implements the UI fader to black card using events and scriptable objects. To use, add a FadeChannelSO to the relevant script, assign the scriptable object, the call either Fade, FadeIn, or FadeOut. Has parameters for duration and target color. This is usable anywhere and at any time, but contains no safeguards besides preventing multiple fades from happening at the same time.
Note: This modifies the PersistentManagers scene and adds an Image UI element that it depends on.
4 年前
IroncladLandship
1b4ab2a6
Added FadeOut color selection compatability and default parameters.
4 年前
IroncladLandship
2d23dfe2
Cleaned up FadeManager and readjusted PersistentManagers
4 年前
GitHub
79415d13
Update UOP1_Project/Assets/Scripts/UI/FadeManager.cs
Swerik is smarter than me...
Co-authored-by: Swerik <47034061+TheSwerik@users.noreply.github.com>
4 年前
uChema
964f7361
New Quest System with Questlines
4 年前
uChema
4e8cb14b
Replace Dialogue lines with Localized string, Fix Quest System with questline
4 年前
uChema
821d5ccf
[Bot] Automated dotnet-format update
4 年前
uChema
2f8fcd7c
Merge branch 'QuestSystem' of https://github.com/UnityTechnologies/open-project-1 into QuestSystem
4 年前
Ciro Continisio
b0118308
Merge branch 'main' of https://github.com/ZombieNub/open-project-1 into pr-bash
4 年前
Ciro Continisio
c799113a
Small tweaks to UI Fader
Still not functional
4 年前
Ciro Continisio
294b77e0
[Bot] Automated dotnet-format update
4 年前
uChema
7ece782e
Merge branch 'main' into QuestSystem
4 年前
Chema Damak
fab44b36
Merge fixes completed
4 年前
Chema Damak
18b22714
[Bot] Automated dotnet-format update
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 年前
Chema Damak
b9dde3e1
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
GitHub
b5417125
Merge pull request #7 from UnityTechnologies/main
Updating my local repository
4 年前
uChema
7321e9d0
UI Integration (WIP)
4 年前
uChema
c25b5aa7
[Bot] Automated dotnet-format update
4 年前
uChema
ef0a847c
Merge branch 'Quests' of https://github.com/UnityTechnologies/open-project-1 into Quests
4 年前
uChema
5bb0b53c
Fixing some UIs / Adding localized preview image for the items
4 年前
uChema
627867d3
UI Tweeks + some items descriptions
4 年前
uChema
f025e662
[Bot] Automated dotnet-format update
4 年前
uChema
67d0116c
Merge branch 'Quests' of https://github.com/UnityTechnologies/open-project-1 into Quests
4 年前
uChema
1bae6f60
[Bot] Automated dotnet-format update
4 年前
GitHub
c0b2931f
Merge pull request #1 from UnityTechnologies/main
Update fork
4 年前
uChema
09ec279d
Fix Input when closing Inventory
4 年前
uChema
2a357495
Open/Close Inventory with Input system. No mouse needed
4 年前
uChema
129eaee3
Control Dialogue with keyboard/controller
4 年前
uChema
21c257d2
[Bot] Automated dotnet-format update
4 年前
uChema
ce2090e7
Merge branch 'UI' of https://github.com/UnityTechnologies/open-project-1 into UI
4 年前
uChema
5a25746f
[Bot] Automated dotnet-format update
4 年前
uChema
c1d386ae
Merge branch 'UI' of https://github.com/UnityTechnologies/open-project-1 into UI
4 年前
uChema
9ac17dff
Change Tab in inventory with Left/right shoulder and T/Y keyboard buttons
4 年前
uChema
5c109f22
Fix Items / Condense Localization tables. NB : Quests are not working anymore
4 年前
uChema
1ce9fe3b
Clean folders
4 年前
uChema
0db80293
Change disabled and Selected button graphics. Add reset UI when reloaded
4 年前
Ciro Continisio
40288257
Relocated stray script
4 年前
Ciro Continisio
2d718f1c
Merge branch 'main' into vegetation-tweaks
# Conflicts:
# UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
4 年前
uChema
6938ba52
Code Cleaning/refractoring
4 年前
Amel Negra
e0ede3d5
Merge branch 'main' into AmelMain
4 年前
uChema
cf9b5d2c
WIP Settings menu
4 年前
uChema
b52c1a1f
Add UI to Main Menu + Add Popup + Working on Settings
4 年前
uChema
78eac924
Pause Screen
4 年前
uChema
7828a4fe
Asset folder Clean up
4 年前
uChema
f77ecadd
Pause game when Pause
4 年前
itsLevi0sa
5a4b5e30
[Bot] Automated dotnet-format update
4 年前
uChema
c3699920
Fix Subscribe/unsubscribe issue in UI. Implement Pause Menu with all its functions
4 年前
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
8151f1b5
Merge remote-tracking branch 'origin/main' into AmelMain
4 年前
uChema
127bd54d
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
uChema
be536522
Merge with main and fix Selection bug
4 年前
uChema
6b4ea95d
Add control over mouse click unselecting UI element
4 年前
uChema
6c3280b4
Fix Dialogue closing when finished and Inventory close button
4 年前
Amel Negra
c7f86452
Merge remote-tracking branch 'origin/main' into main
4 年前
uChema
66b47933
Default Button improvement
4 年前
Amel Negra
ac509ab2
Merge remote-tracking branch 'origin/main' into main
4 年前
uChema
46aad295
Fixing bug in Button selection (Confirmation Popup)
4 年前
uChema
b13a9a92
Refactor and rearrange folders
4 年前
uChema
9e6b5587
Remove unused Events
4 年前
Ciro Continisio
e6dcfc27
Merge branch 'main' into whiteboxing
4 年前
Amel Negra
65d30a33
Merge remote-tracking branch 'origin/main' into AmelMain
4 年前
grimstoner
fa26a41e
Fixed bug #440
Moved the code that instantiates the _instantiatedImages to the SetPagination method.
4 年前
uChema
93848ca8
Merge branch 'pr/441' into main
4 年前
Ciro Continisio
85c5bf58
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Prefabs/Gameplay/CameraSystem.prefab
# UOP1_Project/Assets/Scenes/Locations/Beach.unity
4 年前
uChema
d3f9b548
Added save Questline status
4 年前
Ciro Continisio
709521fa
Merge branch 'main' into worldbuilding
4 年前
Wiecio
7a89c938
First implementation of fading during loading scenes
4 年前
Wiecio
6208f362
Deleted while loop
Deleted while loop, changed _onFadeComplete to BoolEventChannel
4 年前
Wiecio
3f37142f
Removed not used namespaces
4 年前
Wiecio
ed2b5dd7
Removed Debug Log
4 年前
Ciro Continisio
065751a8
Merge branch 'main' of https://github.com/Wiecio/open-project-1 into ciro
# Conflicts:
# UOP1_Project/Assets/Scenes/Managers/PersistentManagers.unity
# UOP1_Project/Assets/Scripts/Events/ScriptableObjects/LoadEventChannelSO.cs
# UOP1_Project/Assets/Scripts/SaveSystem/SaveSystem.cs
# UOP1_Project/Assets/Scripts/SceneManagement/LocationExit.cs
# UOP1_Project/Assets/Scripts/SceneManagement/SceneLoader.cs
4 年前
uChema
8a2721d9
Setting Questline + rename SO's files
4 年前
uChema
09ae3bfc
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
uChema
2415469c
Change SO's menu asset order. Add End of dialogue event to event Data.
4 年前
uChema
e022f2ee
Rework on questline naming
4 年前
Ciro Continisio
36d16456
File cleanup and relocation
4 年前
GitHub
0d96fe7f
Implement pause menu music ( #463 )
4 年前
Amel Negra
42ba5e06
Merge remote-tracking branch 'origin/main' into AmelMain
4 年前
uChema
b4892bfe
Merge with main
4 年前
uChema
d7205d06
Add all questlines and rework Dialogue structure and Dialogue/Quest System. Winning and losing outcome WIP
4 年前
uChema
ad52a32a
hot fixes - Questline integration
4 年前
uChema
9f463dfd
Hot Fix : Cooking mode inventory is maintained after action (Cook, change tab, select other items)
4 年前
itsLevi0sa
72ec616e
[Bot] Automated dotnet-format update
4 年前
Ciro Continisio
460fb941
Merge branch 'CaveWhiteboxing' of https://github.com/itsLevi0sa/open-project-1 into worldbuilding
4 年前
Ciro Continisio
de0f0586
Revert "Merge branch 'CaveWhiteboxing' of https://github.com/itsLevi0sa/open-project-1 into worldbuilding"
This reverts commit 5141fc8d8d88057646e6602844c0bc709606f6d3, reversing
changes made to 0146f00fa2288b3baf783f2feb33ed3ff37fb231.
4 年前
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...
4 年前
Amel Negra
bc3c5fd1
Merge remote-tracking branch 'origin/main' into main
4 年前
uChema
2f6c4b7a
Hot fix : NullReferenceException on game exit
3 年前
paciFIST Studios
8daff79f
Update UIMenuManager.cs
Found a small bug, which was causing a NullReferenceException
Bug ticket:
https://github.com/UnityTechnologies/open-project-1/issues/478
Forum Thread:
https://forum.unity.com/threads/bug-uimenumanager-throws-nullreferenceexception-on-game-exit.1142410/#post-7337182
3 年前
itsLevi0sa
aa9e8032
Merge branch 'CaveWhiteboxing' of https://github.com/itsLevi0sa/open-project-1 into CaveWhiteboxing
4 年前
itsLevi0sa
340dd8dc
Merge branch 'main' into CaveWhiteboxing
4 年前
Ciro Continisio
2d712a99
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Scenes/Locations/Beach.unity
3 年前
uChema
b1c2f634
Integrating Cutscenes and Questlines in final scenes
3 年前
Amel Negra
e9f4e34e
Merge remote-tracking branch 'origin/main' into main
3 年前
uChema
1d6b8128
Use Game States In State Machine
4 年前
uChema
1ce93bca
Small fixes in Game State System
4 年前
uChema
4ad4a353
Settings System
3 年前
uChema
9511bfd5
Fixing Asset Table
3 年前
uChema
dc07bb35
Merge remote-tracking branch 'upstream/main' into main
3 年前
uChema
41cc566f
Merge Settings with main
3 年前
uChema
0a1c31a0
Add healthbar
3 年前
uChema
0e1137be
Adding Icons + New Interaction system
3 年前
uChema
f29c7129
Add Icons placeholders - Set Game Scene UI - Add Aggro System
3 年前
uChema
52671b6b
Fix Display
3 年前
uChema
93300a72
Rolling Credits
3 年前
uChema
1eaafa64
Add Rolling credits to GameplayScene
3 年前
Amel
22980250
Merge remote-tracking branch 'origin/main' into main
3 年前
uChema
57caaba3
Keep health between scenes
3 年前
uChema
94daf002
Restore health and Apply changes to MainMenuCanvas prefab
3 年前
uChema
0299119f
Disable Interaction prompt when Dialogue
3 年前
uChema
8760a221
Select first Item in Inventory when Inventory Open
3 年前
uChema
2e7057c0
Error message when can't cook
3 年前
uChema
5c14c0b9
Update Switch tab button display to show both controls
3 年前
uChema
265562c0
"Add to Inventory" animated panel
3 年前
Ciro Continisio
7fdb5bae
Merge branch 'main' into UI-icons
3 年前
Ciro Continisio
53bc6c38
Refactored code to remove some warnings
3 年前
Ciro Continisio
27ebfa55
Code formatting and tweaks
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
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 年前
Ciro Continisio
f0d72306
Moving files and tweaks
3 年前