目录树: 2a223039

/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 }

从 '2a223039'

${ noResults }

652 次代码提交 (2a223039-d400-4024-9264-2d026ac2aa60)

作者	SHA1	备注	提交日期
Ciro Continisio	93b4aa7d	Actions map, Simple input testing	4 年前
Ciro Continisio	77678f6f	Character controller, scene setup	4 年前
Ciro Continisio	b8b709a6	Character control refactoring	4 年前
Ciro Continisio	453789b2	Character Controller moving	4 年前
Ciro Continisio	08043a2c	3D Playground	4 年前
Ciro Continisio	912d96c4	Using default CharacterController	4 年前
Ciro Continisio	1e3626e8	More character controller jump tweaks	4 年前
Ciro Continisio	d0592a4f	Moved around some stuff	4 年前
Ciro Continisio	c263c899	Folder rename	4 年前
Unknown	52e045b6	Adding scenesLoader scene	4 年前
Ciro Continisio	ee2cec18	Camera rotation, Movement tweaks Movement now is independent of camera rotation	4 年前
Unknown	832443bc	Adding main menu and level 1 scenes for test	4 年前
Ciro Continisio	503bc9d3	Cinemachine tweaks	4 年前
Unknown	1cc14a04	SOs for menus and levels and adding scenes	4 年前
Ciro Continisio	a9617e2b	Toon shading v1	4 年前
Ciro Continisio	74d5128e	Toon shader improvments - Updated URP from 7.3.0 to 7.5.1 - Moved to most recent 19.4 - New custom lighting shader (Toon 2), not yet toonified	4 年前
Unknown	46f2152d	pushing ScenesLoader scene	4 年前
Ciro Continisio	0788d614	Custom lighting shader tests	4 年前
Unknown	2a378146	Main menu scene, added menu disable on start	4 年前
Ciro Continisio	5e4de146	Isolated outline test Created its own scene and shader for testing purposes	4 年前
Ciro Continisio	369c0864	Toon Shader v2 in progress	4 年前
Unknown	76ec29e0	Clean	4 年前
Ciro Continisio	b0af5562	Toon shader done Needs to be broken down into pieces for modularity	4 年前
Unknown	625c5d3b	Added clear lists option and tweaks on MM and ScenesLoader scenes	4 年前
Ciro Continisio	26b18669	Work and tests on toon shader, plants and rocks	4 年前
Unknown	af81ba57	Added level 2 and level end trigger in level 1	4 年前
Andrzej Łukasik	dab4333d	InputReader made into ScriptableObject asset	4 年前
Ciro Continisio	4aaa3b36	Spawn system in place	4 年前
GitHub	9c27ba24	Merge pull request #27 from andrew-raphael-lukasik/InputReader_as_ScriptableObject InputReader made into ScriptableObject asset	4 年前
Ciro Continisio	b194fe99	Merge branch 'master' into Wodopo/spawn-system # Conflicts: # UOP1_Project/Assets/Scenes/CharController.unity # UOP1_Project/Assets/Scripts/CameraManager.cs	4 年前
Ciro Continisio	2cfc9750	SpawnSystem active in the scene Removed the player prefab from the scene	4 年前
Unknown	aa06f015	Added beach and forest scenes for scenes loading tests	4 年前
GitHub	afc7b64e	Merge pull request #25 from Wodopo/master Simple Player Spawn System	4 年前
mwert09	83f426f0	Merge remote-tracking branch 'upstream/master'	4 年前
Unknown	cbc6933e	Changes on Main Menu and Scenes Loader after updates	4 年前
Unknown	54aa2bb2	Updated beach scene	4 年前
Ciro Continisio	e27f318b	Merge branch 'master' into custom-lighting-shader # Conflicts: # UOP1_Project/Packages/manifest.json # UOP1_Project/ProjectSettings/ProjectVersion.txt	4 年前
Ciro Continisio	ccbf1297	Small feedback tweaks	4 年前
Ciro Continisio	4e9d1665	More art imported	4 年前
Ciro Continisio	009fdbd5	Even more art	4 年前
DeivSky	3a48da8b	Initial commit	4 年前
Ciro Continisio	3fb9738d	Knife, walking cane, lantern, pouch, Rockcritter	4 年前
GitHub	391017ac	Yet another State Machine (#94) * Initial commit * [Bot] Automated dotnet-format update * Added debug toggle * [Bot] Automated dotnet-format update * Update StateMachines.unity * Removed serializable actions/conditions. Added current state name in state machine component. Added more spheres to test scene. * minor * Renaming from 'Scriptable' prefix to 'SO' suffix. Co-Authored-By: Ciro Continisio <20049224+ciro-unity@users.noreply.github.com> * Adjusted test scene. Renamed StateAction.Perform() to OnUpdate(). Added a couple of Tooltips and comments. The test scene was adjusted to display how to override the behaviour of the Spheres by attatching a different `ChaseDataSO` to the `StateMachine`, specifying a different target. Tooltips and comments were added to try to explain the workflow of overriding Action and Condition data. * [Bot] Automated dotnet-format update * Removed ScriptableObjects array from StateMachine. Adjusted test scene. Single l...	4 年前
Ciro Continisio	d250d874	Bush, shell, bamboo, big rock fixes	4 年前
Ciro Continisio	6d1b63ae	Reorganising assets	4 年前
Ciro Continisio	a06f9b30	Sample scene Prefab creation, fixed rotation issue	4 年前
DeivSky	b8ac4c6b	Update StateMachines.unity	4 年前
Ciro Continisio	43ebc212	Art reorganisation and cleanup	4 年前
GitHub	999566a9	OP Devlog #1: Toon shading (#173) * upgrade to 2020.2 * add else condition in CustomLighting * fix missing material in ToonShading scene Co-authored-by: doJester13 <minarini.work@gmail.com> Co-authored-by: doJester13 <minairni.work@gmail.com>	4 年前
DeivSky	32a19461	Removed serializable actions/conditions. Added current state name in state machine component. Added more spheres to test scene.	4 年前
DeivSky	9dba4a4a	minor	4 年前
Ciro Continisio	79a79de9	Imported Townsfolk, Pig Chick More assets in the environment test scene	4 年前
DeivSky	b89a8e11	Adjusted test scene. Renamed StateAction.Perform() to OnUpdate(). Added a couple of Tooltips and comments. The test scene was adjusted to display how to override the behaviour of the Spheres by attatching a different `ChaseDataSO` to the `StateMachine`, specifying a different target. Tooltips and comments were added to try to explain the workflow of overriding Action and Condition data.	4 年前
Ciro Continisio	fb97255e	Moved art assets	4 年前
DeivSky	b7f0951d	Removed ScriptableObjects array from StateMachine. Adjusted test scene. Single line methods now use brackets, properties still use lambda when possible. Removed the 'override' feature that was implemented as it was adding unnecessary complexity. Adjusted test scene to reflect the changes: - Added `ChaseComponent.cs`. It takes `Transform _target`, `float _speed` and has a `public void Chase()` function that moves the gameObject towards the target. - `ChaseAction` now simply calls `ChaseComponent.Chase()` in its `OnUpdate()`. - `ChaseComponent` also contains a public getter `Target => _target`. - `CloseToTargetCondition` gets `transform` from the `StateMachine` and the transform of the target from `ChaseComponent`, the `Statement()` remains the same. Another way to implement it would be to have a public getter `bool IsCloseToTarget` or `float DistanceToTarget` in `ChaseComponent` and evaluate that in the `Statement`. - Removed `ChaseData.cs`. - How much each sphear eats is now contro...	4 年前
Ciro Continisio	8bcb0d29	Imported directions sign, removed no_eyes tests	4 年前
Ciro Continisio	1e91c076	Added Flower, fixed Signpost, Rubble sizing	4 年前
Ciro Continisio	9df0bbc8	Lowerpoly Townsfolk, imported Sitar	4 年前
Ciro Continisio	72d7c142	Character state machine	4 年前
Ciro Continisio	2cb26091	Tweaks and comments Removed StateMachines scene, fixed a small bug on Sliding when spawning in the air and trying to move	4 年前
Ciro Continisio	c9bcfaeb	Merge branch 'DeivSky/state-machine' into main Conflicts are all regarding the renaming of the namespace from Deivsky to UOP1 # Conflicts: # UOP1_Project/Assets/Scripts/StateMachine/Core/IStateComponent.cs # UOP1_Project/Assets/Scripts/StateMachine/Core/State.cs # UOP1_Project/Assets/Scripts/StateMachine/Core/StateAction.cs # UOP1_Project/Assets/Scripts/StateMachine/Core/StateCondition.cs # UOP1_Project/Assets/Scripts/StateMachine/Core/StateMachine.cs # UOP1_Project/Assets/Scripts/StateMachine/Core/StateTransition.cs # UOP1_Project/Assets/Scripts/StateMachine/ScriptableObjects/StateActionSO.cs # UOP1_Project/Assets/Scripts/StateMachine/ScriptableObjects/StateConditionSO.cs # UOP1_Project/Assets/Scripts/StateMachine/ScriptableObjects/StateSO.cs # UOP1_Project/Assets/Scripts/StateMachine/ScriptableObjects/StateTransitionSO.cs	4 年前
Ciro Continisio	e87c5fdd	Model fixes Fixed rotation of Walking Cane and Lantern, applied property to StoneCritter Prefab	4 年前
Ciro Continisio	8c53ac1f	Fixed Assembly issue	4 年前
Dickmendra	647b64bd	Added a cartoon water shader and material	4 年前
Unknown	78d8fa60	Added Whiteboxing folder under Scenes folder	4 年前
GitHub	76c293b0	Added a cartoon water shader and material (#137)	4 年前
Unknown	7cd60b67	Added Whiteboxing folder	4 年前
Ciro Continisio	68bbd76f	Tweaks to water shader and folders	4 年前
Unknown	851efcad	Merge remote-tracking branch 'origin/main' into Scene-Loading	4 年前
Unknown	e2782b21	Location loader now sets the active scene	4 年前
Ciro Continisio	f76bc5ce	Imported Townsfolk_F, Animations	4 年前
GitHub	dde7dc4c	Beach whitebox (#145) * beach whitebox 1 optimized originally by @itsLevi0sa (on forums), optimized by @jamercer * Swapped the missing tree prefab * beach trees owch. * Tree Collider Mesh Assigned you cannot walk through trees now! * Trees are now prefabs Co-authored-by: Unknown <amel.negra@unity3d.com>	4 年前
Ciro Continisio	057b78d2	Torch, PotOverFire	4 年前
GitHub	f9ef3334	Whiteboxing (#155) * Add files via upload Uploading town whiteboxing as separate files * Add files via upload Truffleton scene * Moved files from the root to a new folder Co-authored-by: Amel Negra <amel.negra@unity3d.com>	4 年前
Unknown	af2ab922	Merge branch 'Scene-Loading' into main	4 年前
Ciro Continisio	a58c28d8	Cleanup of temp assets, removal of Terrain	4 年前
Amel Negra	9c4c0b8c	Removed terrain and the scene using it	4 年前
GitHub	a5b61b2f	Added foam + refraction + depth fare to water shader (#139) * Alternative water shader proposition * Unlit water shader and add shadow - Unlit water shader - Add shadow as done in Toon shader - Add vertex displacement like done in dickmendra shader - Change the showcase water plane to intersect with the rock close to it to see foam * Shader clean up * Water shader improvements - Water effect distance cut off - Expose light probe contribution - Control surface shadow intensity * Small tweaks to showcase scene * Water shader fixes * Showcase water * Small tweaks Co-authored-by: Ciro Continisio <ciro@unity3d.com>	4 年前
Smurjo	48c9e74e	earring for townsfolk Added an Earring for townsfolk. It was build with Probuilder, exported to obj for some finishing touches with Blender, then saved as obj again. The material is a simple color. The earring possibly needs to be placed somewhere else once the townfolk is rigged. Which begs the question whether they can move their ears...	4 年前
Amel Negra	6504ce17	Generated lighting	4 年前
Ciro Continisio	886fb594	Tweaks to the earring	4 年前
GitHub	f8f9e06c	Second whiteboxing for the beach area (#211)	4 年前
NicknEma	7974b44d	Second whiteboxing for the beach area	4 年前
GitHub	ed53e5ca	Applied the tag EditorOnly to logical section GameObjects (#113)	4 年前
Ciro Continisio	1db5147e	Revert "Tweaks to the earring" This reverts commit 6affc84212fdc11f816144880657be4506612ead.	4 年前
NicknEma	27a139f7	Added CameraManager and SpawnSystem to the scene	4 年前
NicknEma	72cb0094	Update Beach.unity	4 年前
Ciro Continisio	1995c542	Merge branch 'whiteboxing' of https://github.com/NicknEma/open-project-1 into NicknEma-whiteboxing # Conflicts: # UOP1_Project/Assets/Scenes/Whiteboxing/Beach/Proposal_2/Beach.unity	4 年前
GitHub	2d2ff6fe	Applied the tag EditorOnly to logical section GameObjects (#125)	4 年前
GitHub	87ddf10a	Applied the tag EditorOnly to logical section GameObjects (#126)	4 年前
Unknown	a72a0657	Now possible to start the game from any scene	4 年前
Unknown	5edd2f9e	Changed Scene loader scene name to Initialization	4 年前
Ciro Continisio	c3bf387e	Cleanup, Reorganisation of folders and Scenes	4 年前
GitHub	ffe1b8b8	Working dialogue and cutscene system. (#135) * Add Dialogue Track base implementation * Custom timeline track and clip for dialog - Can at any time call for a line of dialogue. - Each clip binds line of dialogue to be later displayed on screen. - Depending on the options of this clip, the Timeline might pause. * Made adjustments based on HyagoOliveiran's suggestions Tried to add more variables to increase legibility. Added UpdateSlide function. Deleted some empty lines. * Update Character.cs * Update Character.cs * Update Character.cs * Update Character.cs * Update Character.cs * Update Character.cs * Update UOP1_Project/Assets/Scripts/Characters/Character.cs I deleted unnecessary spacing by following atb-brown suggestion. Co-authored-by: Austin Brown <atb.austin@gmail.com> * Deleted unnecessary spacing * Fixed bouncing issue when player hit under floating platform * My take on a simple Player Spawn System * Renamed SetRequestS...	4 年前
kgc00	8dfcd3e8	Merge remote-tracking branch 'upstream/main' into main	4 年前
circa94	cdbf1207	Merge branch 'circa94/master' into circa94/inventory-system	4 年前
Ciro Continisio	55d5d2a4	Merge branch 'main' into art-assets # Conflicts: # UOP1_Project/Assets/Art/Characters/PhoenixChick.meta # UOP1_Project/Assets/Cutscenes.meta # UOP1_Project/Assets/Cutscenes/ExampleCutscene.playable.meta # UOP1_Project/Assets/Materials/Debug_Semitransparent.mat.meta # UOP1_Project/Assets/Materials/Obstacles_Blue.mat.meta # UOP1_Project/Assets/Prefabs/GameplayEssentials.meta # UOP1_Project/Assets/Prefabs/Input Reader.asset # UOP1_Project/Assets/Prefabs/Input Reader.asset.meta # UOP1_Project/Assets/Prefabs/Pig.prefab # UOP1_Project/Assets/Presets.meta # UOP1_Project/Assets/Presets/Defaults.meta # UOP1_Project/Assets/Scenes/CharController.unity # UOP1_Project/Assets/ScriptableObjects.meta # UOP1_Project/Assets/ScriptableObjects/Input Reader.asset # UOP1_Project/Assets/ScriptableObjects/Input Reader.asset.meta # UOP1_Project/Assets/ScriptableObjects/Input/InputReader.asset # UOP1_Project/Assets/ScriptableObjects/Input/InputReader.asset.meta # UOP1_Project/Assets/Settings/Presets.meta # ...	4 年前
Ciro Continisio	03ff96ac	New test scenes Big testing scene with Polybrush terrain, small test scene with just primitives	4 年前
Chema Damak	54306cec	Added localization package	4 年前
Ciro Continisio	0ceeafd9	Refreshed Forest and Beach scenes	4 年前
Ciro Continisio	c28c6bc6	New Pig and RockCritter animations	4 年前
Chema Damak	7653f891	Add localized Dialogue	4 年前
Ciro Continisio	8504c55f	PigChef plays idle and walk animations Created action to set a bool parameter on the state machine	4 年前
Ciro Continisio	f0dc54d3	Fix CM bug, tweaks	4 年前
uChema	2aa92a2d	Merge	4 年前
Ciro Continisio	2c91dabf	Merge branch 'art-assets' into big-merge # Conflicts: # UOP1_Project/Assets/Prefabs/Props/PotOverFire.prefab	4 年前
Ciro Continisio	e8f4a6e7	Imported BardHare	4 年前
Ciro Continisio	cd7fea82	Tweaks, cleaning	4 年前
Ciro Continisio	e155c0a6	Added camera dummy, fixed issue with player Prefab tag	4 年前
GitHub	957c4a1c	Fix/dialogue line not shown in custom timeline track (#180) * Fix DialogueLine not shown in custom TimelineTrack * Make example scene. * Delete not used script: DialogueMixerBehaviour.cs * Push uncommited changes * Fix minor bug while timeline is playing, click on ExampleCutscene object, you get an error. This prevent that error. * Inverted the checks In preparation for making the tool work also in Edit mode Co-authored-by: Ciro Continisio <ciro@unity3d.com>	4 年前
Ciro Continisio	ecf3b2ef	Art updates Imported chest, fixed Phoenix Chick, fixed BardHare	4 年前
Ciro Continisio	6a57501a	Merge branch 'Smurjo/art-assets' into art-assets # Conflicts: # UOP1_Project/Assets/Art/Accessories.meta # UOP1_Project/Assets/Art/Accessories/Earring.meta # UOP1_Project/Assets/Art/Accessories/Earring/Earring.fbx # UOP1_Project/Assets/Art/Accessories/Earring/Earring.fbx.meta # UOP1_Project/Assets/Art/Accessories/Earring/Earring.mat # UOP1_Project/Assets/Art/Accessories/Earring/Earring.mat.meta # UOP1_Project/Assets/Art/Accessories/Earring/Earring.prefab # UOP1_Project/Assets/Art/Accessories/Earring/Earring.prefab.meta	4 年前
kgc00	781633e3	Merge remote-tracking branch 'upstream/main' into main	4 年前
treivize	572e0cdd	Added Transparent support on ToonShading and Glass Shader for the lantern	4 年前
Ciro Continisio	7705382e	Merge branch 'main' into state-machine-improvements # Conflicts: # UOP1_Project/Assets/Prefabs/Pig.prefab	4 年前
kgc00	c4dabcbe	merge	4 年前
Ciro Continisio	26747ac5	Merge branch 'treivize/feature/art/transparent_support' into art-assets	4 年前
Ciro Continisio	e5e7acc6	Merge branch 'art-assets' into main	4 年前
Ciro Continisio	bbca6fd1	Imported rigged Phoenix Chick + 2 animations	4 年前
Ciro Continisio	a92fcd1f	Removed lantern from the middle of the scene	4 年前
rainaldisatria	aa3e083b	Prepare example scene	4 年前
Smurjo	e13fb58d	Sombrero for townsfolk Sombrero for townsfolk to make them look more unique - suitable for one-sided rendering.	4 年前
Smurjo	488d5b71	Added curls and low quality sombrero The curly hair and the sombrero are intended as accessoires to make the townsfolk more unique	4 年前
rainaldisatria	53931d79	Make DialogueData for examples	4 年前
rainaldisatria	4065435a	Push uncommited changes	4 年前
rainaldisatria	40613066	Push more uncommited changes	4 年前
rainaldisatria	0ec96c10	Create choice button prefab	4 年前
kgc00	253b73a3	Merge remote-tracking branch 'upstream/main' into main	4 年前
Chema Damak	597b3f7b	Merge branch 'localization' into main	4 年前
rainaldisatria	8df7066a	Move and rename example scene name	4 年前
kgc00	7b04a609	Merge branch 'main' into simple-menu-controls	4 年前
Ciro Continisio	d14b0e45	Cleanup	4 年前
Chema Damak	093779d0	Fix cutscenes	4 年前
Chema Damak	3aaa37cc	Add UI system, Inventory UI and update Inventory System	4 年前
kgc00	8c299774	menu prefab into scene	4 年前
rainaldisatria	f7791e6d	Update BranchingExamples.unity	4 年前
Ciro Continisio	58d65aa2	Merge remote-tracking branch 'tech-mkt/main' into pr-bashing	4 年前
Ciro Continisio	f8f9e0b0	Event system refactoring	4 年前
Ciro Continisio	b5de134f	New art demo scene	4 年前
Ciro Continisio	99c4ccb4	Audio functionality	4 年前
Ciro Continisio	ce5b07db	Fry king in scene, Loading tweaks	4 年前
Ciro Continisio	21cfe483	Art showcase tweaks	4 年前
Ciro Continisio	826ef58b	AudioSystem functionality	4 年前
treivize	0728a4c6	Merge branch 'art-assets' into feature/art/pant_critter	4 年前
GitHub	14e737cc	Merge pull request #1 from UnityTechnologies/art-assets Art assets	4 年前
GitHub	e09986b8	Merge branch 'main' into fix/object-pool	4 年前
Ciro Continisio	a0ac9ece	Imported and tweaked extra vegetation	4 年前
Ciro Continisio	b414fbe0	Merge branch 'art-assets' into main	4 年前
Ciro Continisio	c1c36a96	Imported hammer	4 年前
Ciro Continisio	2dd78eab	Merge branch 'art-assets' of https://github.com/Smurjo/open-project-1 into art-assets	4 年前
Ciro Continisio	821a306a	Imported accessories	4 年前
Ciro Continisio	291ae413	New flowers, fixes Switched many small assets to bake with light probes instead of lightmaps	4 年前
Ciro Continisio	1d26bec4	Merge branch 'main' into state-machine-improvements	4 年前
Ciro Continisio	62a56be2	Fixed sombrero material	4 年前
treivize	df2ab2a2	Merge branch 'art-assets' into feature/art/slime_critter	4 年前
Eduardo de Albuquerque	8845aa98	Merge branch 'main' into HollowBoatEffect # Conflicts: # UOP1_Project/Assets/Settings/Graphics/ToonRendererData.asset # UOP1_Project/ProjectSettings/TagManager.asset	4 年前
Ciro Continisio	420aec35	Imported new rocks, asset fixes Tweaked size of some trees	4 年前
Ciro Continisio	d9dd5e5e	Tweaked RenderFeatures	4 年前
Ciro Continisio	ce50c2eb	Merge branch 'art-assets' of github.com:UnityTechnologies/open-project-1 into art-assets	4 年前
Ciro Continisio	8bde1454	Added layers to occluder objects in small testing ground	4 年前
jandd661	0a148928	Added trap to small testing ground Useful for testing	4 年前
jandd661	9de402ac	Update TestingGround_Small.unity Grouped object	4 年前
Ciro Continisio	f29c5b3e	Switched layers of occluding objects	4 年前
jandd661	baff1741	Proposed fix for issue #229 with test scenes	4 年前
Ciro Continisio	0661be42	Re-preffabbed the slimes	4 年前
jandd661	b7efdfcb	Revert "Proposed fix for issue #229 with test scenes" This reverts commit 14a6a3a062c3979cf9fef8d3b156c560f6fcd27b.	4 年前
jandd661	89044d84	Revert "Revert "Proposed fix for issue #229 with test scenes"" This reverts commit 3e9fb2d2aaf01d1a054e2e9f18a8f37540a888a8.	4 年前
jandd661	3ee06ccf	Update Beach Scene with test data	4 年前
jandd661	dfb183ee	Revert "Update Beach Scene with test data" This reverts commit 90ac457d70ca678160e42ea1c3dc637709748cc1.	4 年前
jandd661	5e78c72a	Updated Beach Scene with test data for Scene Loader	4 年前
Ciro Continisio	c1fe908d	Fixes to example, moved files in Examples folder	4 年前
Ciro Continisio	d4366a3d	Rebaked scenes, removed directional lightmaps	4 年前
GitHub	19a7c4c5	Upgrade to 2020.2.13b (#247)	4 年前
Ciro Continisio	101906b4	Townsfolk_M animations, Palm2	4 年前
Dane Byrd	bd72e4e6	Merge remote-tracking branch 'UnityTechnologies/art-assets' into art-assets	4 年前
Ciro Continisio	f588e37a	New tree type	4 年前
Amel Negra	9182a86c	Added interaction example scene	4 年前
Amel Negra	d3d514e2	Added examples to interaction example scene	4 年前
Ciro Continisio	8da148bf	Introduced RuntimeAnchors Used in Spawn and CameraSystem for decoupling purposes	4 年前
Ciro Continisio	efd5063f	Imported latest town assets	4 年前
Amel	71613a40	pushing interaction example scene	4 年前
Ciro Continisio	5aaad3c6	Merge branch 'Location-Loader-issue-229-fix' into main	4 年前
Ciro Continisio	1fadd410	Merge branch 'add-testscene-trap' into main # Conflicts: # UOP1_Project/Assets/Scenes/TestingGround_Small.unity # UOP1_Project/Assets/Scenes/TestingGround_Small/LightingData.asset # UOP1_Project/Assets/Scenes/TestingGround_Small/Lightmap-0_comp_dir.png # UOP1_Project/Assets/Scenes/TestingGround_Small/Lightmap-0_comp_light.exr # UOP1_Project/Assets/Scenes/TestingGround_Small/Lightmap-1_comp_dir.png # UOP1_Project/Assets/Scenes/TestingGround_Small/Lightmap-1_comp_light.exr	4 年前
Ciro Continisio	429592f6	Leftover lightmaps	4 年前
Ciro Continisio	d62d8e9e	Merge branch 'main' into whiteboxing # Conflicts: # UOP1_Project/Assets/Prefabs/PrototypingTree.prefab.meta # UOP1_Project/Assets/Samples.meta # UOP1_Project/Assets/Samples/Polybrush.meta # UOP1_Project/Assets/Samples/ProBuilder/4.4.0/Universal Render Pipeline Support/Material/ProBuilder Default URP.mat.meta # UOP1_Project/Assets/Scenes/ArtShowcase/LightingData.asset.meta # UOP1_Project/Assets/Scenes/ArtShowcase/ReflectionProbe-0.exr.meta # UOP1_Project/Assets/Scenes/CharController.unity.meta # UOP1_Project/Assets/Scenes/CharController/LightingData.asset # UOP1_Project/Assets/Scenes/CharController/LightingData.asset.meta # UOP1_Project/Assets/Scenes/CharController/ReflectionProbe-0.exr.meta # UOP1_Project/Assets/Scenes/Locations/Beach/LightingData.asset # UOP1_Project/Assets/Scenes/TestingGround.unity.meta # UOP1_Project/Assets/Scenes/Whiteboxing/Beach/Proposal_1/BeachWhiteboxing_1_optimized.unity.meta # UOP1_Project/Assets/Scenes/Whiteboxing/Beach/Proposal_1/BeachWhiteboxing_1_opt...	4 年前
GitHub	5c82e99e	Merge pull request #2 from UnityTechnologies/main import changes from main	4 年前
Ciro Continisio	b5c513e4	Small tweaks	4 年前
Ciro Continisio	443b4a6c	New FryKing animations and prefab	4 年前
Ciro Continisio	648aa035	First setup	4 年前
Amel	90998767	Merge remote-tracking branch 'origin/Inventory' into interaction	4 年前
Amel	8d423ac9	post merge fixes	4 年前
Ciro Continisio	de0da3ef	ChefHat accessory	4 年前
Ciro Continisio	e7b2e446	New art assets	4 年前
Chema Damak	8871d820	Changed Events to Event Channels	4 年前
Dan Young	268ab82e	Merge remote-tracking branch 'upstream/art-assets' into art-assets	4 年前
Amel	5418926e	added null check before event raise on interaction	4 年前
Ciro Continisio	6c55468b	Skybox experiments	4 年前
Ciro Continisio	2b770690	ClearSky skybox	4 年前
Amel	2807218f	bard hare in interaction example scene for talk interaction test	4 年前
Chema Damak	2051a72a	Adding interaction UI + Events	4 年前
Amel	2c9810c9	Merge branch 'main' into interaction	4 年前
Chema Damak	8a166bf0	Merge branch 'interaction' of https://github.com/UnityTechnologies/open-project-1 into interaction	4 年前
Chema Damak	76c0c04b	Fix last commit	4 年前
Chema Damak	1cd68b6d	Add an on Interaction Ended Event raise	4 年前
Amel	fe4de3b9	updated example scene for interaction	4 年前
Amel	9c207f58	testing ground scene cleaning	4 年前
Amel Negra	47e3af25	Renamed UI scene to gameplay scene	4 年前
uChema	6434aa7b	Renaming and cleaning folders	4 年前
Amel Negra	564a406f	Added new interaction scene example	4 年前
uChema	bbcf3752	Add control over cooking when near pot	4 年前
Amel Negra	96e4f244	Merge remote-tracking branch 'origin/interaction' into interaction	4 年前
Amel Negra	370a7993	Merge remote-tracking branch 'origin/main' 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 年前
Ciro Continisio	9be54793	Reorganised scenes	4 年前
Ciro Continisio	757da81d	Removes spaces in scene names	4 年前
Ciro Continisio	716120b4	Bushes, new Fern plant	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	b196db3a	General Map Whiteboxing_1 (#294)	4 年前
uChema	d5f3635f	Merge branch 'pr/195' into QuestSystem	4 年前
uChema	c852ab5b	Update Cutscenes to use Event Channels	4 年前
GitHub	6e9b7f56	Fix SceneAccessTool build fail issue (#274) * Added the Quick Scene Access Tool * removed unused file * orgainized script for SceneAccessTool to their proper folders. Build should work now	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 年前
Ciro Continisio	ec83929b	After merge fixes	4 年前
uChema	748ff00f	Add a quest, and test; WIP	4 年前
uChema	edca0f63	Rename Task to Step	4 年前
uChema	b2cf2c5b	Refractoring	4 年前
HarshNarayanJha	06438a1a	Pulled from upstream/main	4 年前
Amel Negra	c444c501	Merge remote-tracking branch 'origin/main' into scenes-re-architecture	4 年前
uChema	01c0ef6b	Modify Quest1	4 年前
uChema	88cf490e	Fix interaction Manager	4 年前
Amel Negra	1492ed7f	Added PersistentManagers scene	4 年前
Amel Negra	5d87a633	Pushing scenes	4 年前
Amel Negra	03efa5a6	renamed the prefab in the scene to SceneLoader	4 年前
Amel Negra	03bdc2e4	Now loading screen works	4 年前
Amel Negra	a60986ee	updated loading screen	4 年前
Amel Negra	e8d73e33	Merge branch 'scenes-re-architecture' into main	4 年前
Ciro Continisio	ef68d3e0	Imported WoodenBench	4 年前
Ciro Continisio	162a06e3	Refactoring, renaming, comments	4 年前
Ciro Continisio	84e76f64	Fixes, typos and tweaks	4 年前
Ciro Continisio	7c088a1f	Merge branch 'pr-bash' into main	4 年前
Ciro Continisio	9429e445	Imported SlimeCritter animations	4 年前
GitHub	fb323a77	Allow multiple entry/exit points in Locations (#284) * added support for multiple entry/exit points using PathSO * + added entrance & exit in TestingGround scene going to the Beach scene * + LocationExit: renamed a private method * Added spawn location tag * Added tag to entrances in different locations * Find entrances with tag before spawning * Added array initialization * Made entrance a prefab Co-authored-by: Amel Negra <amel.negra@unity3d.com>	4 年前
GitHub	54240307	Devlog 3: Handling complex input (#307) Project upgrade to 2021.1	4 年前
GitHub	f5865370	Scene Selector window (#285) * changed input phase check to match best practices * menu input - handles keyboard + gamepad inputs - handles mouse inputs - created component to place on selectable UI elements to register them as a pointer enter/exit receiver - updated inputreader to contain menu inputs as well - updated input actions to contain new menu inputs * updates * debug * docs * removed ununsed var * doc * found fix for todo #2 * added to component menu * was able to fix edge case #1 * doc * updates * undid prefab change * merged in main, added menu prefab to asset database * removed action asset reference in event system on prefab * readme * menu prefab into scene * updated readme * removed call to base.onenter in CC button to simplify selection logic * Use more reliable SceneAsset instead of error-prone scene name This also makes a custom editor unnecessary * Set proper SceneAssets and serialize * ...	4 年前
Amel Negra	23a23d5d	small tweaks on scenes	4 年前
Ciro Continisio	49f39298	Imported new animations	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 年前
Ciro Continisio	6e1104f0	Merge branch 'pr-bash' into main	4 年前
Ciro Continisio	2fdc2b25	More animations	4 年前
Ciro Continisio	46a89483	More animations	4 年前
IroncladLandship	2d23dfe2	Cleaned up FadeManager and readjusted PersistentManagers	4 年前
uChema	c28d9833	Merge branch 'main' into QuestSystem	4 年前
uChema	008bad73	Fix Merge	4 年前
Ciro Continisio	828d48b7	Empty Location scene	4 年前
Dane Byrd	004c7bd1	Ground Shader WIP Includes ground shader prototype with vertex color debug. Moves outline subgraph out of the main ToonShading subgraph. I have not included Noise Textures as I need to verify that the noise textures I used for testing are under an open-source license.	4 年前
Ciro Continisio	4b89665c	Wind shader improved and painted more meshes	4 年前
GitHub	54f79bad	Added slime critter behavior (#312) * Slime Critter initial behavior * Added slime critter behavior	4 年前
uChema	964f7361	New Quest System with Questlines	4 年前
Ciro Continisio	183fdac0	Merge remote-tracking branch 'tech-mkt/main' into main	4 年前
uChema	4e8cb14b	Replace Dialogue lines with Localized string, Fix Quest System with questline	4 年前
Dan Young	eb670224	Merge remote-tracking branch 'upstream/art-assets' into art-assets	4 年前
uChema	b48675a8	Add italian locale	4 年前
Ciro Continisio	c691552b	Merge branch 'pr-bash' into whiteboxing # Conflicts: # UOP1_Project/Assets/Samples.meta	4 年前
Ciro Continisio	10a426d8	Scenes moved around	4 年前
Ciro Continisio	1c9c17d2	Reorganisation	4 年前
Ciro Continisio	30e58a35	Farmer hat tweaks	4 年前
Ciro Continisio	4ca6acbc	Oven in scene	4 年前
Ciro Continisio	b8227469	Moustache prefabbed	4 年前
Ciro Continisio	d060f07a	Water plane Y scale fix	4 年前
Dane Byrd	c6beedc4	Merge branch 'art-assets' into ground_shader	4 年前
uChema	0f397e96	Merge branch 'main' into QuestSystem	4 年前
Smurjo	9b89eaca	Whiteboxing with reduced size Scene "GeneralMapReduced". Including art asset "BigFallenTreeWithLeaves" which serves to block the path until the player has finished the tutorial quest.	4 年前
Ciro Continisio	5ca74ffe	Beach and Glade midboxing	4 年前
uChema	837d24dd	Fix Shared Tables (Localization) conflict.	4 年前
Ciro Continisio	a30ece4a	Merge branch 'pr-bash' into art-assets	4 年前
Ciro Continisio	4220f2f7	Relocated assets	4 年前
Ciro Continisio	bd2b6359	Midboxing again	4 年前
Ciro Continisio	b60fe6c7	Tweaks and bamboos	4 年前
GitHub	81481d8b	Merge pull request #4 from UnityTechnologies/main update my local branch	4 年前
Ciro Continisio	5afe13aa	Renames and tweaks	4 年前
Ciro Continisio	24caa0dc	Fixed InputSystem error in whiteboxing scene	4 年前
GitHub	ebbad000	Merge pull request #5 from UnityTechnologies/main updating my local copy	4 年前
Smurjo	456c7bdd	Whiteboxing of general map in medium size divided into 6 scenes - contains minimalistic scene loading and unloading scripts only for trying this out - contains small editor tool to create views. Don't delete deactivated objects in spawn scene if you want to update the views. There is the issue that the created views are too dark, I suspect it is a problem between the Texture2D-Format and the RenderTexture-Format - I would appreciate advice which formats to use. - contains few additional art assets like shiitake mushrooms, big trees, bushes and creepers. The bushes are intended only for the whiteboxing to be replaced with more elaborate art assets later. The creepers and big trees are to be refined somewhat if we decide to use them. To try out the map open the spawn scene and press play in the editor. Make sure all scenes were added to the build settings.	4 年前
Ciro Continisio	e5f66cfc	Tweaks, removing doppler effect	4 年前
Ciro Continisio	290cf250	Merge branch 'pr-bash' into main	4 年前
alex	2f536097	Merge remote-tracking branch 'upstream/main' into main	4 年前
GitHub	87e0c403	Combat System - Critter/CritterSO scripts refactor using state machine capabilities and adding config SO (#325) * Critter refactor using state machine capabilities and adding config SO * Fixes following DeivSky's review * Optimized NavMeshAgent null check * Added abstractions between Critter script and ConfigSO * Corrections following Amel review * Split transition tables - move to fsm chasing and roaming settings * Fixes on transition table	4 年前
GitHub	762d050f	Merge pull request #6 from UnityTechnologies/main Updating my branch	4 年前
Smurjo	df03afb9	Merge branch 'main' of https://github.com/Smurjo/open-project-1 into main	4 年前
Ciro Continisio	b7e86dc9	Merge branch 'main' of https://github.com/AlexandreGheraibia/open-project-1 into main # Conflicts: # UOP1_Project/Assets/Prefabs/Characters/Pig/Interaction.prefab # UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab	4 年前
Ciro Continisio	28d4d3bb	Attack system overhaul	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	334de1f1	Part 1	4 年前
uChema	7f7c4818	Fix Merge	4 年前
Ciro Continisio	3cf5b804	Moved scenes	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 年前
Smurjo	e7c4b415	Added cooking festival to whiteboxing of medium scale map whiteboxing as shown in https://youtu.be/TnBEHHI2FtA	4 年前
Ciro Continisio	ff7a6deb	Removed unused script	4 年前
Yohann Puyhaubert	0b3da4fa	Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement	4 年前
Ciro Continisio	bd33c8df	Merge branch 'main' of https://github.com/Smurjo/open-project-1 into pr-bash	4 年前
Ciro Continisio	477798f0	Relocated temp assets in whiteboxing folder	4 年前
Ciro Continisio	ee3efeff	Prefab renaming and relocation	4 年前
Yohann Puyhaubert	068abd40	Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement	4 年前
Yohann Puyhaubert	22788ea0	Included pathway component to edit PathwayConfigSO	4 年前
Ciro Continisio	953afd39	Merge branch 'loading-refactor' into pr-bash # Conflicts: # UOP1_Project/Assets/Prefabs/GameplayEssentials/SceneLoader.prefab	4 年前
Ciro Continisio	ea9dfcea	Small fix to SceneLoader	4 年前
Ciro Continisio	dcf0b00e	Refactor part 3	4 年前
Ciro Continisio	7eee90e5	Loading refactor part 4	4 年前
Ciro Continisio	966da5a4	Initial camera position	4 年前
Ciro Continisio	0fd072b0	Enabled cold start	4 年前
Bronson Zgeb	bd9a16aa	Added a Load function to StartGame. Can now load a previously saved game from disk.	4 年前
Bronson Zgeb	5c50ddcf	Keep a backup of previous save. Added Continue from save to Menu.	4 年前
Amel Negra	bf22bd19	Added new accessories to the ArtShowcase scene	4 年前
Bronson Zgeb	a19b2328	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	4 年前
Ciro Continisio	2f0661e3	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	4 年前
Ciro Continisio	7d8f5cc8	Small tweaks	4 年前
Ciro Continisio	05b8a006	Merge branch 'main' into art-assets	4 年前
GitHub	a16c268f	Town Whiteboxing (#384) Created a Town Folder inside the Whiteboxing Folder, with the scene/materials/script and lightmap data inside. Also added a SceneDataSO named Town in the SceneData>Locations folder.	4 年前
Bronson Zgeb	80efbc3c	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	4 年前
Ciro Continisio	70978d9d	Audio changes	4 年前
Amel Negra	2e6b1d55	Merge remote-tracking branch 'origin/main' into main	4 年前
Ciro Continisio	07f4bf25	Music playing	4 年前
Ciro Continisio	8b5eea71	Whiteboxing lightmaps	4 年前
Ciro Continisio	cdc832d0	Reorganised Addressables	4 年前
Ciro Continisio	f6f1ad38	Fixes on the AudioManager, music in the Main Menu	4 年前
uChema	3d4fdc12	UI Integration (WIP)	4 年前
uChema	5e51d58b	UI Improvements	4 年前
Yohann Puyhaubert	460eb34c	Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement	4 年前
uChema	7321e9d0	UI Integration (WIP)	4 年前
Kyle Minors	1bec3630	Updated water shader added. Stored with a new plane, material and timeline asset.	4 年前
uChema	da6359bd	small improvements	4 年前
Ciro Continisio	91a763b7	Updated project to 2020 LTS	4 年前
Yohann Puyhaubert	b7bb56dd	Fix attack logic to consume attack from animation events	4 年前
uChema	5bb0b53c	Fixing some UIs / Adding localized preview image for the items	4 年前
Ciro Continisio	bfe7e497	New fire effect	4 年前
uChema	627867d3	UI Tweeks + some items descriptions	4 年前
uChema	7abf0997	WIP - UI Integration	4 年前
Ciro Continisio	c8c308d5	Relocated lighting settings	4 年前
Ciro Continisio	61f7cbe7	Scene redress and rebakes	4 年前
Ciro Continisio	2eabe55e	Outlines removed	4 年前
Amel Negra	6d8a1da0	Added example to Testing ground sc of slime critter moving along a path	4 年前
Ciro Continisio	e63ce59b	Lighting adjustments, probes	4 年前
GitHub	c0b2931f	Merge pull request #1 from UnityTechnologies/main Update fork	4 年前
Ciro Continisio	e81c0ea8	Material work	4 年前
Ciro Continisio	44604f6f	Updated testing scenes	4 年前
Ciro Continisio	753835bc	Night sky, sunset	4 年前
Ciro Continisio	543c9e95	New lightmaps for TestingGround	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	09ec279d	Fix Input when closing Inventory	4 年前
Ciro Continisio	a1ce890c	Removed array of scenes from loading	4 年前
uChema	2a357495	Open/Close Inventory with Input system. No mouse needed	4 年前
Ciro Continisio	0509be25	Refactored the whole cold startup mechanism	4 年前
Ciro Continisio	eaa6623e	Enabled the cold editor startup for the MainMenu scene too	4 年前
uChema	129eaee3	Control Dialogue with keyboard/controller	4 年前
uChema	e4b71f99	Add controls	4 年前
uChema	5d435a5e	Merge branch 'main' into UI	4 年前
uChema	5c109f22	Fix Items / Condense Localization tables. NB : Quests are not working anymore	4 年前
Amel	ce73c3ab	Merge remote-tracking branch 'origin/main' into main	4 年前
uChema	1ce9fe3b	Clean folders	4 年前
uChema	2847ceef	Fix current questline + Add UI Healthbar into Game play scene	4 年前
uChema	84d13891	Merge branch 'main' into UI	4 年前
uChema	0ed45c81	Add Collectible Prefab	4 年前
Ciro Continisio	49d768c5	Rebaked TestingGround and ArtShowcase	4 年前
Ciro Continisio	2d718f1c	Merge branch 'main' into vegetation-tweaks # Conflicts: # UOP1_Project/Assets/Scenes/WIP/TestingGround.unity	4 年前
Ciro Continisio	05c41c7f	Rebaked scenes	4 年前
Amel	c326d169	updating townsfolk prefabs on TestingGround scene	4 年前
uChema	b536dfe7	Removing extra StepController component	4 年前
Amel Negra	9c3cf5d7	changes on testing ground scene	4 年前
Ciro Continisio	42e0d46a	Changes to TestingGround	4 年前
Amel Negra	e0ede3d5	Merge branch 'main' into AmelMain	4 年前
Amel Negra	5578a4b5	Fixing scene after merge	4 年前
Ciro Continisio	8f5b1bdb	Refined PigChef animations	4 年前
Ciro Continisio	17caa017	Cleanup	4 年前
uChema	3ce06cf5	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	4 年前
Amel Negra	81b3de1b	Fix interaction	4 年前
Amel Negra	b330e005	Testing ground scene with new townsfolk behaviors	4 年前
uChema	7120f338	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	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 年前
Amel Negra	eb36a053	updating scene with new prefab	4 年前
uChema	30ea906a	Add close button to Settings and Credits screens	4 年前
uChema	78eac924	Pause Screen	4 年前
Ciro Continisio	617c7a6a	Quick fix on Quit popup	4 年前
Amel Negra	57b64e83	Pushing scene to make townsfolk idle on start	4 年前
uChema	7828a4fe	Asset folder Clean up	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 年前
Amel Negra	aef41f89	All townsfolk are intractable (removed variant)	4 年前
uChema	c3699920	Fix Subscribe/unsubscribe issue in UI. Implement Pause Menu with all its functions	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 年前
itsLevi0sa	77636c90	FiniteForest scene Includes the Scene_FiniteForest folder that contains the Scene and the subfolders for the Lightmaps and the Skybox.	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	1f8d4c95	Updated prefabs to add new event from step controller	4 年前
Ciro Continisio	07ac0ab3	Rebaked lightmaps in whiteboxing levels	4 年前
Amel Negra	6e88180e	pushing changes on scene	4 年前
Ciro Continisio	e4d15d8c	Relocated whiteboxing scenes and folders	4 年前
Ciro Continisio	4c903dff	Whiteboxing master scene v1	4 年前
Ciro Continisio	bcecfc68	Whiteboxing master scene v2	4 年前
Amel Negra	2855090c	Pushing the scene with the changes	4 年前
Ciro Continisio	6c927ef3	Whiteboxing master scene v3	4 年前
Ciro Continisio	473d21d1	Whiteboxing master scene v4	4 年前
Ciro Continisio	7dc8e8aa	Whiteboxing v5	4 年前
Amel Negra	a63051d7	wip	4 年前
Amel Negra	3be09cbd	Added another example of townsfolk talking to scene	4 年前
Amel Negra	3a9decf3	comment debug lines and push scene	4 年前
Amel Negra	a49e0c34	Set states for different townsfolk in the scene	4 年前
Amel	86f9401b	Updating townsfolk prefabs to be prefab variants from fbx	4 年前
Amel	4717e2f5	wip	4 年前
Amel Negra	aa357f79	Pushing scene with changes	4 年前
Amel Negra	7e8c921b	pushing scene with changes	4 年前
Amel	03aa1941	wip fixing townsfolk state machine on talk and listen	4 年前
Amel	811a6012	Bard hare state machine wip	4 年前
Amel Negra	ce10fdea	Bard hare state machine working	4 年前
Amel Negra	8151f1b5	Merge remote-tracking branch 'origin/main' into AmelMain	4 年前
Amel Negra	45e48bda	Disable state machine debug transitions	4 年前
Amel Negra	b23afbae	Updating talk state so it's independent from other states	4 年前
uChema	127bd54d	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	4 年前
Ciro Continisio	350159af	Merge branch 'main' into whiteboxing	4 年前
uChema	be536522	Merge with main and fix Selection bug	4 年前
Ciro Continisio	7d552600	Sectioned world into Prefabs	4 年前
Amel Negra	cebb0463	Rock critter example added to TestingGround scene	4 年前
Amel Negra	fbc93a67	pushing scene with rock critter changes	4 年前
Amel Negra	e0700a24	slowing walk speed for slime critter	4 年前
Amel Negra	6bb088d5	Attack animation works	4 年前
Amel Negra	348c8c14	Merge branch 'AmelMain' into main	4 年前
Amel Negra	c7f86452	Merge remote-tracking branch 'origin/main' into main	4 年前
Amel Negra	35ef2889	Fixing merge conflicts	4 年前
uChema	c24dd21f	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	4 年前
Amel Negra	52d6b39f	post merge bard hare fix	4 年前
uChema	66b47933	Default Button improvement	4 年前
Amel Negra	aec6fa7d	Townsfolk using another walk path	4 年前
uChema	52a617fe	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	4 年前
Ciro Continisio	d41e7e87	Merge branch 'whiteboxing' # Conflicts: # UOP1_Project/UserSettings/EditorUserSettings.asset	4 年前
Ciro Continisio	eed33324	ForestEntrance landmass	4 年前
Ciro Continisio	4a525440	Scene separated	4 年前
uChema	b13a9a92	Refactor and rearrange folders	4 年前
Amel Negra	3794c8dd	Filling the townsfolk talkingTo arrays	4 年前
Ciro Continisio	42b7725e	Connected almost all scenes Missing TownMarket and TownUpper	4 年前
Ciro Continisio	be943453	Scenes are all connected	4 年前
Ciro Continisio	c5a28a1e	Addressable settings	4 年前
Amel Negra	0876b376	pushing the scene	4 年前
Amel Negra	946cf3fe	updating bard hare state machine with new changes from townsfolk v2 SM	4 年前
Amel Negra	f7ead9e8	updating scene after changes and adding new path config for townsfolk	4 年前
Amel Negra	c2ffc760	pushing scene	4 年前
uChema	75076141	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	4 年前
uChema	b73d6df4	Fix last commit + Make Interaction item resizable	4 年前
Ciro Continisio	e6dcfc27	Merge branch 'main' into whiteboxing	4 年前
Ciro Continisio	474f2d07	Camera tweaks	4 年前
Ciro Continisio	49a9a175	Baked all location scenes	4 年前
Amel Negra	365cc438	Added fry king to the scene	4 年前
Amel Negra	9d9487e8	Pushing testing ground scene with NPCs positions adjustments	4 年前
Amel Negra	586b9eed	Added noise for dialogue shot cameras of NPCs	4 年前
Amel Negra	a6e9748f	scene updates	4 年前
Amel Negra	0b4f451f	Merge branch 'AmelMain' into main	4 年前
uChema	aa88e701	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	4 年前
Ciro Continisio	72d88c0d	Merge branch 'main' into whiteboxing # Conflicts: # UOP1_Project/Assets/AddressableAssetsData/OSX/addressables_content_state.bin.meta # UOP1_Project/Assets/Scenes/Locations/Field_Farms.unity.meta # UOP1_Project/Assets/Scenes/WIP/TestingGround.unity # UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/FryKing.meta	4 年前
Ciro Continisio	9d833ec9	Removed random sample scenes	4 年前
Ciro Continisio	23bd82d4	Beach landmass painting v1	4 年前
Ciro Continisio	ebe81a73	Worldbuilding in progress Landmasses vertex paint, water plane tweaks	4 年前
Ciro Continisio	a2299fee	Water shaders, landmasses	4 年前
Ciro Continisio	5cc9de68	Beach changes, worldbuilding Light settings, shader changes, prefab tweaks, model tweaks	4 年前
Ciro Continisio	f5afc4ea	Scenery	4 年前
Ciro Continisio	c22729d3	More worldbuilding Full bake of all scenes	4 年前
uChema	735363c3	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	3 年前
Amel	6f206e69	Merge remote-tracking branch 'origin/main' into mainAmel	4 年前
Ciro Continisio	f790674d	Rebaked TestingGround	3 年前
uChema	d0523373	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	3 年前
Amel	6d15815d	tweaking testing ground townsfolk path	3 年前
Amel	d09c4ea9	Pushing scene after updates	3 年前
Amel	9c232940	Audio configs tweaking	3 年前
Ciro Continisio	59efe5a3	Rock prefabs	3 年前
Ciro Continisio	bbf35a4d	SFX tweaks Volume adjustments, moved Audio listener to Protagonist	3 年前
Ciro Continisio	4bd4a06c	Lightmap rebakes	3 年前
Ciro Continisio	8d6a3cb2	Audio tweaks	3 年前
Ciro Continisio	53d9fe16	Scene work	3 年前
Ciro Continisio	85c5bf58	Merge branch 'main' into worldbuilding # Conflicts: # UOP1_Project/Assets/Prefabs/Gameplay/CameraSystem.prefab # UOP1_Project/Assets/Scenes/Locations/Beach.unity	3 年前
Ciro Continisio	8167037b	Worldbuilding	3 年前
uChema	eab4c107	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	3 年前
Ciro Continisio	2e9fcf21	BigTree shadow caster tweaks Created custom shadow casting geometry for BigTrees, to get more light in the forest	3 年前
uChema	283617f7	Creating Win/Lose quests and how to handle - Saving quests WIP	3 年前
Ciro Continisio	dc51f9ac	More scenery work	3 年前
Ciro Continisio	51187a9d	Location work	3 年前
Ciro Continisio	587a2230	Worldbuilding Scenes, rocks, waterfalls, foam, ... Added fog Rebaked all lighting	3 年前
Ciro Continisio	709521fa	Merge branch 'main' into worldbuilding	3 年前
Ciro Continisio	a10b5dae	ProBuilder fixes	3 年前
Ciro Continisio	9e2212b4	Entry/exit fixes	3 年前
Ciro Continisio	80582a3d	Skyboxes for Forest and Forest Entrance	3 年前
uChema	71dcdcfd	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	3 年前
uChema	62ba1135	Remove test debugging	3 年前
Ciro Continisio	1b98a3e3	Merge branch 'main' of github.com:UnityTechnologies/open-project-1	3 年前
Ciro Continisio	86579ca9	Camera tweaks Tweaks to the prefab Added Ground layer, camera now avoids that (but landmasses not on the Ground layer yet)	3 年前
Amel	b5b71e0f	Adding fallen tree for bard hare on testing ground scene	3 年前
Ciro Continisio	a8343b05	Merge remote-tracking branch 'tech-mkt/main'	3 年前
Ciro Continisio	f8947aa6	Sound tweaks and timing Tweaked SFX timing on animation clips	3 年前
Ciro Continisio	6bd5deac	Added reverb zones	3 年前
Ciro Continisio	5f2c082e	Put sound on torches Also added them to Field_Hill	3 年前
uChema	0f212cd8	Add Questline Testing ground	3 年前
Wiecio	7a89c938	First implementation of fading during loading scenes	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 年前
Ciro Continisio	d8f2c2f3	Merge branch 'main' into ciro	3 年前
Ciro Continisio	cc99c71a	Added 3D to main menu (temp)	3 年前
uChema	8a2721d9	Setting Questline + rename SO's files	3 年前
uChema	09ae3bfc	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	3 年前
Ciro Continisio	4b2bcaf1	Mountain Path scene	3 年前
Ciro Continisio	115a64e1	Cave and Path entrance/exit	3 年前
Ciro Continisio	86269522	Fixes to cave	3 年前
uChema	e022f2ee	Rework on questline naming	3 年前
Ciro Continisio	36d16456	File cleanup and relocation	3 年前
Amel Negra	551380e3	Cutscene debug material and Nav mesh for test scene	3 年前
Amel Negra	e6b57e51	Adding Field Farms Cutscene scene for timeline tests	3 年前
Amel Negra	47746a1b	Pushing cutscene and changes on the scene	3 年前
Amel Negra	f23fd014	Temporarily disabled Slime critter state machines on scene for tests	3 年前
Amel Negra	42ba5e06	Merge remote-tracking branch 'origin/main' into AmelMain	3 年前
Amel Negra	f670d943	Updating cutscene example scene with dialogue-cutscene updates	3 年前
Amel Negra	77d67e1f	Removing temporary scene used	3 年前
Ciro Continisio	7a6ec0e8	Merge remote-tracking branch 'tech-mkt/main'	3 年前
uChema	b4892bfe	Merge with main	3 年前
Amel Negra	d9900de0	Cutscene can be triggered by specific cinematic events (+ kept collider trigger for test purpose)	3 年前
Amel Negra	719e6464	updating prefab and scene for cutscene	3 年前
Amel Negra	79c4bba1	Removed not needed child game objects from cutscene prefab	3 年前
Amel Negra	8a1d6ab0	Binding main character to timeline	3 年前
Ciro Continisio	b214f102	Work on character controller	3 年前
Ciro Continisio	3e67c187	Merge branch 'main' into ciro	3 年前
Ciro Continisio	93d83526	New scene bake	3 年前
Ciro Continisio	f3bd8b00	Three raycasts	3 年前
Ciro Continisio	c3118a36	New day, new test	3 年前
Ciro Continisio	5b2ff381	More tweaks to CC	3 年前
Ciro Continisio	832dd088	Merge branch 'ciro'	3 年前
Ciro Continisio	c853f465	Fix to initial scene	3 年前
Ciro Continisio	754f3f28	Removed dead prefab links	3 年前
uChema	d7205d06	Add all questlines and rework Dialogue structure and Dialogue/Quest System. Winning and losing outcome WIP	3 年前
uChema	f26da778	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	3 年前
uChema	ad52a32a	hot fixes - Questline integration	3 年前
uChema	6a1077d3	Create cutscenes dialogue	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	e7a11cf3	Interactables for Beach, Hill and Farms	3 年前
itsLevi0sa	66a70a2e	MountainCave Whiteboxing Proposal Only the Cave scene included, not the exterior Path, located in the Whiteboxing>Community>Mountain_Cave folder.	3 年前
Ciro Continisio	460fb941	Merge branch 'CaveWhiteboxing' of https://github.com/itsLevi0sa/open-project-1 into worldbuilding	3 年前
Ciro Continisio	eee951e1	Farms	3 年前
Ciro Continisio	509b93fe	Removed ForestEntrance scene	3 年前
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.	3 年前
Ciro Continisio	60b486d5	Scene work	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 年前
Ciro Continisio	a0a16da1	Scene work	3 年前
uChema	718b6321	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	3 年前
uChema	441fd47b	Add Mountain rock critter variant.	3 年前
Amel Negra	7ac1c615	Pushing Beach scene with changes for beach candy cutscene	3 年前
Amel Negra	3b72c394	Resume gameplay after cutscene now works	3 年前
Amel Negra	a1c9548d	Organizing folders and tweaks on beach candy cutscene	3 年前
Amel Negra	890c9ef4	Adding beach cutscene scene as backup before merge	3 年前
Amel Negra	bce4012a	Made the cutscene prefab specific to the candy cutscene	3 年前
Amel Negra	a156875a	Merge remote-tracking branch 'origin/main' into main	3 年前
Amel Negra	3fa7bced	Removing Beach backup scene	3 年前
Amel Negra	5fb6c233	Re-Adding signal receiver on BardHare post merge	3 年前
Amel Negra	a7ac46c3	Tweaking talking animation transition in cutscene	3 年前
Amel Negra	7d7f08ff	tweaking transitions in cutscene	3 年前
uChema	02a13eae	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	3 年前
Amel Negra	a4661c6b	Beach cutscene as a prefab on the beach scene	3 年前
uChema	fab03691	Merge branch 'pr/396' into main . Fix Player Inventory/ Testing inventory data.	3 年前
Ciro Continisio	e858cef4	Market landmasses	3 年前
itsLevi0sa	2b78139d	Created PathAndCave scene (Scene A) and PathAndCave_Reduced scene (Scene B) Scene A is the previously commited Cave scene with the addition of the path and a better asset grouping. Scene B is the Cave scene reduced and some path additions arranged to fit in the base scene provided in the Locations folder. Also included both scenes' NavMeshes.	3 年前
Ciro Continisio	93832439	Landmass work	3 年前
Ciro Continisio	bbffa7ea	Removed ProBuilder cache	3 年前
itsLevi0sa	340dd8dc	Merge branch 'main' into CaveWhiteboxing	3 年前
Ciro Continisio	984180df	Merge branch 'main' into worldbuilding # Conflicts: # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/02a28a9c355f4fac879be8ab591f1a6a.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/0f35a51a6d884c8ab30219b5a3b05de7.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/108b5a6e887748a1875141cf7eefbf8e.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/177f1a363471462daaaa7e27712e2b77.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/17f9a240deb94feb8a71fae200bf7ff1.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/26347a43a1d94f6eba6efb6ca3d40208.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/2ab75110e077404aaaa2789feb3cc82e.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/2f392744e4d142f7a81da2a69bdaa99f.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/512005dcb52a4d588ffc91db589f24ff.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/61ff26a351934...	3 年前
Ciro Continisio	6479be22	Ground patches	3 年前
Ciro Continisio	8761fdff	Fixes to ArtShowcase	3 年前
Ciro Continisio	d3537763	Art assets Tweaked wooden bench UVs and texture, created Campfire prefab out of PotOverFire	3 年前
Ciro Continisio	8e056bbc	Wok Added wok model, created composite wok cooking prefab, added CookingSteam fx	3 年前
Ciro Continisio	6de2a6a1	ArtShowcase light bake	3 年前
Ciro Continisio	2d712a99	Merge branch 'main' into worldbuilding # Conflicts: # UOP1_Project/Assets/Scenes/Locations/Beach.unity	3 年前
Ciro Continisio	e0c72522	Fixed BardHare dialogue camera being on at all times	3 年前
Ciro Continisio	a9b18d29	Baked all lightmaps	3 年前
Amel Negra	a676cd5d	Merge remote-tracking branch 'origin/main' into main	3 年前
Ciro Continisio	72e8db4d	Moved itsleviosa's whiteboxing	3 年前
Ciro Continisio	2de40c96	Work on mountain	3 年前
Ciro Continisio	c0f37c31	Merge branch 'worldbuilding'	3 年前
Amel Negra	095475d0	Pushing the scene after adding the new path configs	3 年前
Amel Negra	339144dd	Pushing path config changes as prefab	3 年前
Ciro Continisio	81c9fb97	Graphic work (mostly Cave)	3 年前
Ciro Continisio	25505e81	Worldbuilding	3 年前
Ciro Continisio	e693d85c	Worldbuilding	3 年前
Ciro Continisio	3ba16be3	EmptyLocation tweaks	3 年前
Ciro Continisio	e4121299	TownMarket work	3 年前
Ciro Continisio	c0d04e7a	TownMarket	3 年前
uChema	b1c2f634	Integrating Cutscenes and Questlines in final scenes	3 年前
Amel Negra	e9f4e34e	Merge remote-tracking branch 'origin/main' into main	3 年前
Amel	17e7e8f4	Pushing cutscene placeholders to the different scenes	3 年前
Ciro Continisio	b8f152c8	Beach light fixes and rebaked lightmaps	3 年前
Amel Negra	120c5b08	Added pause audio signal for cutscene	3 年前
Amel Negra	a557f23b	Now DialogueBehaviour takes care of disabling UI dialogue when not paused	3 年前
Amel	8b2d50b0	Add start state for townsfolks	3 年前
Amel Negra	bbbf44d0	Fixing bard hare dialogue shot on beach scene	3 年前
Amel Negra	6242d7cf	wip win cutscene	3 年前
Amel	921d9db4	Adding beach final scene	3 年前
Amel	4e1ab710	Beach night scene light baking	3 年前
Amel	7db5cdba	placeholder for final cutscene	3 年前
Amel	4448fe99	pushing beach night scene	3 年前
Amel	b472d7a2	Adding load scene signal to load a location from timeline	3 年前
Amel	ee9d138e	Sweet dish cutscene now loads final beach cutscene on the end	3 年前
Amel	98847b01	Added celebration animations to cutscene	3 年前
Amel Negra	ec8eb680	Beach night final cutscene now starts main menu in the end	3 年前
Amel Negra	b75d5771	Polishing celebration part on win cutscene and added phoenix chick animation	3 年前
Amel Negra	e751564b	Tweaking sweet dish cutscene	3 年前
Amel Negra	3235736c	Baked Town Upper Navmesh to use for cutscene walking	3 年前
Ayhan Sakarya	65b9d08b	Implementation of current Settings System includes the following: - Implemented General tab - Language setting - Implemented Graphics tab - Graphics Presets, Resolution (all supported resolutions on users device), fullscreen mode settings - Implemented Advanced Graphics - Anisotropic filtering, Anti-Aliasing, Shadow Distance, Shadow Quality settings - Implemented Audio tab - Music Volume, Sfx Volume settings - Moved SettingsSystem scripts to Scripts/Systems/Settings (if we use asmdef files in the future this hiararchy might be better than throwin every script under the scripts folder) - Added scriptable object which holds graphics presets - Updated SettingsSystem script to utilize the presets object	4 年前
Ayhan Sakarya	dbe17bef	- Set the "GameInput" Input Action Class as reference in the eventsystem of the Settings System.unity scene - Changed the name of settings panel to "Settings System Panel"	4 年前
uChema	90cc66d9	Merge branch 'main' of https://github.com/uChema/open-project-1 into main	3 年前
Ayhan Sakarya	05abd3e9	Made a refactor of the used setting classes as follows: - Logic is now split into sub components: Genera, Graphics, Audio and Input (currently empty as input system is wip) - The settings system class can be used to get information from all sub components, a distributor - Fixed an issue with Screen resolution not being correct when in windowed mode (Screen.currentResolution gives back desktop resolution when in windowed mode) - Added Input UI elements which are placeholders for now, once the input system is done this can be populated like the other settings sub components	4 年前
uChema	1ce93bca	Small fixes in Game State System	3 年前
uChema	7cd7c86b	Merge branch 'pr/67' into main	3 年前
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 年前
GitHub	c0237ad9	Merge branch 'UnityTechnologies:main' into main	3 年前
uChema	378fc807	Merge branch 'main' of https://github.com/uChema/open-project-1 into main	3 年前
uChema	0e1137be	Adding Icons + New Interaction system	3 年前
uChema	f29c7129	Add Icons placeholders - Set Game Scene UI - Add Aggro System	3 年前
uChema	92cb047d	Merge remote-tracking branch 'upstream/main' into main	3 年前
Amel	1d5d51cb	Added beach intro cutscene + plays only when we play new game	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 年前
Amel	79795bad	Credits integration in final cutscene	3 年前
uChema	94daf002	Restore health and Apply changes to MainMenuCanvas prefab	3 年前
uChema	5c14c0b9	Update Switch tab button display to show both controls	3 年前
Ciro Continisio	7fdb5bae	Merge branch 'main' into UI-icons	3 年前
Ciro Continisio	53bc6c38	Refactored code to remove some warnings	3 年前
Ciro Continisio	30e472a6	Work on night scene	3 年前
Ciro Continisio	534f3a7b	Fixes to ScriptableObjects values	3 年前
Ciro Continisio	6b104b55	Mega code cleanup	3 年前
Ciro Continisio	c62d8542	Renamed all FryKing assets to LegendaryChef	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	f1c2b9e1	Added Teleporter cheat menu Press C key to activate, only in the editor	3 年前
Ciro Continisio	f0d72306	Moving files and tweaks	3 年前