open-project-1

作者	SHA1	备注	提交日期
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 年前
uChema	c852ab5b	Update Cutscenes to use Event Channels	4 年前
uChema	c128feff	Fix Dialogue branching and add UI	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	d485d9c8	Added ToggleLoadingScreen event channel	4 年前
Amel Negra	e8d73e33	Merge branch 'scenes-re-architecture' into main	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 年前
uChema	c28d9833	Merge branch 'main' into QuestSystem	4 年前
Dan Young	eb670224	Merge remote-tracking branch 'upstream/art-assets' into art-assets	4 年前
Ciro Continisio	c691552b	Merge branch 'pr-bash' into whiteboxing # Conflicts: # UOP1_Project/Assets/Samples.meta	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 年前
uChema	7ece782e	Merge branch 'main' into QuestSystem	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 年前
GitHub	c0b2931f	Merge pull request #1 from UnityTechnologies/main Update fork	4 年前
uChema	09ec279d	Fix Input when closing Inventory	4 年前
uChema	d1f0a9e1	Add healthbar logic	4 年前
Ciro Continisio	2d718f1c	Merge branch 'main' into vegetation-tweaks # Conflicts: # UOP1_Project/Assets/Scenes/WIP/TestingGround.unity	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	30ea906a	Add close button to Settings and Credits screens	4 年前
uChema	78eac924	Pause Screen	4 年前
uChema	7828a4fe	Asset folder Clean up	4 年前
uChema	c3699920	Fix Subscribe/unsubscribe issue in UI. Implement Pause Menu with all its functions	4 年前
Amel Negra	8151f1b5	Merge remote-tracking branch 'origin/main' into AmelMain	4 年前
Amel Negra	c7f86452	Merge remote-tracking branch 'origin/main' into main	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 年前
uChema	283617f7	Creating Win/Lose quests and how to handle - Saving quests WIP	3 年前
Ciro Continisio	709521fa	Merge branch 'main' into worldbuilding	3 年前
GitHub	9fd51f47	Add camera shake on protagonist hit. (#454 ) * Add camera shake on protagonist hit. * add cam shake on critters hit	3 年前
Wiecio	7a89c938	First implementation of fading during loading scenes	4 年前
Wiecio	6208f362	Deleted while loop Deleted while loop, changed _onFadeComplete to BoolEventChannel	4 年前
uChema	b768a7dc	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	3 年前
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	3 年前
uChema	09ae3bfc	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	3 年前
uChema	e022f2ee	Rework on questline naming	3 年前
uChema	d7205d06	Add all questlines and rework Dialogue structure and Dialogue/Quest System. Winning and losing outcome WIP	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	a557f23b	Now DialogueBehaviour takes care of disabling UI dialogue when not paused	3 年前
uChema	4ad4a353	Settings System	3 年前
uChema	dc07bb35	Merge remote-tracking branch 'upstream/main' into main	3 年前
uChema	f29c7129	Add Icons placeholders - Set Game Scene UI - Add Aggro System	3 年前
uChema	93300a72	Rolling Credits	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 年前
Ciro Continisio	7fdb5bae	Merge branch 'main' into UI-icons	3 年前

1 2

59 次代码提交 (de0f0586-bdcb-4bd5-bbd5-969276f60353)