分支: main

/main

/devlogs-1-toon-shading

/release

/devlogs-2-scriptable-objects

/devlogs-3-input

/UI

/devlogs-4-addressable-assets

0.6-alpha

dl1

dl2

dl3

dl4

0.8-alpha

分支列表 标签列表

${ item.name }

创建分支 ${ searchTerm }

从 'main'

${ noResults }

98 次代码提交 (main)

作者	SHA1	备注	提交日期
Chema Damak	3aaa37cc	Add UI system, Inventory UI and update Inventory System	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	76c0c04b	Fix last commit	4 年前
Chema Damak	1cd68b6d	Add an on Interaction Ended Event raise	4 年前
uChema	6434aa7b	Renaming and cleaning folders	4 年前
uChema	bbcf3752	Add control over cooking when near pot	4 年前
Amel Negra	96e4f244	Merge remote-tracking branch 'origin/interaction' into interaction	4 年前
uChema	c128feff	Fix Dialogue branching and add UI	4 年前
Amel Negra	03bdc2e4	Now loading screen works	4 年前
Amel Negra	e8d73e33	Merge branch 'scenes-re-architecture' into main	4 年前
uChema	c28d9833	Merge branch 'main' into QuestSystem	4 年前
uChema	008bad73	Fix Merge	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 年前
Chema Damak	e7bcdcfd	Fixing the merge	4 年前
Chema Damak	fab44b36	Merge fixes completed	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 年前
uChema	3d4fdc12	UI Integration (WIP)	4 年前
uChema	5e51d58b	UI Improvements	4 年前
uChema	7321e9d0	UI Integration (WIP)	4 年前
uChema	da6359bd	small improvements	4 年前
uChema	5bb0b53c	Fixing some UIs / Adding localized preview image for the items	4 年前
uChema	627867d3	UI Tweeks + some items descriptions	4 年前
uChema	7abf0997	WIP - UI Integration	4 年前
GitHub	c0b2931f	Merge pull request #1 from UnityTechnologies/main Update fork	4 年前
Ciro Continisio	f52bd332	Skybox v2	4 年前
Ciro Continisio	293f994f	Merge branch 'graphic-rework'	4 年前
uChema	997b50ae	Merge branch 'main' into pr/393	4 年前
Amel	7b1ed2b2	Merge branch 'main' into UI	4 年前
uChema	27225bd9	Fix localization error	4 年前
uChema	3d8f54ca	Select with controller method	4 年前
uChema	2a357495	Open/Close Inventory with Input system. No mouse needed	4 年前
uChema	129eaee3	Control Dialogue with keyboard/controller	4 年前
uChema	e4b71f99	Add controls	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	d1f0a9e1	Add healthbar logic	4 年前
uChema	2847ceef	Fix current questline + Add UI Healthbar into Game play scene	4 年前
uChema	0ed45c81	Add Collectible Prefab	4 年前
Ciro Continisio	2d718f1c	Merge branch 'main' into vegetation-tweaks # Conflicts: # UOP1_Project/Assets/Scenes/WIP/TestingGround.unity	4 年前
uChema	f5139875	Inventory Prefab fix	4 年前
Amel Negra	e0ede3d5	Merge branch 'main' into AmelMain	4 年前
Amel Negra	81b3de1b	Fix interaction	4 年前
uChema	7120f338	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	4 年前
uChema	3c2d8e55	Fix UI Interaction	4 年前
Ciro Continisio	bc17972b	Merge branch 'main' into iet # Conflicts: # UOP1_Project/Packages/manifest.json	4 年前
Amel Negra	c094f333	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 年前
uChema	be536522	Merge with main and fix Selection bug	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	b73d6df4	Fix last commit + Make Interaction item resizable	4 年前
Ciro Continisio	e6dcfc27	Merge branch 'main' into whiteboxing	4 年前
Ciro Continisio	7798b04e	Addressable changes Packaged more files into Addressables	4 年前
uChema	eab4c107	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	3 年前
Ciro Continisio	cc99c71a	Added 3D to main menu (temp)	3 年前
uChema	09ae3bfc	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	3 年前
GitHub	0d96fe7f	Implement pause menu music (#463)	3 年前
Amel Negra	42ba5e06	Merge remote-tracking branch 'origin/main' into AmelMain	3 年前
uChema	b4892bfe	Merge with main	3 年前
uChema	d7205d06	Add all questlines and rework Dialogue structure and Dialogue/Quest System. Winning and losing outcome WIP	3 年前
uChema	ad52a32a	hot fixes - Questline integration	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 年前
uChema	1ce93bca	Small fixes in Game State System	3 年前
uChema	4ad4a353	Settings System	3 年前
uChema	9511bfd5	Fixing Asset Table	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	8a36c2bf	Fix UI Rescaling. Test The whole game. WIP Interaction after cutscene	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	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	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	2a223039	Fixed bugs Addressable issues (stray loc tables), and a bug on the UI (inventory menu not updating a button prompt)	3 年前