open-project-1

作者	SHA1	备注	提交日期
GitHub	2487e7bb	Inventory System Base (from official thread) (#100 ) * Added the basic inventory system * Removed prefixes, added CreateAssetMenu to ingredient * Added CreateAssetMenu to Inventory * Updated to use tabs and prefixes * Added prefix to inventory item * Added a means to iterate over items in Inventory * Moved accessor * Spaces to tabs (again) * Added default assignment to prevent warning * Added a CustomEditor for Inventory * added Items according to @chema descrription. * Marked out item type * follow code convention * Added character Customization script. Added folder structure for scripable objects * removed marked out lines * Changed Inventory to contain a list of ItemStacks instead of a dictrionary of Items. * added item background color * Reimplemented all the methods in Inventory.cs to work better with List. * simplified member field namings * made changed according to request by @Ciro_unity - moved scirpable objects to i...	4 年前
Trevor J McDonald	820cf542	[Bot] Automated dotnet-format update	4 年前
circa94	b981fc83	added a background color to the item type	4 年前
circa94	2018a05a	make it possible to show items of inventory in inspector	4 年前
circa94	885caae6	made Item fields as they were before	4 年前
Ciro Continisio	c3bf387e	Cleanup, Reorganisation of folders and Scenes	4 年前
circa94	cdbf1207	Merge branch 'circa94/master' into circa94/inventory-system	4 年前
Chema Damak	464fd3cf	Merge branch 'pr/130' into Inventory	4 年前
Amel	90998767	Merge remote-tracking branch 'origin/Inventory' into interaction	4 年前
Chema Damak	2051a72a	Adding interaction UI + Events	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	f9f6593b	Basis for QuestSystem WIP	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	b2cf2c5b	Refractoring	4 年前
Amel Negra	c444c501	Merge remote-tracking branch 'origin/main' into scenes-re-architecture	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 年前
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 年前
Bronson Zgeb	9b794d57	Added ItemStack Serialization on Save	4 年前
Yohann Puyhaubert	460eb34c	Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement	4 年前
uChema	7321e9d0	UI Integration (WIP)	4 年前
uChema	5bb0b53c	Fixing some UIs / Adding localized preview image for the items	4 年前
GitHub	c0b2931f	Merge pull request #1 from UnityTechnologies/main Update fork	4 年前
GitHub	c9495c00	Corrected Small Typo in Function Declaration (#390 ) Added letter 'n' to IngredientsAvailability function.	4 年前
uChema	997b50ae	Merge branch 'main' into pr/393	4 年前
Amel	7b1ed2b2	Merge branch 'main' into UI	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	b13a9a92	Refactor and rearrange folders	4 年前
Ciro Continisio	e6dcfc27	Merge branch 'main' into whiteboxing	4 年前
uChema	8a2721d9	Setting Questline + rename SO's files	4 年前
uChema	2415469c	Change SO's menu asset order. Add End of dialogue event to event Data.	4 年前
uChema	d7205d06	Add all questlines and rework Dialogue structure and Dialogue/Quest System. Winning and losing outcome WIP	4 年前
uChema	4413ebd5	Adding missing items + missing questline to a finite quest. Fixing errors. Use TestingInventory with TestingGround_Questline scene to test the full quest	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 年前
itsLevi0sa	aa9e8032	Merge branch 'CaveWhiteboxing' of https://github.com/itsLevi0sa/open-project-1 into CaveWhiteboxing	4 年前
itsLevi0sa	340dd8dc	Merge branch 'main' into CaveWhiteboxing	4 年前
uChema	0a1c31a0	Add healthbar	3 年前
Ciro Continisio	6b104b55	Mega code cleanup	3 年前

48 次代码提交 (8c61e1d3-a243-4d78-91c3-9b2ec875228a)