目录树: 786fb321

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

从 '786fb321'

${ noResults }

928 次代码提交 (786fb321-9fb5-4547-bb0f-7ba7eddf63d1)

作者	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	ee2cec18	Camera rotation, Movement tweaks Movement now is independent of camera rotation	4 年前
Unknown	35de3fbd	Adding scenes data (still WIP)	4 年前
Unknown	1cc14a04	SOs for menus and levels and adding scenes	4 年前
Unknown	863a7673	Adding events and listeners for scene loading	4 年前
Nathan	b09b90e6	Fixed player movement axis bug	4 年前
Unknown	082ef4fb	Main menu and loading bar scripts	4 年前
GitHub	bbcfe5c4	Merge pull request #4 from DapperDino/master Verified that the bug is fixed. Thanks, Nathan! Also: **First contribution!!** 🎉	4 年前
Unknown	23f0a3bf	Added check to avoid loading scene multiple times	4 年前
Nathan	1215a9bf	Fixed snappy movement bug	4 年前
Unknown	770575c2	Changed to L key instead of space bar for load (space used to jump)	4 年前
GitHub	4af64d31	Merge pull request #9 from DapperDino/master Fix looks good!	4 年前
Unknown	76ec29e0	Clean	4 年前
Austin Brown	b83bd3d0	Add Camera Sensitivity This commit adds a variable to CameraManager.cs that will allow the sensitivity/speed of the player camera to be modified. By default, the camera sensitivity is now quicker.	4 年前
Quickz	6738e6e0	Fixed an issue regarding player jump not getting stopped by a collision from above	4 年前
Unknown	a9107d7c	Adjustments on scene loading	4 年前
GitHub	a5b785a6	Merge pull request #16 from Quickz/player-jump-fix Tested in the scene and it seems like it fixes the issue. Thanks @Quickz, merging!	4 年前
Austin Brown	f1435a8e	Use Range for cameraSensitivity of CameraManager Previously, the cameraSensitivity was unbounded but, on Awake, was clamped to a certain range. This range is now enforced via a Range attribute on the cameraSensitivity variable.	4 年前
Unknown	af81ba57	Added level 2 and level end trigger in level 1	4 年前
mwert09	e447593c	Fixed steep surfaces bug	4 年前
Andrew Real	1f6fdb42	Replace magic numbers with variables - issue: 40	4 年前
Wodopo	1eef189c	My take on a simple Player Spawn System	4 年前
Andrzej Łukasik	dab4333d	InputReader made into ScriptableObject asset	4 年前
Ciro Continisio	a72aef38	Made the cameraSensitivity field private	4 年前
GitHub	da7293bb	Merge pull request #17 from atb-brown/camera-move-speed Add Camera Sensitivity	4 年前
mwert09	f40790a1	Made adjustments based on HyagoOliveiran's suggestions Tried to add more variables to increase legibility. Added UpdateSlide function. Deleted some empty lines.	4 年前
GitHub	c0a9e0a7	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>	4 年前
Wodopo	3b1e385f	Renamed SetRequestSpawnIndex to SetSpawnIndex	4 年前
Carlos Eduardo Pérez	3bea7874	Added custom inspector for GameScene ScriptableObjects It improves workflow and minimizes user error by allowing a designer to pick scenes from a list instead of typing their name manually	4 年前
mwert09	fa4b802f	Update Character.cs	4 年前
GitHub	a046c18a	Deleted unnecessary spacing	4 年前
Ciro Continisio	4aaa3b36	Spawn system in place	4 年前
Carlos Eduardo Pérez	08176b7d	Updated GameSceneEditor class	4 年前
Quickz	25279029	fixed an issue regarding player jump not getting canceled in a few cases	4 年前
mwert09	03385e75	Update Character.cs	4 年前
mwert09	90d34bde	Fixed bouncing issue when player hit under floating platform	4 年前
GitHub	506101f1	Merge pull request #45 from Quickz/jump-fix Fixed an issue regarding player jump not getting canceled in a few cases	4 年前
mwert09	90e60ba3	Update Character.cs	4 年前
GitHub	a9604394	Merge branch 'master' into TMPro-Import	4 年前
Carlos Eduardo Pérez	f6215f53	DrawSceneEditor now has a single, non-branching undo check This was done to balance out undo calls when no scene is selected from scene picker	4 年前
mwert09	fa308200	Update Character.cs	4 年前
Andrew Real	bd2f9dce	Merge branch 'master' into remove-magic-numbers	4 年前
Carlos Eduardo Pérez	79ec6d45	Updated warning message	4 年前
GitHub	9c27ba24	Merge pull request #27 from andrew-raphael-lukasik/InputReader_as_ScriptableObject InputReader made into ScriptableObject asset	4 年前
mwert09	123c2bdc	Update Character.cs	4 年前
Andrew Real	e23c8e72	Change var name to more acurately show purpose	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 年前
GitHub	2c21f5a9	Merge pull request #31 from CharlExMachina/Scene-Loading Added custom inspector for GameScene ScriptableObjects	4 年前
mwert09	14215282	Update Character.cs	4 年前
Andrew Real	106bfcd0	Remove accidentaly added blank lines	4 年前
Ciro Continisio	2cfc9750	SpawnSystem active in the scene Removed the player prefab from the scene	4 年前
GitHub	afc7b64e	Merge pull request #25 from Wodopo/master Simple Player Spawn System	4 年前
Ciro Continisio	69c48251	Changed the new variable into a constant	4 年前
Unknown	9bcfa8f8	Changed Level to Location	4 年前
GitHub	02d8e6c7	Merge pull request #55 from andrewreal/remove-magic-numbers Remove magic numbers	4 年前
mwert09	f063f571	Merge branch 'bug-steep-surfaces'	4 年前
Unknown	09bb47ff	Remove old files	4 年前
mwert09	a291c583	Merge remote-tracking branch 'upstream/master'	4 年前
Unknown	da0bbab5	Added Void, Int and Load Events SO and Listeners	4 年前
mwert09	83f426f0	Merge remote-tracking branch 'upstream/master'	4 年前
Unknown	d3e13985	Methods to trigger events	4 年前
GitHub	f5ad616a	Merge pull request #26 from mwert09/master Fixed steep surfaces bug and implemented sliding	4 年前
Miley Hollenberg	cd634c11	Implemented automatic linter	4 年前
Unknown	6dee2704	Location loader script	4 年前
Miley Hollenberg	4211568e	[Bot] Automated dotnet-format update	4 年前
GitHub	83951a71	Merge pull request #73 from MileyHollenberg/Linter Setup automatic linting as a Github Action	4 年前
Unknown	87b7db67	Better comments	4 年前
Unknown	ec685786	Updated raise method name	4 年前
GitHub	9965c051	Removed unused imports (#75)	4 年前
Ciro Continisio	e27f318b	Merge branch 'master' into custom-lighting-shader # Conflicts: # UOP1_Project/Packages/manifest.json # UOP1_Project/ProjectSettings/ProjectVersion.txt	4 年前
DeivSky	3a48da8b	Initial commit	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 年前
DeivSky	15afbcfd	Added debug toggle	4 年前
DeivSky	830591fd	[Bot] Automated dotnet-format update	4 年前
DeivSky	33f1fbae	Merge branch 'state-machine' of https://github.com/DeivSky/open-project-1 into state-machine	4 年前
DeivSky	4686f6e6	[Bot] Automated dotnet-format update	4 年前
Ciro Continisio	43ebc212	Art reorganisation and cleanup	4 年前
DeivSky	32a19461	Removed serializable actions/conditions. Added current state name in state machine component. Added more spheres to test scene.	4 年前
Ciro Continisio	ff340fa4	Fixed typo	4 年前
DeivSky	9dba4a4a	minor	4 年前
DeivSky	d3e9ddbc	Renaming from 'Scriptable' prefix to 'SO' suffix. Co-Authored-By: Ciro Continisio <20049224+ciro-unity@users.noreply.github.com>	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 年前
DeivSky	6908fd16	[Bot] Automated dotnet-format update	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 年前
DeivSky	f90a8f1f	[Bot] Automated dotnet-format update	4 年前
Ciro Continisio	d2082480	Removed personal namespace	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	8c53ac1f	Fixed Assembly issue	4 年前
Ciro Continisio	cc6cd14e	Fixed Assembly issue	4 年前
GitHub	c7fa7330	Fixing events not being events (#109) Without event keyword anyone can call such delegates	4 年前
Unknown	851efcad	Merge remote-tracking branch 'origin/main' into Scene-Loading	4 年前
Unknown	e2782b21	Location loader now sets the active scene	4 年前
Unknown	fc79899d	[Bot] Automated dotnet-format update	4 年前
Unknown	7c11a54d	Merge remote-tracking branch 'origin/Scene-Loading' into Scene-Loading	4 年前
Unknown	db2b3ac2	[Bot] Automated dotnet-format update	4 年前
Unknown	af2ab922	Merge branch 'Scene-Loading' into main	4 年前
GitHub	28e505c4	Fixed transition grouping error (#112) changed the variable idx value from i to the last index of resultGroupsList	4 年前
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 年前
Unknown	0ce62d9d	Added scene management folder in scripts	4 年前
circa94	889527c6	moved inventory scripts to align with project conventions	4 年前
Unknown	a72a0657	Now possible to start the game from any scene	4 年前
Unknown	860e61c1	Added SO to the name of scriptable objects scripts	4 年前
Unknown	5edd2f9e	Changed Scene loader scene name to Initialization	4 年前
Unknown	a5ff75ad	SO name updated in other scripts	4 年前
Unknown	77cff63f	[Bot] Automated dotnet-format update	4 年前
GitHub	aed4d5ec	Change Awake() to Start() in Spawning System (#120) (#136) Issue #120 When the scenes are additively loaded, GameObject instantiation should be put in Start(), because Awake() is exectuted before the new scene becomes active. Reference thread: https://forum.unity.com/threads/additive-scene-loading-and-awake.660379/	4 年前
Ciro Continisio	c3bf387e	Cleanup, Reorganisation of folders and Scenes	4 年前
Ciro Continisio	99572dd3	[Bot] Automated dotnet-format update	4 年前
GitHub	66ea2175	Generic (Scriptable) Object Pool (#117) * Generic Object Pool Added Generic Object Pool Added Generic Object Factory Added Example Scene * Added missing documentation * Update Pool.cs Removed stray virtual keyword for time being * Removed old testing assets * Implemented Requested Changes - Removed _unavailable collection from Pool - Added batch Request/Return methods - Added IPool interface to enforce common methods - Modified example scene to showcase batch methods - Pared down ComponentFactory to its base function * Added Experimental ScriptableObjects Added FactorySOs Added PoolSOs * Implemented Pool/Factory as ScriptableObject * Initialize on Return * Added Runtime Creation Example & Various fixes and cleanup Added runtime creation example renamed Pool.Add to Pool.Create made Pool.Create protected instead of public Streamlined Request method Initialized List with known size in batch Request method Only DestroyImmediate pool ro...	4 年前
kgc00	caba7de7	changed input phase check to match best practices	4 年前
Dave Rodriguez	650c1a57	[Bot] Automated dotnet-format update	4 年前
GitHub	4a980728	changed input phase check to match best practices (#141)	4 年前
kgc00	e1c42620	Merge remote-tracking branch 'upstream/main' into main	4 年前
GitHub	a2a278c8	Spawn location editor (#138) * place spawn location with mouse * commenting tooltip out * Cleanup Removed unused code, various renames, fixed usage of the event.Use() function, added AddComponentMenu attribut Co-authored-by: Ciro Continisio <ciro@unity3d.com>	4 年前
Jonathan Mercer	114a0cfc	[Bot] Automated dotnet-format update	4 年前
GitHub	cc670c90	Simple mouse based camera controls (#146) * changed input phase check to match best practices * simple solution * simple camera mouse movement - implemented system where right button hold enables mouse to control camera - added a 'speed' setting to the camera manager to modify rotation speed - updated .inputactions asset - to contain a mouse binding for "RotateCamera" action - added "EnableMouseCameraRotation" action - added scale vector 2 processors for different rotation devices to get a similar speed out of each of them - updated input reader to handle new bindings + action - updated CameraManager to handle new method of camera manipulation - found bug with old rotate camera binding (did not work on my gamepad) deleted old binding, remade it. now works on my setup * added speed preset to camera system prefab. some code housekeeping / syntax changes * renamed for clarity * Better naming for variables Co-authored-by: Unknown <amel.negra...	4 年前
kgc00	abc8c25c	[Bot] Automated dotnet-format update	4 年前
GitHub	136bad1f	Pool Cleanup (#147) Removed space from asset filename Move LocalPoolTester from Assets to the Example folder Renamed ComponentPool to ComponentPoolSO to match naming convention	4 年前
Dave Rodriguez	3063fef1	[Bot] Automated dotnet-format update	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 年前
Rainaldi Satria	179bd881	[Bot] Automated dotnet-format update	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 年前
GitHub	0308bf97	Initial commit with fix (#149)	4 年前
GitHub	96e3b3f0	Replaced StateTransitionSO with TransitionTableSO + Editor (#114) * Initial commit. Replaced StateTransitionSO with TransitionTableSO. * [Bot] Automated dotnet-format update * Deleted old transitions assets. * Editor Created TransitionTableEditor and StateEditor. - TransitionTableEditor allows you to fully configure the transition table in an easy way. - A list of the states in the table is displayed, with the initial state at the top. - States can be sorted manually to change the initial state or just for ordering. - The order of the states bellow the initial shouldn't affect the behaviour of the state machine. - Added buttons to easily switch back and forth between state editor and transition table editor. - The state editor is a simple reorderable list with all the action in the state. - Clicking on a state will display all of its transitions, along with their conditions. - Transitions can be sorted to change the order in which checks are executed. - Transit...	4 年前
Dave Rodriguez	05631f89	Object Pool Simplification Removed ComponentPoolSO Modified FactorySO to be fully abstract Removed IPoolable Modified PoolSO and ComponentPoolSO to not constrain to IPoolable Modified Example to use unwrapped ParticleSystem component	4 年前
GitHub	8a3e7f3a	Repaint when selecting spawn location (#152) When we wanted to click to select spawn location while not in play mode the gizmos was laggy. I added to repaint on mouse move event to always paint the exact location.	4 年前
GitHub	f06b5a5e	Improved debugging for the state machine (#131) * Added a specialized class for debugging the state machine The StateMachineDebugger class will generate logs for state changes together with the conditions results. Providing more in-depth information. * [Bot] Automated dotnet-format update * Improved the debugger's log with SO names Added changes so the state machine debugger can use the ScriptableObjects names in the log, improving readabilty. Now the log also shows the transition name. * [Bot] Automated dotnet-format update * Added a feature to also list the active StateActions The debugger can now list the actions activated by the state. Also added two options to toggle the logging of the conditions and the actions * [Bot] Automated dotnet-format update * Small improvements and documentation Changed the State name for a reference to the SO of origin (like the other classes) Removed the name of the transition for compatibility with the changes made...	4 年前
Dave Rodriguez	395ad900	Modified Example Scene Modified Example Scene to use unwrapped Particle System	4 年前
GitHub	2907b6c8	Audio System (#90) * Adding scenesLoader scene * Adding main menu and level 1 scenes for test * Adding loading system * Adding scenes data (still WIP) * SOs for menus and levels and adding scenes * Adding events and listeners for scene loading * Main menu and loading bar scripts * pushing ScenesLoader scene * Main menu scene, added menu disable on start * Added check to avoid loading scene multiple times * Changed to L key instead of space bar for load (space used to jump) * Clean * Added clear lists option and tweaks on MM and ScenesLoader scenes * Adjustments on scene loading * Added level 2 and level end trigger in level 1 * Added new obstacle material for lvl2 and tagged Player * Added custom inspector for GameScene ScriptableObjects It improves workflow and minimizes user error by allowing a designer to pick scenes from a list instead of typing their name manually * Updated GameSceneEditor class * Added new obstacle mate...	4 年前
Chema Damak	54306cec	Added localization package	4 年前
GitHub	a331d889	Added an Editor assembly to the FSM editor scripts (#158) This assembly will mark the editor code for removal when building the project.	4 年前
Erik Locutura	4386bee3	[Bot] Automated dotnet-format update	4 年前
Ciro Continisio	e1aa5f02	[Bot] Automated dotnet-format update	4 年前
Chema Damak	9e43c174	[Bot] Automated dotnet-format update	4 年前
kgc00	ad56cb20	Merge remote-tracking branch 'upstream/main' into main	4 年前
GitHub	b5b57142	Added caching to the conditions for better performance (#164) Condition results are now cached so they are only evaluated once per frame, regardless of how many times they are being checked in the state machine logic. Caching is made by each instance of the state machine and the condition respective scriptable object. Added a boolean value to enable/disable this feature on each Condition Scriptable Object individually. Extra internal changes: The abstract function Condition.Statement() changed from public to protected so it can only be used inside the internal Condition.GetStatement(). Added documentation regarding all Get methods for the abstract Scriptable Objects to clarify their behaviors. Removed StateTransitionSO since it was replaced by TransitionTableSO Changed public TransitionTableSO.GetInitialState() to internal. Changed a few SO references to their specialized classes.	4 年前
vishwah	1ca62e69	Created Editor Tool Created Editor tool to replace GameObject with Prefab	4 年前
GitHub	0ed3bfbe	Delete unused metafile for Sound folder (#166)	4 年前
Chema Damak	7653f891	Add localized Dialogue	4 年前
kgc00	3de8ab5c	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	4 年前
Ciro Continisio	8504c55f	PigChef plays idle and walk animations Created action to set a bool parameter on the state machine	4 年前
Ciro Continisio	5eb2bf05	Styling	4 年前
Ciro Continisio	743591f7	Tweaks to Replace tool	4 年前
Chema Damak	04a8fa29	[Bot] Automated dotnet-format update	4 年前
kgc00	801e2d62	updates	4 年前
Ciro Continisio	8316ca44	State Inspector improvements	4 年前
Ciro Continisio	1cb46df6	[Bot] Automated dotnet-format update	4 年前
Chema Damak	eea05022	Revert "[Bot] Automated dotnet-format update" This reverts commit de9179553d8398b66e55565a91c1de91db43d51e.	4 年前
kgc00	922a3b98	debug	4 年前
Ciro Continisio	1ee5259e	Merge branch 'main' into big-merge	4 年前
Ciro Continisio	c1c6c1bd	Merge remote-tracking branch 'tech-mkt/state-machine-improvements' into state-machine-improvements	4 年前
Chema Damak	6f3d6f8d	[Bot] Automated dotnet-format update	4 年前
kgc00	2db1442c	docs	4 年前
GitHub	534e7d86	TransitionTableEditorWindow (#191) * Added TransitionTableEditorWindow. * [Bot] Automated dotnet-format update Co-authored-by: Ciro Continisio <ciro@unity3d.com>	4 年前
Brett	53a29ad3	Localize TMP font LocalizeTMProFontEvent.cs - Component to localize a TMP_FontAsset LocalizeComponent_TMProFont.cs - TextmeshProUGUI context menu "Localize String And Font"	4 年前
kgc00	bd5cb2d6	removed ununsed var	4 年前
Ciro Continisio	f0dc54d3	Fix CM bug, tweaks	4 年前
uChema	2aa92a2d	Merge	4 年前
kgc00	96983fe8	doc	4 年前
Ciro Continisio	6803546e	[Bot] Automated dotnet-format update	4 年前
Ciro Continisio	d8761506	Merge remote-tracking branch 'tech-mkt/main' into main	4 年前
GitHub	e7a3f51c	Dialogue system event fix (#162) * changed input phase check to match best practices * refactored system to go through input reader. properly unsubscribing from events in dialogue system * Nitpick on the naming Co-authored-by: Ciro Continisio <ciro@unity3d.com>	4 年前
kgc00	4740b5b7	[Bot] Automated dotnet-format update	4 年前
GitHub	aaf14e64	fix: Project won't compile due to a reference to UnityEditor (#157) (#169) * fix: Project won't compile due to a reference to UnityEditor (#157) * #157 improved code readability	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 年前
Rainaldi Satria	b62977f8	[Bot] Automated dotnet-format update	4 年前
kgc00	781633e3	Merge remote-tracking branch 'upstream/main' into main	4 年前
GitHub	afec2f17	Remove unused ReorderableList implementation (#181) * Remove confusing ReorderableList * Removed unused custom Inspector Co-authored-by: Ciro Continisio <ciro@unity3d.com>	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	51aa0f82	Merge branch 'vishwah13/main' into main	4 年前
kgc00	7aa245f6	found fix for todo #2	4 年前
Ciro Continisio	782c5b99	[Bot] Automated dotnet-format update	4 年前
kgc00	b19634e0	added to component menu	4 年前
kgc00	280989a8	was able to fix edge case #1	4 年前
Ciro Continisio	26747ac5	Merge branch 'treivize/feature/art/transparent_support' into art-assets	4 年前
kgc00	d631a06f	doc	4 年前
kgc00	b06aad3e	updates	4 年前
Ciro Continisio	ededb7c0	Merge branch 'state-machine-improvements' into main	4 年前
rainaldisatria	6fabd6a2	Update DialogueDataSO.cs to support branching	4 年前
Ciro Continisio	0174edd5	Merge branch 'davejrodriguez/object-pool' into main	4 年前
Ciro Continisio	89aa39ea	Fixed AudioManager in response to pool changes	4 年前
Ciro Continisio	1c3786bc	[Bot] Automated dotnet-format update	4 年前
kgc00	253b73a3	Merge remote-tracking branch 'upstream/main' into main	4 年前
Ciro Continisio	77c86ba9	Merge remote-tracking branch 'tech-mkt/state-machine-improvements' into main	4 年前
Chema Damak	597b3f7b	Merge branch 'localization' into main	4 年前
kgc00	7b04a609	Merge branch 'main' into simple-menu-controls	4 年前
Ciro Continisio	d14b0e45	Cleanup	4 年前
Chema Damak	093779d0	Fix cutscenes	4 年前
rainaldisatria	d74551dd	Create DialogueTrigger.cs	4 年前
kgc00	c1a6983d	merged in main, added menu prefab to asset database	4 年前
Ciro Continisio	7be88cca	Removed script Character, moved StateMachine SOs	4 年前
Chema Damak	d9519898	[Bot] Automated dotnet-format update	4 年前
Chema Damak	464fd3cf	Merge branch 'pr/130' into Inventory	4 年前
rainaldisatria	b0513472	Adjust DialogueManager.cs to support branching	4 年前
Ciro Continisio	383e85b3	Renamed variable in all Conditions and Actions	4 年前
Chema Damak	3aaa37cc	Add UI system, Inventory UI and update Inventory System	4 年前
rainaldisatria	85be34a1	Update DialogueManager.cs to support showing DialogueData and branching	4 年前
kgc00	20efc354	readme	4 年前
Ciro Continisio	3db2e782	Added the ability to talk	4 年前
Chema Damak	9bfb88e2	[Bot] Automated dotnet-format update	4 年前
rainaldisatria	430d537b	Update InputReader.cs to safely invoke the event	4 年前
Ciro Continisio	7f5780ce	[Bot] Automated dotnet-format update	4 年前
kgc00	a23c841c	updated readme	4 年前
Ciro Continisio	58d65aa2	Merge remote-tracking branch 'tech-mkt/main' into pr-bashing	4 年前
Zakhar Ipatov	badd647a	Editor window event fix	4 年前
rainaldisatria	a0293eb3	Merge remote-tracking branch 'upstream/main' into branching-feature-in-dialogue-system	4 年前
kgc00	bd56bebf	removed call to base.onenter in CC button to simplify selection logic	4 年前
Ciro Continisio	7354551c	Preselect default button	4 年前
Ciro Continisio	7afb5af0	StateMachine serialisation fix	4 年前
Ciro Continisio	30428f5c	Tweaks	4 年前
Ciro Continisio	ee1d998c	AnimatorParameterActionSO and refactoring	4 年前
Ciro Continisio	3e2ad7f2	Integrated dust particles	4 年前
Ciro Continisio	cd97a760	Removed warnings	4 年前
Ciro Continisio	e7bdd126	[Bot] Automated dotnet-format update	4 年前
Ciro Continisio	0bcdfe44	Merge remote-tracking branch 'tech-mkt/main' into pr-bashing	4 年前
Ciro Continisio	f8f9e0b0	Event system refactoring	4 年前
Ciro Continisio	5fcc526a	Merge branch 'use-box-collider-for-pottery-objects' of https://github.com/mtakac/open-project-1 into main	4 年前
Dave Rodriguez	5c6ddda0	Add Explicit Prewarm to Pool Added Prewarm to IPool Implemented Prewarm in PoolSO Removed private InitializePool in ComponentPoolSO Added Lazy-Loaded PoolRootObject to ComponentPoolSO Removed InitialPoolSize property from ComponentPoolSO Modified Examples to use new workflow Modified Audio scripts to use new workflow	4 年前
Dave Rodriguez	07891a31	Naming Convention Renamed _available to Available in PoolSO	4 年前
Ciro Continisio	99c4ccb4	Audio functionality	4 年前
Ciro Continisio	ce5b07db	Fry king in scene, Loading tweaks	4 年前
Ciro Continisio	6f5f996f	Merge remote-tracking branch 'davejrodriguez/fix/object-pool' into pr-bashing # Conflicts: # UOP1_Project/Assets/Scripts/Audio/AudioManager.cs	4 年前
Ciro Continisio	55026ca5	[Bot] Automated dotnet-format update	4 年前
Ciro Continisio	cd7a4a31	Merge branch 'state-machine-improvements' into main	4 年前
Ciro Continisio	826ef58b	AudioSystem functionality	4 年前
Dave Rodriguez	5430f525	Removed DontDestroyOnLoad Removed DDOL Added SetParent method that allows pool managers to tie the pool lifetime to their own	4 年前
Ciro Continisio	48405f92	[Bot] Automated dotnet-format update	4 年前
Ciro Continisio	35c93414	[Bot] Automated dotnet-format update	4 年前
Ciro Continisio	a1c2234b	[Bot] Automated dotnet-format update	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 年前
Ciro Continisio	82d4c4e3	Fixed framerate-dependent jump (?) Also added a debug option to the editor initialised, to force framerate to extreme values	4 年前
Llaczky	a05af5c2	Merge branch 'main' into art-assets	4 年前
GitHub	e09986b8	Merge branch 'main' into fix/object-pool	4 年前
Dave Rodriguez	7c6961f0	Simplified parenting Simplified parenting logic Added some comment docs	4 年前
Ciro Continisio	1d26bec4	Merge branch 'main' into state-machine-improvements	4 年前
treivize	df2ab2a2	Merge branch 'art-assets' into feature/art/slime_critter	4 年前
DeivSky	7c6a362d	Added protected OriginSO getters to actions and conditions	4 年前
DeivSky	32e56490	Restructuring & minor changes	4 年前
DeivSky	49c14d67	Added InitOnlyAttribute InitOnlyAttribute adds a helpbox in the inspector during play mode to indicate that the field with the attribute is only used for initialization, and thus will only affect new instances, or after re-entering play mode.	4 年前
DeivSky	c6c566d3	Added templates for StateAction and StateCondition scripts Added menu items for creating new StateAction and StateCondition scripts, to reduce some of the boilerplate they require. To create a new script, go to Assets (or right click on project view) > Create > State Machines > Action/Condition Script.	4 年前
DeivSky	10ac1ce1	minor changes	4 年前
DeivSky	d440d47e	[Bot] Automated dotnet-format update	4 年前
DeivSky	f383ac57	Merge branch 'sm-improvements' of https://github.com/DeivSky/open-project-1 into sm-improvements	4 年前
Ciro Continisio	abcd1b32	Merge branch 'fix/object-pool' of https://github.com/davejrodriguez/open-project-1 into pr-bash	4 年前
DeivSky	50e3a4ed	Changed to isPlayingOrWillChangePlaymode instead of isPlaying	4 年前
Ciro Continisio	1fd9ed89	Parenting of the default sound pool to the AudioManager	4 年前
DeivSky	0b07d6d3	Revert "Changed to isPlayingOrWillChangePlaymode instead of isPlaying" This reverts commit d2d5691178393194473deb1ed862ca9056bcb7a2.	4 年前
DeivSky	ee554022	update text	4 年前
Ciro Continisio	68d0f7c4	[Bot] Automated dotnet-format update	4 年前
jandd661	8a7a3b44	Fix for issue Location Loader issue #229	4 年前
jandd661	f0ace111	Revert "Fix for issue Location Loader issue #229" This reverts commit c7d75ff1da92b172333042e5e9df43a2a296ca03.	4 年前
jandd661	baff1741	Proposed fix for issue #229 with test scenes	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 年前
Ciro Continisio	c1fe908d	Fixes to example, moved files in Examples folder	4 年前
Ciro Continisio	13449978	Merge branch 'sm-improvements' of https://github.com/DeivSky/open-project-1 into pr-bash	4 年前
Ciro Continisio	c81112b1	Reworked all Actions and Conditions to take advantage of the refactor	4 年前
Ciro Continisio	b9e24678	[Bot] Automated dotnet-format update	4 年前
Amel Negra	9cca9fad	Added Event that takes GameObject in parameter	4 年前
GitHub	5c397fee	Reset HasBeenPrewarmed (#243)	4 年前
GitHub	175074a0	Hotfix for null checking `ToState`. (#244)	4 年前
GitHub	6bf8be1d	Added back recklol Dissolve effect (#217) * Added recklol dissolve effect with some tweaks * Added names to dissolve outputs * Added a dissolve effect option in contextual menu and add alpha cutoff in Toon_Disolve	4 年前
treivize	c978e5d4	[Bot] Automated dotnet-format update	4 年前
Ciro Continisio	1baef50e	Merge branch 'main' into art-assets	4 年前
Ciro Continisio	edb25cc1	Merge branch 'state-machine-improvements' into main	4 年前
Amel Negra	afc27181	Moved Interaction script to scripts folder	4 年前
Ciro Continisio	cd002671	Merge branch 'main' into art-assets	4 年前
Ciro Continisio	11189097	Merge remote-tracking branch '_tech-mkt/art-assets' into art-assets	4 年前
Amel Negra	586d8486	Game input update after interaction key change	4 年前
Amel Negra	51557327	[Bot] Automated dotnet-format update	4 年前
Amel	17dfe054	updated interaction manager	4 年前
Jan Urbanec	347a978e	Initial decoupling of CameraManager and SpawnSystem. Spawn system still needs reference to CameraManager, because it must provide it to Protagonist.	4 年前
GitHub	5fd25192	Added small internal cooldown to the PlayLandParticlesAction StateAction (#260) * Added small internal cooldown to PlayLandParticlesAction StateAction https://open.codecks.io/unity-open-project-1/decks/15-code/card/18k-avoid-spamming-particles-on-sliding Whenever the PlayLandParticlesAction StateAction is exited by the state machine, it checks if total elapsed time is greater then the total elapsed time of the last particle call + a small amount. If so, only then do we tell the DustParticle Controller to play, and we also set the new time to beat to be the current time. * Update PlayLandParticlesActionSO.cs Removed the unnecessarily verbose extra function Co-authored-by: Ciro Continisio <ciro@unity3d.com>	4 年前
Amel	f37966df	interaction ui event	4 年前
MTrecozzi	c97e9c6b	[Bot] Automated dotnet-format update	4 年前
Amel	6683aa86	[Bot] Automated dotnet-format update	4 年前
Ciro Continisio	2ced0ef9	Added description to EventChannels	4 年前
Amel	d9da131e	Added interaction UI when interaction ends	4 年前
Ciro Continisio	8da148bf	Introduced RuntimeAnchors Used in Spawn and CameraSystem for decoupling purposes	4 年前
Amel	132a377e	Added enable UI action map from InputReader	4 年前
Ciro Continisio	2700464f	[Bot] Automated dotnet-format update	4 年前
Amel	c4c8c250	Updates on interaction manager	4 年前
GitHub	1564f41c	Issue #245 simple fix for camera erratic behaviour (#250) * hair color mask material, old lady hairdo and glass, moustache, and shell bowl Various art assets to make the townsfolk more unique. Bowl made from a giant shell. * Fix Plant Critter mesh scaling and name (#239) * Townsfolk_M animations, Palm2 * New tree type * simple fix for camera * Reset HasBeenPrewarmed (#243) * [WIP] Added some table furniture (#233) * Added some table furnitures * Corrected all furniture prefabs to be prefab variant * Added back recklol Dissolve effect (#217) * Added recklol dissolve effect with some tweaks * Added names to dissolve outputs * Added a dissolve effect option in contextual menu and add alpha cutoff in Toon_Disolve * [Bot] Automated dotnet-format update * Imported Smurjo's models, reorganised folders * Hotfix for null checking `ToState`. (#244) * Wiki and Readme images * Update README.md * Update README.md * Initial decoupling o...	4 年前
Ciro Continisio	7303c4fe	Merge branch 'main' into art-assets	4 年前
GitHub	e9c2c909	State Machine - Proposed fix for Issue 228 (#227) * Added Sliding to JumpAscending Player was unable to jump if sliding which caused the player to get stuck in geometry/holes. * Added IsActuallyMoving Condition SO and update PigChef Transition Table IsActuallyMovingSO evaluates character movement by the character controller's velosity.sqrMagnitude. Returns true if the character controller is moving beyond the threshold. Characters can no longer jump while sliding but can jump if they get stuck. * Update .gitignore * Small fixes Reconnected disconnected assets in the TransitionTable, reverted changes on the .gitignore, added multiplication in threshold verification equation Co-authored-by: Ciro Continisio <ciro@unity3d.com>	4 年前
Amel	ae316a87	Added item event type	4 年前
John McAllister	8c6e7df0	[Bot] Automated dotnet-format update	4 年前
Amel	7b9aca97	Added dialogue event type	4 年前
Amel	0425ffa3	removed comment from Interaction UI event channel	4 年前
Amel	582ea351	Added interaction events and updated interaction manager	4 年前
Ciro Continisio	5aaad3c6	Merge branch 'Location-Loader-issue-229-fix' into main	4 年前
Amel	cc52237b	Added isPickingUp SO condition to state machine	4 年前
Ciro Continisio	4ea5a7a5	[Bot] Automated dotnet-format update	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 年前
Amel	4a5985db	[Bot] Automated dotnet-format update	4 年前
Amel	90998767	Merge remote-tracking branch 'origin/Inventory' into interaction	4 年前
Amel	8d423ac9	post merge fixes	4 年前
Amel	525d3f4e	Fixed event for interaction pick up	4 年前
Chema Damak	8871d820	Changed Events to Event Channels	4 年前
GitHub	76062a54	Fix/LocationSO not serialized properly (#258) * Fix GameSceneSO not serialized properly. * Add a reference to the script as a ObjectField in the GameSceneSO To edit the code faster * Fix typo	4 年前
Chema Damak	e73d3ecf	[Bot] Automated dotnet-format update	4 年前
Ciro Continisio	9d3fb89a	Merge remote-tracking branch 'tech-mkt/state-machine-improvements' into main	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 年前
rainaldisatria	aeba46f4	Create CustomBaseEditor.cs Custom base editor class. Inherited from Editor class. Contains handy method to use.	4 年前
Amel	be977071	[Bot] Automated dotnet-format update	4 年前
rainaldisatria	0cc94ef8	Use CustomBaseEditor class in GameSceneSOEditor.cs	4 年前
Ciro Continisio	7438112a	Reworked the CM camera, added collider, noise	4 年前
rainaldisatria	3bf061d4	Use CustomBaseEditor class in AnimatorParameterActionSOEditor.cs	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	e3274c8d	[Bot] Automated dotnet-format update	4 年前
Amel	1fa4000f	Adding initialization script	4 年前
Amel	f194e62b	[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 年前
Amel Negra	77df437f	Removed old comments from InteractionManager	4 年前
uChema	c51b9a34	Merge branch 'interaction' of https://github.com/UnityTechnologies/open-project-1 into interaction	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	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 年前
GitHub	0da85991	Update ReplaceTool.cs (#221)	4 年前
GitHub	851182b5	"Replace" context-menu with a searchable popup (#223) * "Replace" context-menu with a popup window * [Bot] Automated dotnet-format update * Selection interactive preview * Whoops, wrong merge resolve * [Bot] Automated dotnet-format update * Show popup at screen mouse position * Mini-previews on renderable objects + minor GUI improvements * [Bot] Automated dotnet-format update * Editors cache fix, remove dummy editor * Destroy only cached editor * Rename "ReplacePrefabTreeView" to "PrefabSelectionTreeView" * catch ClearPreviewCache error * fix null texture warning * Fix popup fit on smaller screens * Fix black frame when closing popup during repaint * Expand folder on single-click * Remove editor Destroy, as error is still showing inside try catch * Revert delayed close, as it made popup not-closable in some cases	4 年前
GitHub	8490d386	Added editor for ScriptableObject with events. It allows to automatically show buttons for each event and raise them. (#256)	4 年前
GitHub	78c0f11a	"Editor window to quickly open scenes" task (#267) * Added the Quick Scene Access Tool * removed unused file	4 年前
Can Chen	34b69d6c	[Bot] Automated dotnet-format update	4 年前
Ciro Continisio	cdab9c20	Merge branch 'main' of github.com:UnityTechnologies/open-project-1 into main	4 年前
Ciro Continisio	2a0d8691	Merge branch 'main' into pr-bash	4 年前
Ciro Continisio	e3f6f31a	Added Run and Faint animation for PigChef, implemented Run as BlendTree	4 年前
Ciro Continisio	26d5b059	Added the ability to run for keyboard players	4 年前
Ciro Continisio	f96d9f1e	Input and Camera tweaking	4 年前
Ciro Continisio	f6be0d86	Input and Camera tweaking	4 年前
Ciro Continisio	eec53055	Merge branch 'pr-bash' into main # Conflicts: # UOP1_Project/Assets/Scripts/Input/GameInput.cs # UOP1_Project/Assets/Settings/Input/GameInput.inputactions	4 年前
Ciro Continisio	49acac4c	[Bot] Automated dotnet-format update	4 年前
Dan Young	7ce66d74	Merge remote-tracking branch 'upstream/art-assets' into art-assets	4 年前
Amel Negra	a3fdb227	Merge branch 'main' into whiteboxing	4 年前
GitHub	3b36c936	Making GameSceneSO more reliable (#265) * Use more reliable SceneAsset instead of error-prone scene name This also makes a custom editor unnecessary * Set proper SceneAssets and serialize * Improve code readability by splitting runtime and editor parts * Fix scene path not being retrieved when entering play mode in Editor * Use scene path instead of name * Reset to default value For a case when domain was not reloaded after entering play mode	4 年前
uChema	f9f6593b	Basis for QuestSystem WIP	4 年前
David Henshaw	61abd62c	Add feature controlling number of landing particles based on fall distance	4 年前
Ciro Continisio	d80af9c6	Imported new art Fern2, Shell2 and Shell3, new faint animation	4 年前
HarshNarayanJha	1034d637	Created an editor window to quickly find SOs	4 年前
Ujjwal Raut	353c2f1b	Added Modular Save System functionality	4 年前
treivize	e5c1ed4b	Initial Plant Critter behaviour - Idle - Alert - Attack	4 年前
Ciro Continisio	6294ecab	Merge branch 'art-assets' into pr-bash	4 年前
uChema	d5f3635f	Merge branch 'pr/195' into QuestSystem	4 年前
David Henshaw	2bf575bd	Tweak Landing Particle effects	4 年前
HarshNarayanJha	8c34e2b3	Improved SOs quick access tool	4 年前
Ujjwal Raut	bdf26d9d	Added TestScript for explanation of functionality	4 年前
treivize	a4dc96e7	Initial Plant Critter combat system - Get Hit - Killed	4 年前
HarshNarayanJha	4e2ef8cc	Pulled from upstream/main	4 年前
Ciro Continisio	48a39328	Merge remote-tracking branch 'davidhenshaw/main' into pr-bash	4 年前
uChema	79e39b28	Merging Dialogue branching to the Quest System.	4 年前
HarshNarayanJha	64a8df52	Improved UI and less OnGUI() calls	4 年前
Ujjwal Raut	b137c792	Added registry initialization	4 年前
Ciro Continisio	5efb9eed	Tweaks to landing particles	4 年前
uChema	28237f05	Fix Dialogue UI and Cutscene with the new changes	4 年前
GitHub	3977c081	ReplaceTool selection and sibling index fix (#277) * Change Selection to newly created instances * Keep correct sibling index on replace	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	f72f481b	Change events on the Dialogue track, instead of the dialogue clip	4 年前
Ciro Continisio	74441aab	Fix to load correct light probes	4 年前
uChema	c128feff	Fix Dialogue branching and add UI	4 年前
GitHub	d0298f3d	Merge pull request #3 from UnityTechnologies/art-assets Art assets	4 年前
Ciro Continisio	0f81c55a	Merge branch 'simple-menu-controls' into pr-bash # Conflicts: # UOP1_Project/Assets/Scenes/TestingGround.unity # UOP1_Project/Assets/Scripts/Input/GameInput.cs	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 年前
Ciro Continisio	8218bfce	[Bot] Automated dotnet-format update	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 年前
Ciro Continisio	0f73b995	Renaming and refactoring on UI	4 年前
uChema	02abd5ef	Rename Folder	4 年前
uChema	e54c3d58	[Bot] Automated dotnet-format update	4 年前
Amel Negra	88ede019	Renamed initializationSO to PersistentManagersSO	4 年前
uChema	2fbe347a	Merge branch 'QuestSystem' of https://github.com/UnityTechnologies/open-project-1 into QuestSystem	4 年前
Amel Negra	4ae2cfae	Added event null check on BoolEventChannelSO	4 年前
uChema	01c0ef6b	Modify Quest1	4 年前
uChema	81f12965	[Bot] Automated dotnet-format update	4 年前
Amel Negra	ee385f08	Added initializationLoader class	4 年前
uChema	7ba49641	Merge branch 'QuestSystem' of https://github.com/UnityTechnologies/open-project-1 into QuestSystem	4 年前
Amel Negra	072ede02	EditorInitialisationLoader now works with menu and locations	4 年前
Ciro Continisio	6cbf4d99	[Bot] Automated dotnet-format update	4 年前
uChema	88cf490e	Fix interaction Manager	4 年前
uChema	62b1e728	[Bot] Automated dotnet-format update	4 年前
Amel Negra	424f4bdf	Added loadingScreenManager to listen to UI toggle events	4 年前
uChema	f826d844	Merge branch 'QuestSystem' of https://github.com/UnityTechnologies/open-project-1 into QuestSystem	4 年前
Amel Negra	2cfbb2ea	Spinning UI element script for loading screen	4 年前
Amel Negra	cddb1132	Added GameplaySO to be able to create gameplay scene	4 年前
Amel Negra	a2507600	removed unused class	4 年前
Amel Negra	35619468	Added onSceneReady event to inform when scene is loaded and set active	4 年前
Amel Negra	5d87a633	Pushing scenes	4 年前
Amel Negra	33c5fde8	Added listener to scene ready event in spawn manager	4 年前
Amel Negra	403824da	major changes on location loader to fit the new scene re architecture	4 年前
Amel Negra	38fdca31	Made GameSceneSo TextArea to better see scenes descriptions	4 年前
Amel Negra	f558e77c	removed unused variable in location loader	4 年前
Amel Negra	d00568b8	Added the event for editor initializer and updated prefabs to ref it	4 年前
Amel Negra	eb568505	renamed LocationLoader to SceneLoader	4 年前
Amel Negra	03bdc2e4	Now loading screen works	4 年前
Amel Negra	d78abfcb	to do added	4 年前
Amel Negra	a6b2a938	Using bool instead of event because on the same GO	4 年前
Amel Negra	76588955	moved script to scripts scene management folder	4 年前
Amel Negra	e8d73e33	Merge branch 'scenes-re-architecture' into main	4 年前
Amel Negra	86717d66	[Bot] Automated dotnet-format update	4 年前
Ciro Continisio	c925b56b	Merge branch 'feature/code/plant_critter_sm' of https://github.com/treivize/open-project-1 into pr-bash	4 年前
Ciro Continisio	e6e1f38f	Merge branch 'feature/sub/plant_critter_combat_system' of https://github.com/treivize/open-project-1 into pr-bash	4 年前
Ciro Continisio	6592ba26	Tweaks Protagonist now moves to Idle state after attack, with the right timing	4 年前
Ciro Continisio	162a06e3	Refactoring, renaming, comments	4 年前
Ciro Continisio	84e76f64	Fixes, typos and tweaks	4 年前
Ciro Continisio	6e9237b6	Walkling cane as weapon, tweaks to animations	4 年前
Ciro Continisio	7c088a1f	Merge branch 'pr-bash' into main	4 年前
Ciro Continisio	154737ee	[Bot] Automated dotnet-format update	4 年前
Ciro Continisio	b8753400	Merge remote-tracking branch 'tech-mkt/main' into main	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 年前
rcarag	76ffdd4f	[Bot] Automated dotnet-format update	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 年前
dotsquid	fbe04077	[Bot] Automated dotnet-format update	4 年前
Ciro Continisio	c6c67ff0	New sound effects Wired new sound effects: jump, pickup, swing cane and footsteps Laid the foundation work for more Script playing sfx on player from animation clips	4 年前
Amel Negra	e4af50a3	removed old comment	4 年前
Amel Negra	3e7e4387	Added persistent scenes list clear when loading done	4 年前
GitHub	7b5746da	Record changes in objects moved by ClickToPlaceHelper (#306)	4 年前
GitHub	8a58f375	Fixed bug when trying to click item (#303)	4 年前
Amel Negra	03b661ec	Updated BoolEventChannelSO Summary	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	c28d9833	Merge branch 'main' into QuestSystem	4 年前
GitHub	1853f7ab	Added Critter SO - Item drop when killed - FR critter names (#299)	4 年前
uChema	008bad73	Fix Merge	4 年前
Yohann Puyhaubert	94c592c3	[Bot] Automated dotnet-format update	4 年前
Amel Negra	01936592	Merge remote-tracking branch 'origin/art-assets' into main	4 年前
uChema	13a140e3	[Bot] Automated dotnet-format update	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 年前
GitHub	faf70fc8	Slime critter propel attack (#315)	4 年前
Yohann Puyhaubert	94887c60	[Bot] Automated dotnet-format update	4 年前
uChema	4995dad7	Merge branch 'pr/290' into QuestSystem	4 年前
uChema	b48675a8	Add italian locale	4 年前
GitHub	71fe0c78	Update PigChef TransitionTable, Jumping and Sliding mechanics (#310) * Update PigChef_TransitionTable.asset Changes: - From Idle - To Sliding - ~~IsActuallyMoving~~ - To JumpAscending - ~~IsSliding~~ - From Walking - **To Sliding (moved above To JumpAscending)** - To JumpAscending - ~~IsSliding~~ * Reordered Walking and Idle states transitions. - To Sliding - To JumpAscending - To JumpDescending - To Attack - To PickUp - To Talk - To Walking/Idle * Update PigChef.controller Updated PigChef Animator controller to reflect the changes to the TransitionTable: - Added transition from Walking to Collect on PickUp trigger. - Added transition from Walking to Talking when IsTalking is True. * Added MidSliding State The MidSliding State is added to prevent the state machine from going back and forth between Sliding and JumpDescending when not needed. * Major changes to player sliding and aerial movement, bug fixes, and adjustments...	4 年前
Ciro Continisio	c691552b	Merge branch 'pr-bash' into whiteboxing # Conflicts: # UOP1_Project/Assets/Samples.meta	4 年前
GitHub	32df5510	State Machine Improvements (#314) * Changes to Action and Condition script templates - Uncommented `OnStateEnter` and `OnStateExit` - Added property to cast `OriginSO` to the derived class * Minor changes - Moved call to method `OnStateEnter` of the initial State from `Awake` to `Start` - Added summary for `OriginSO` properties - Added buttons to edit 'To States' in the Transition Table Editor, just like with 'From States' * [Bot] Automated dotnet-format update * Fixed reordering transitions Fixed a bug that was causing states to go out of order when reordering transitions. * TransitionTableEditor code cleanup and visual improvements - States and transitions will only show the up/down buttons when they can move up or down (first item can't move up, last item can't move down). - Changed zebra colours to light grey/lighter grey. - The state of the window is better preserved to not close an opened state after performing sorting, removing, and/or undo opera...	4 年前
Dane Byrd	c6beedc4	Merge branch 'art-assets' into ground_shader	4 年前
uChema	0f397e96	Merge branch 'main' into QuestSystem	4 年前
Marc-Olivier	45cb9412	Add a Stop and Finish option for the AudioManager	4 年前
uChema	837d24dd	Fix Shared Tables (Localization) conflict.	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 年前
uChema	47ad6cc8	[Bot] Automated dotnet-format update	4 年前
GitHub	f29b25de	Added support to multiple overlapping interactions (#301) * Added support to multiple overlapping interactions * Changed Stack for LinkedList	4 年前
Yohann Puyhaubert	34a837d3	[Bot] Automated dotnet-format update	4 年前
GitHub	81481d8b	Merge pull request #4 from UnityTechnologies/main update my local branch	4 年前
Ciro Continisio	5a595e86	MenuItem orders and grouping cleaned All Create items in assets now appear at the top, and all tools are grouped under ChopChop menu item	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	4b1081d0	Merge branch 'AudioStop' of https://github.com/island212/open-project-1 into pr-bash	4 年前
Ciro Continisio	3f2b0d3c	Merge branch 'create-editorBase-for-custom-inspector' of https://github.com/rainaldisatria/open-project-1 into main # Conflicts: # UOP1_Project/Assets/Scripts/Editor/GameSceneSOEditor.cs	4 年前
Ciro Continisio	958e0ce5	[Bot] Automated dotnet-format update	4 年前
DeivSky	5d7ef302	Allow hot reloading of state machines	4 年前
GitHub	f91be74c	Fix input caching (#339) * StopMovement every update instead of on entering Idle State * Fix input caching A simple fix using coroutines to clear any cached input the frame after it was trigggered. * Added Action to clear input cache Reverted the changes to `Protagonist.cs` and `InteractionManager.cs` that were made to clear the input cached and instead put it all together in a single Action and added it to the Idle and Walking states. * [Bot] Automated dotnet-format update	4 年前
alex	2f536097	Merge remote-tracking branch 'upstream/main' into main	4 年前
DeivSky	6e0a7847	Removed the "Cache Result" option in StateConditionSOs The option was causing more confusion than anything, and wasn't being used at all. Every condition has it on since it's the default, so I've left the feature active all the time while removing the toggle as discussed [here](https://forum.unity.com/threads/input-cached-when-not-immediately-consumed-by-a-state.1022698/#post-6786170).	4 年前
alex	9fd881be	Fix Interaction System doesn't follow the FSM	4 年前
alex	eeb88b72	Fix Interaction System doesn't follow the FSM	4 年前
Ciro Continisio	38827f46	Merge remote-tracking branch '_tech-mkt/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 年前
alex	ae4f635e	Fix Fix Interaction System doesn't follow the FSM	4 年前
Yohann Puyhaubert	7418c9cd	[Bot] Automated dotnet-format update	4 年前
GitHub	762d050f	Merge pull request #6 from UnityTechnologies/main Updating my branch	4 年前
alex	90193b88	Revert "Fix Fix Interaction System doesn't follow the FSM" This reverts commit f3d92d727da6f8f6b6ca1dca867835bf45b35c79.	4 年前
Yohann Puyhaubert	a5261cf1	Combat System - Added player getting hit and killed states	4 年前
Smurjo	df03afb9	Merge branch 'main' of https://github.com/Smurjo/open-project-1 into main	4 年前
alex	b4dda4f6	Fix Interaction System doesn't follow the FSM	4 年前
Ciro Continisio	1690f35f	PigChef jump fixes, particles on jump liftoff	4 年前
Yohann Puyhaubert	ed7d963f	Added Player Cane Hit variant and enabling attack based on animation events	4 年前
alex	374a3a6b	Fix Interaction System doesn't follow the FSM	4 年前
Ciro Continisio	c0c06250	Merge branch 'minor-sm-changes' of https://github.com/DeivSky/open-project-1 into pr-bash	4 年前
Ciro Continisio	0d4b9d8a	Refactoring, moved items	4 年前
vjs22334	7b32be0f	fixed vcam lerp on loading new location	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 年前
vjs22334	7cbd38cc	added field for camera spawn distance from player	4 年前
Ciro Continisio	3d4ab5fa	Merge branch 'feature/combat-player-get-hit' of https://github.com/treivize/open-project-1 into pr-bash # Conflicts: # UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab # UOP1_Project/Assets/Prefabs/Characters/PlantCritter.prefab # UOP1_Project/Assets/Prefabs/Characters/SlimeCritter_Base.prefab	4 年前
vjs22334	53886896	Removed _spawnDistanceFromPlayer	4 年前
Ciro Continisio	7ea6bfdf	Merge branch 'feature/player-cane-hit-anim-variant' of https://github.com/treivize/open-project-1 into pr-bash # Conflicts: # UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab # UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AttackTrigger.asset # UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AttackTrigger.asset.meta # UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AttackTrigger_OnEnter.asset # UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AttackTrigger_OnEnter.asset.meta # UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsAttacking_False_OnEnter.asset # UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsAttacking_True_OnEnter.asset.meta	4 年前
Ciro Continisio	277b6fc2	Merge branch 'main' of https://github.com/vjs22334/open-project-1 into pr-bash	4 年前
Ciro Continisio	5ad8ad04	Cameramanager fix	4 年前
Ciro Continisio	28d4d3bb	Attack system overhaul	4 年前
Ciro Continisio	19c74b30	[Bot] Automated dotnet-format update	4 年前
Ciro Continisio	57258669	Merge branch 'main' into pr-bash	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 年前
Ciro Continisio	334de1f1	Part 1	4 年前
uChema	7f7c4818	Fix Merge	4 年前
Ciro Continisio	48f41150	Simplified GameSceneSO and SceneSelector	4 年前
uChema	dd1963d1	[Bot] Automated dotnet-format update	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 年前
Ciro Continisio	8a53579e	Refactor done Individual scene starting from the editor not functional	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 年前
GitHub	858dae7a	AudioManager UnregisterChannel fix (#367)	4 年前
Yohann Puyhaubert	bf1a236b	Added pathway NPC movement strategy	4 年前
Ciro Continisio	6acf65d7	Tweaked emission graph, added textures	4 年前
Ciro Continisio	d60ad152	Merge remote-tracking branch 'tech-mkt/main' into main	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 年前
GitHub	4df86a3d	Pathway Component (#371) * Pathway component * Pathway component * Pathway component * Pathway component * Pathway component * Pathway component * Update PathwayGizmo.cs * Update PathwayGizmo.cs * Update PathwayGizmo.cs * Update PathwayGizmo.cs * Update PathwayGizmo.cs * Update PathwayGizmo.cs * Pathway component * Pathway component * Pathway component * Pathway component * Update PathwayEditor.cs * Pathway component * Update PathwayEditor.cs * Pathway component * Update PathwayGismos.cs * Pathway component * Update PathwayEditor.cs * Update PathwayEditor.cs * Pathway component * Pathway component * Update PathwayEditor.cs * Update PathwayEditor.cs * Pathway component Not doing polls at this time. * Update PathwayGismos.cs * Update PathwayGismos.cs * Pathway component * Update PathwayEditor.cs * Update PathwayEditor.cs * Pathway component * Pathway component * Pathway comp...	4 年前
gheraibia	80ca65d4	[Bot] Automated dotnet-format update	4 年前
Ciro Continisio	ee3efeff	Prefab renaming and relocation	4 年前
Yohann Puyhaubert	068abd40	Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement	4 年前
GitHub	7ae9d134	Add feature to localization : Localize TMP font (#290) * Localize TMP font LocalizeTMProFontEvent.cs - Component to localize a TMP_FontAsset LocalizeComponent_TMProFont.cs - TextmeshProUGUI context menu "Localize String And Font" * Auto set up the Localize TMPro Font Event component	4 年前
Yohann Puyhaubert	22788ea0	Included pathway component to edit PathwayConfigSO	4 年前
BrettHuang	f726b402	[Bot] Automated dotnet-format update	4 年前
Yohann Puyhaubert	53f75de4	Added NavMesh probing before displaying the pathway edition over the scene	4 年前
Yohann Puyhaubert	273993ab	Made the handles pointing into the forward direction of the pathway	4 年前
Ciro Continisio	b53cf466	Fix to Editor scripts blocking the build process	4 年前
Bronson Zgeb	efec78c5	Merge branch 'save-system' of https://github.com/CybernetHacker14/open-project-1 into CybernetHacker14-save-system	4 年前
Yohann Puyhaubert	785fcec4	Cleaned up + Protect waypoint inputs from updated by NavMesh	4 年前
Bronson Zgeb	5d81bec6	Removed BinaryFormatter and Refactor. Removed the BinaryFormatter because it's unsafe to use, so we're currently serializing and deserializing to json. Refactored the code for simplicity and readability.	4 年前
Bronson Zgeb	81d376d9	Merge branch 'CybernetHacker14-save-system' into main	4 年前
Bronson Zgeb	da00990f	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	4 年前
Bronson Zgeb	dcb17d52	[Bot] Automated dotnet-format update	4 年前
Ciro Continisio	953afd39	Merge branch 'loading-refactor' into pr-bash # Conflicts: # UOP1_Project/Assets/Prefabs/GameplayEssentials/SceneLoader.prefab	4 年前
Bronson Zgeb	451b07c9	Basic structure for saving location to a file Added a Uuid type and drawer Removed saving TestScript Added a Database and Desc type to reference other SOs by UUID When it comes to serializing data (scenes and items for example) it's much simpler to be able to reference everything by a UUID and to be able to easily look them up in a table. Added a uuid to the LocationSOs and put them in a DB Converted SaveSystem into a SO. Removed test vars from Save.	4 年前
Ciro Continisio	ea9dfcea	Small fix to SceneLoader	4 年前
Bronson Zgeb	e4eb624c	[Bot] Automated dotnet-format update	4 年前
Ciro Continisio	955dfaa9	Relocated files	4 年前
Ciro Continisio	94a617c8	Reorganising SceneDataSOs	4 年前
Ciro Continisio	64453df9	Capitalisation fix part 1	4 年前
Ciro Continisio	52cb413e	Capitalisation fix part2	4 年前
Ciro Continisio	8fec9425	Loading tool refactor Scenes load in groups in the editor. It's now possible to start from an arbitrary scene but not move between scenes afterwards	4 年前
Ciro Continisio	dcf0b00e	Refactor part 3	4 年前
Ciro Continisio	7eee90e5	Loading refactor part 4	4 年前
Ciro Continisio	970e5671	Merge branch 'main' into pr-bash # Conflicts: # UOP1_Project/Assets/ScriptableObjects/SceneData/Locations/Beach.asset # UOP1_Project/Assets/ScriptableObjects/SceneData/Locations/Forest.asset # UOP1_Project/Assets/ScriptableObjects/SceneData/Locations/Glade.asset # UOP1_Project/Assets/Scripts/SceneManagement/ScriptableObjects/LocationSO.cs	4 年前
Ciro Continisio	47498b5c	[Bot] Automated dotnet-format update	4 年前
Bronson Zgeb	a45a7dd8	Added a SerializableScriptableObject to store asset GUID. This replaces the previous serialization code. We can use the cached asset GUID to serialize assets to disk as well as load them through the Addressables system.	4 年前
Bronson Zgeb	9b794d57	Added ItemStack Serialization on Save	4 年前
Bronson Zgeb	4d990a64	Refactored the SerializedSO	4 年前
Ciro Continisio	d7929a37	Tweaks to AudioSystem pt.1	4 年前
Bronson Zgeb	bd9a16aa	Added a Load function to StartGame. Can now load a previously saved game from disk.	4 年前
Bronson Zgeb	10bb976f	[Bot] Automated dotnet-format update	4 年前
Bronson Zgeb	5c50ddcf	Keep a backup of previous save. Added Continue from save to Menu.	4 年前
Bronson Zgeb	ef4402b6	[Bot] Automated dotnet-format update	4 年前
Bronson Zgeb	253267ff	Save Data when you add or remove an item	4 年前
GitHub	c20ffd23	Added slash effect when player is triggering an attack (#356) * Added slash effect when player is triggering an attack * Corrected after merge from main * renamed script to correct typing mistake Co-authored-by: Amel Negra <amel.negra@unity3d.com>	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 年前
Amel Negra	3d36b108	Merge remote-tracking branch 'HarshNarayanJha/so-quick-access-tool' into main	4 年前
Bronson Zgeb	9ab7d6e5	Fixed missing save file error	4 年前
Ciro Continisio	3a97f5f1	[Bot] Automated dotnet-format update	4 年前
Ciro Continisio	b36d8618	[Bot] Automated dotnet-format update	4 年前
Bronson Zgeb	80efbc3c	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	4 年前
Ciro Continisio	70978d9d	Audio changes	4 年前
Bronson Zgeb	b871dd8d	[Bot] Automated dotnet-format update	4 年前
Amel Negra	2e6b1d55	Merge remote-tracking branch 'origin/main' into main	4 年前
Ciro Continisio	07f4bf25	Music playing	4 年前
Amel Negra	71421f5d	[Bot] Automated dotnet-format update	4 年前
Ciro Continisio	2b80d7b3	Merge remote-tracking branch 'tech-mkt/main' into pr-bash	4 年前
Ciro Continisio	f6f1ad38	Fixes on the AudioManager, music in the Main Menu	4 年前
Ciro Continisio	2a8f9de4	[Bot] Automated dotnet-format update	4 年前
Ciro Continisio	d6a98c69	[Bot] Automated dotnet-format update	4 年前
GitHub	47599961	Pathway component with Idea (#373) * Pathway component with Idea * Pathway component deletion of error messages * Pathway component cleaning Pathway component * pathway interactive * Update PathwayGizmos.cs * cleaning * Pathway component update * Pathway component correction * Phatway update * Update PathWayNavMeshUI.cs * Update PathWayNavMeshUI.cs * Update PathWayNavMeshUI.cs * Rename variables add a tooltip * Rename variables Add hide pathway option * Update PathWayNavMeshUI.cs * rename add HasNavMeshAt * Correction DisplayHandles() incorrect use of EditorGUI.BeginChangeCheck (); * Update PathwayHandles.cs * correction HasNavMeshAt, I forgot the delete case Gismos just a rewrite * less calculus more data * cleaning * Update PathWayNavMeshUI.cs Correction * correction * update update in the path only the points moved by the handles * correction * small fixes	4 年前
gheraibia	005ee0b6	[Bot] Automated dotnet-format update	4 年前
Yohann Puyhaubert	460eb34c	Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement	4 年前
uChema	7321e9d0	UI Integration (WIP)	4 年前
Yohann Puyhaubert	6bee54e4	Update pathway config SO to work with the latest pathway editor changes	4 年前
uChema	c25b5aa7	[Bot] Automated dotnet-format update	4 年前
Yohann Puyhaubert	b7bb56dd	Fix attack logic to consume attack from animation events	4 年前
Yohann Puyhaubert	b1d0c051	Correction following Alexandre review	4 年前
uChema	ef0a847c	Merge branch 'Quests' of https://github.com/UnityTechnologies/open-project-1 into Quests	4 年前
GitHub	30b47152	Hide back the attack input Sorry, it was displayed on inspector for debug purpose only	4 年前
Yohann Puyhaubert	247585ac	Move out from Editor only section waypoints prop and WaypointData class	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	f025e662	[Bot] Automated dotnet-format update	4 年前
uChema	67d0116c	Merge branch 'Quests' of https://github.com/UnityTechnologies/open-project-1 into Quests	4 年前
Ciro Continisio	c109f0d3	[Bot] Automated dotnet-format update	4 年前
Ciro Continisio	db9b72e1	[Bot] Automated dotnet-format update	4 年前
uChema	1bae6f60	[Bot] Automated dotnet-format update	4 年前
Ciro Continisio	09ce5d71	Tweaks	4 年前
Ciro Continisio	16e743f5	Merge remote-tracking branch 'tech-mkt/main' into main	4 年前
Ciro Continisio	9d9d536f	[Bot] Automated dotnet-format update	4 年前
Amel Negra	67e5ce82	Merge remote-tracking branch 'treivize/feature/npc-pathway-movement' into main	4 年前
Amel Negra	5464088e	Merge branch 'feature/combat-update-consume-input' into main	4 年前
GitHub	c0b2931f	Merge pull request #1 from UnityTechnologies/main Update fork	4 年前
Brett	548ae699	Add QuestEditorWindow	4 年前
Brett	0f0b8928	Reduce nesting	4 年前
Brett	cbad06cd	Update T : ScriptableObject	4 年前
uChema	31d75482	Add controls. Switch Quest/Questline.cs names. And Button add Questline , quests, step	4 年前
Ciro Continisio	8e91ed4b	Acceleration/Deceleration for character	4 年前
uChema	e492f068	Clean project and add folder creation.	4 年前
Ciro Continisio	56af60b8	[Bot] Automated dotnet-format update	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 年前
uChema	586f9500	[Bot] Automated dotnet-format update	4 年前
uChema	a70ca312	Fix Quest Anchor SO	4 年前
Amel	7b1ed2b2	Merge branch 'main' into UI	4 年前
Ciro Continisio	7b4c1394	Relocated stray script	4 年前
uChema	09ec279d	Fix Input when closing Inventory	4 年前
Ciro Continisio	a1ce890c	Removed array of scenes from loading	4 年前
Ciro Continisio	962fff23	[Bot] Automated dotnet-format update	4 年前
uChema	3d8f54ca	Select with controller method	4 年前
Ciro Continisio	4dd87949	Merge remote-tracking branch 'tech-mkt/main'	4 年前
uChema	2a357495	Open/Close Inventory with Input system. No mouse needed	4 年前
uChema	2547aad0	[Bot] Automated dotnet-format update	4 年前
Ciro Continisio	0509be25	Refactored the whole cold startup mechanism	4 年前
uChema	b907e73b	Merge branch 'UI' of https://github.com/UnityTechnologies/open-project-1 into UI	4 年前
Ciro Continisio	eaa6623e	Enabled the cold editor startup for the MainMenu scene too	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	e4b71f99	Add controls	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	5d435a5e	Merge branch 'main' 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 年前
Amel	ce73c3ab	Merge remote-tracking branch 'origin/main' into main	4 年前
uChema	86db6931	Rename Quest Data to quest manager + Add Game Manager	4 年前
uChema	1ce9fe3b	Clean folders	4 年前
Amel Negra	df409c61	typo fix	4 年前
uChema	0db80293	Change disabled and Selected button graphics. Add reset UI when reloaded	4 年前
GitHub	73ce8d6d	I'm curious why the AO handle result is not used in this context? (#414)	4 年前
uChema	d1f0a9e1	Add healthbar logic	4 年前
GitHub	ea77fe9c	Fixed a simple typo in LoadingScreenManager (#417) In LoadingScreenManager.cs we subscribed to a listener in OnDisable instead of unsubscribing.	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 年前
uChema	4b0c5144	Merge branch 'main' into UI	4 年前
Amel	5bf93532	Townsfolk script to control when talking by default or not	4 年前
uChema	20cfec67	clean up folders	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 年前
Ciro Continisio	95e2789c	Tweaked protagonist attack Now moving very slowly while attacking	4 年前
Amel Negra	6dda5831	WIP talking condition for townsfolks	4 年前
uChema	e76a2bb9	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	4 年前
Ciro Continisio	fd6a9ce0	Cleanup Added DOTween license, relocated Resources folder	4 年前
GitHub	d8811c5e	Improve SOsQuickAccessToolWindow and rename to ScriptableObjectBrowser. (#387) * Improve SOsQuickAccessToolWindow and rename to ScriptableObjectBrowser. * Change button styles to have left text alignment for better readability. * Implement alphabetize type sorting. * Replace unnecessary TryGetValue() with ContainsKey(). * Add custom GUIStyle and double click to ping function.	4 年前
Amel Negra	e0ede3d5	Merge branch 'main' into AmelMain	4 年前
Amel Negra	cef038ad	Now townsfolk possible to idle, walk, talk and choose behavior from MB	4 年前
uChema	3ce06cf5	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	4 年前
GitHub	0e084a6f	[Bugfix] New condition prevents Critter from attacking when dialogue on (#420) * New condition prevents Critter from attacking when dialogue on * Remove test temp clutter * Undo changes to testing ground	4 年前
uChema	6ddc6d14	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 年前
uChema	78eac924	Pause Screen	4 年前
Amel Negra	837dcf96	removed state machine added twice on prefab	4 年前
uChema	7828a4fe	Asset folder Clean up	4 年前
uChema	f77ecadd	Pause game when Pause	4 年前
itsLevi0sa	5a4b5e30	[Bot] Automated dotnet-format update	4 年前
Amel Negra	bd7b83fa	Made Initial state an enum	4 年前
uChema	c3699920	Fix Subscribe/unsubscribe issue in UI. Implement Pause Menu with all its functions	4 年前
Amel Negra	1bdfb7ff	Added townsfolk walking condition	4 年前
Amel Negra	a186115b	Added IsInDialogue to step controller	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 年前
Ciro Continisio	3b82d4e6	Editor cold startup tweaks It now works even if the SceneDataSO is not referenced	4 年前
Amel Negra	b2351dfa	renamed InitialState variable	4 年前
Ciro Continisio	e4d15d8c	Relocated whiteboxing scenes and folders	4 年前
Amel Negra	13e2f4ef	renamed initial state to state	4 年前
GitHub	2fdc4efa	Update GameStateSO.cs (#438) Fixed issue causing StackOverflowException when starting a dialogue.	4 年前
Amel Negra	d516a82f	Debugging agent issue not finding path	4 年前
Amel Negra	3dad5079	Townsfolk to stop talking when protagonist talks to others in conversation	4 年前
Amel Negra	e446a5a7	edited townsfolk script to move methods to step controller	4 年前
Amel Negra	507e39d5	Now townsfolk stop talking when one of them interact with chef	4 年前
Amel Negra	47a6b132	typo fix	4 年前
Amel Negra	8257591d	Store rotation before facing protagonist to use it after dialogue	4 年前
Amel Negra	b4c11041	Added is NPC saying line condition	4 年前
Amel Negra	3a9decf3	comment debug lines and push scene	4 年前
Amel Negra	017d02f4	Renamed all files to fit general NPC use instead of townsfolk	4 年前
Amel	148e0a62	Checking if the talking to array is not empty before going through it	4 年前
Amel	4717e2f5	wip	4 年前
Amel Negra	3f4c581e	Added is path ready condition	4 年前
Amel Negra	e3126f25	Setting the right initial value for the way point index + added comments/renaming for clarity	4 年前
Amel Negra	1ce4260d	Fixed issue with reaching the waypoint	4 年前
Amel Negra	b3067c77	Fixed issue of all townsfolk listening to protagonist	4 年前
Amel Negra	cae701a3	Add states of Bard Hare and Fry King to the NPC script	4 年前
Amel	320a8038	Adding jump up and down states for bard hare with their conditions and transitions	4 年前
Amel	03aa1941	wip fixing townsfolk state machine on talk and listen	4 年前
Amel	58d7262d	wip v2 townsfolk	4 年前
Amel	e5e6a42e	Townsfolk state machine V1	4 年前
Amel Negra	c95b063c	waypoint index initial value	4 年前
Amel Negra	2ab8f62c	removed unneeded states from NPC script	4 年前
Amel Negra	ce10fdea	Bard hare state machine working	4 年前
Amel Negra	8151f1b5	Merge remote-tracking branch 'origin/main' into AmelMain	4 年前
Amel Negra	319c24e9	Merge remote-tracking branch 'origin/main' into AmelMain	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 年前
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	74ff185e	renamed slime critter attack controller to more general to reuse for rock	4 年前
Amel Negra	d77d34d4	Now we have 2 face protagonist actions specific to NPC and critters	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 年前
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 年前
Ciro Continisio	42b7725e	Connected almost all scenes Missing TownMarket and TownUpper	4 年前
Amel Negra	75e90368	Adding new condition script for when a new line is displayed	4 年前
Amel Negra	eafd1d40	Adding Random time elapsed condition	4 年前
uChema	75076141	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	4 年前
uChema	9e6b5587	Remove unused Events	4 年前
Amel Negra	176eb353	removing eat state from NPC since it will be used only in cut-scenes and not gameplay	4 年前
uChema	e132a119	Add a StepToDialogue function to the StepSO. Fix preview display in the Quest tool	4 年前
Ciro Continisio	e6dcfc27	Merge branch 'main' into whiteboxing	4 年前
uChema	f934ef08	Fix last commit	4 年前
uChema	10a19c7c	Move USS file to correct folder	4 年前
Amel Negra	65d30a33	Merge remote-tracking branch 'origin/main' into AmelMain	4 年前
Amel Negra	d464d645	Added dialogue shot to step controller script	4 年前
Amel Negra	36cba268	Fixed Fry King dialogue typo	4 年前
Amel Negra	4ac06b52	Merge remote-tracking branch 'origin/main' into AmelMain	4 年前
Amel Negra	fe1f23a8	Merge branch 'main' into AmelMain	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 年前
uChema	50525348	Fix Quest Tool : Add Remove buttons and AddDialogue Buttons	4 年前
Amel	9a3e73a6	Added reset health SO action	4 年前
Amel	73a43775	Critters state machines adjustments	4 年前
uChema	ad0bf614	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	4 年前
Ciro Continisio	6bf9cfe1	Merge remote-tracking branch 'tech-mkt/main'	4 年前
Ciro Continisio	47ed0d6a	Merge branch 'main' into worldbuilding	4 年前
uChema	8b7ce38c	Create questlines	4 年前
grimstoner	fa26a41e	Fixed bug #440 Moved the code that instantiates the _instantiatedImages to the SetPagination method.	4 年前
uChema	5c004cab	Fix previous changes	4 年前
Amel Negra	3bb6625f	Created SFX SO for all critters	4 年前
Amel Negra	b61e19c7	Creating a parent class for all character audio	4 年前
uChema	20147309	Adding quests to the questmanager Scriptable object	4 年前
Amel Negra	f92d1b8a	removing audio config and channel from protagonist class	4 年前
Amel	cc169e61	Merge remote-tracking branch 'origin/main' into main	4 年前
uChema	93848ca8	Merge branch 'pr/441' into main	4 年前
Amel	6d56e31b	Merge branch 'main' into mainAmel	4 年前
Amel Negra	7654f9e8	Merge remote-tracking branch 'amel-unity/main' into main	4 年前
uChema	d0523373	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	4 年前
uChema	662910d3	Hotfix - Add wrap to Editor only code	4 年前
Amel	f3fbfe61	temporary solution for Audio Cue script to start 1 sec delayed	4 年前
Amel	8f750556	Added getting hit and faint sounds for protagonist	4 年前
Amel	226ea216	Merge remote-tracking branch 'origin/main' into mainAmel	4 年前
Amel	9c232940	Audio configs tweaking	4 年前
Amel	a0b65245	Dialogue shot tweaking	4 年前
Ciro Continisio	bbf35a4d	SFX tweaks Volume adjustments, moved Audio listener to Protagonist	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 年前
Ciro Continisio	38af1d45	PigChef tweaks Added jump and land sfx Jump animation now broken in 3 states (liftoff, in air, land) Added extra late transition between cane swings, so the character is never waiting idle too long when the attack button is pressed	4 年前
uChema	37e5adb2	Fix Quests SO	4 年前
uChema	eab4c107	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	4 年前
GitHub	efc7518c	Fix fade-in volume. When fade in, volume is restored to 1 not the volume of the setting. (#425) Set the end value of DOFade to the value of the setting Co-authored-by: Lee Hun <ceo.lhsg@gmail.com>	4 年前
uChema	283617f7	Creating Win/Lose quests and how to handle - Saving quests WIP	4 年前
uChema	d3f9b548	Added save Questline status	4 年前
Ciro Continisio	34861adb	Location entrance camera We can now configure a custom camera shot for each location entrance	4 年前
Ciro Continisio	709521fa	Merge branch 'main' into worldbuilding	4 年前
uChema	d36df8f3	Adding save to disk on questline update	4 年前
uChema	71dcdcfd	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	4 年前
uChema	62ba1135	Remove test debugging	4 年前
Ciro Continisio	1b98a3e3	Merge branch 'main' of github.com:UnityTechnologies/open-project-1	4 年前
GitHub	14e99162	Fix null reference in state machine editor (#451)	4 年前
GitHub	9fd51f47	Add camera shake on protagonist hit. (#454) * Add camera shake on protagonist hit. * add cam shake on critters hit	4 年前
Ciro Continisio	5df561c9	Fix to camera shake bug Removed lambda expression Added unregister from the event Removed unnecessary null checks	4 年前
GitHub	d5fb01f9	Add lightmap scale setter tool (#452) * Add component with settable field, clamped to [0,1] range * Get all MeshRenderers in component & children (recursively) * Modfiy lightmap scale of all MeshRenderers * Cleanup/comments * Move tool to Scripts/EditorTools * Update LightmapScaleSetter.cs Removed the cap at 1f Co-authored-by: Ciro Continisio <ciro@unity3d.com>	4 年前
GitHub	654a5507	Stop audio cue when associated Component is destroyed (#455)	4 年前
Ciro Continisio	b91c8160	Merge remote-tracking branch 'tech-mkt/main'	4 年前
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 年前
Wiecio	13e36ce1	Added bool parameter to LoadEventChannelSO Now you can specify if you want to fade screen during loading	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	3 年前
Ciro Continisio	c5d56d4c	Fixed bug when player landed in multiple LocationExits at once	3 年前
Ciro Continisio	cc99c71a	Added 3D to main menu (temp)	3 年前
Ciro Continisio	942b0f59	Fix to LightmapScale tool Corrected the LightmapScale script so that the editor-only .scaleInLightmap is used only in the editor.	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 年前
uChema	fd58c9ac	Add new item icons	3 年前
uChema	2415469c	Change SO's menu asset order. Add End of dialogue event to event Data.	3 年前
Ciro Continisio	78fb378d	Relocated listener script	3 年前
GitHub	e8854e92	fix: add null check (#467)	3 年前
Ciro Continisio	b85ea8e1	Merge remote-tracking branch 'tech-mkt/main'	3 年前
uChema	e022f2ee	Rework on questline naming	3 年前
Ciro Continisio	36d16456	File cleanup and relocation	3 年前
GitHub	a98c8e7f	Fixed jump attack particle bug (#464) Like mentioned in the thread, the bug is caused because the state machine goes Ascending->Descending->DescendingAttacking where Descending calls the particles when exiting. I fixed this simply by adding a ground check on the LandParticles action.	3 年前
GitHub	0d96fe7f	Implement pause menu music (#463)	3 年前
Amel Negra	94be6353	Fixing dialogue error on cutscene end	3 年前
Amel Negra	42ba5e06	Merge remote-tracking branch 'origin/main' into AmelMain	3 年前
Amel Negra	632f55f9	Hide the Dialogue UI when we advance in cutscene dialogue now works	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	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	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	256684a1	First frame error check	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	97ccda6a	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	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 年前
uChema	9f463dfd	Hot Fix : Cooking mode inventory is maintained after action (Cook, change tab, select other items)	3 年前
itsLevi0sa	72ec616e	[Bot] Automated dotnet-format update	3 年前
Ciro Continisio	460fb941	Merge branch 'CaveWhiteboxing' of https://github.com/itsLevi0sa/open-project-1 into worldbuilding	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	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 年前
Amel Negra	9dc93db3	Pushing TimelineBinder script now works with multiple objects if needed	3 年前
Amel Negra	bc3c5fd1	Merge remote-tracking branch 'origin/main' into main	3 年前
uChema	9936dca6	Refactoring Dialogue System	3 年前
Amel Negra	d9d8d631	Adding talk sfx events to pig chef talk clips	3 年前
uChema	02a13eae	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	3 年前
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 年前
uChema	fab03691	Merge branch 'pr/396' into main . Fix Player Inventory/ Testing inventory data.	3 年前
fqureshi	7c507f4a	Create save file on editor cold startup if needed	4 年前
João Ricardo dos Santos	c11d51a0	fix: checking if the old save file exists when we open the game in a different scene in the first time (when we don't start the game in the Initialization scene), the error is raised.	4 年前
fqureshi	68cafc40	[Bot] Automated dotnet-format update	4 年前
itsLevi0sa	aa9e8032	Merge branch 'CaveWhiteboxing' of https://github.com/itsLevi0sa/open-project-1 into CaveWhiteboxing	3 年前
uChema	7ba7a559	Merge branch 'pr/396' into main	3 年前
itsLevi0sa	340dd8dc	Merge branch 'main' into CaveWhiteboxing	3 年前
uChema	84ae59c8	Fix Push	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 年前
itsLevi0sa	0425b39f	[Bot] Automated dotnet-format update	3 年前
Ciro Continisio	1aeed5db	Water mill	3 年前
Ciro Continisio	2d712a99	Merge branch 'main' into worldbuilding # Conflicts: # UOP1_Project/Assets/Scenes/Locations/Beach.unity	3 年前
Amel Negra	a676cd5d	Merge remote-tracking branch 'origin/main' into main	3 年前
uChema	59488a5c	Merge branch 'pr/400' into main	3 年前
Amel Negra	7764a8fd	Merge remote-tracking branch 'origin/main' into main	3 年前
Ciro Continisio	1d3f0c8a	Added FallCatcher script for water areas	3 年前
uChema	b1c2f634	Integrating Cutscenes and Questlines in final scenes	3 年前
Amel Negra	e9f4e34e	Merge remote-tracking branch 'origin/main' into main	3 年前
Amel	38195933	Disable audio sfx events on animation during cutscenes	3 年前
Ciro Continisio	db88cbec	Fixed fast camera rotation issue	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	b472d7a2	Adding load scene signal to load a location from timeline	3 年前
Amel	11ccdf9f	Create method on NPC script to change state to walk (For lose cutscene wip)	3 年前
Amel Negra	f4233540	Signals and script folder organization	3 年前
Amel Negra	599c6af5	Make NPC wait for a random time before walking away in cutscene	3 年前
uChema	3faf99a1	Use the state machine to change Game State to and from Combat	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 年前
Greg Solo	73b4e5d8	Set game to combat state when critter detects player	4 年前
uChema	1d6b8128	Use Game States In State Machine	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 年前
Ayhan Sakarya	3129dcbe	Removed the name field from the GraphicsPreset scriptable object and added a qualityLevel enumerator instead which can be cast to the name as well and is easier to use in the inspector	4 年前
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 年前
uChema	0e1137be	Adding Icons + New Interaction system	3 年前
uChema	f29c7129	Add Icons placeholders - Set Game Scene UI - Add Aggro System	3 年前
uChema	0b5714a0	Switch File position for Merge	3 年前
uChema	92cb047d	Merge remote-tracking branch 'upstream/main' into main	3 年前
uChema	f7c5fc57	Switch file to correct folder	3 年前
uChema	52671b6b	Fix Display	3 年前
uChema	8a36c2bf	Fix UI Rescaling. Test The whole game. WIP Interaction after cutscene	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 年前
Amel	bad6196e	Fixed talk interaction enabled forever after cutscenes	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 年前
Amel	6520caab	Separated Timeline scene loading from the LocationExit script	3 年前
Amel	cb4d2d6e	E interaction disabled during cutscenes	3 年前
Ciro Continisio	7fdb5bae	Merge branch 'main' into UI-icons	3 年前
GitHub	14e342ab	Update summary of ChangeGameStateActionSO.cs (#496)	3 年前
GitHub	2727c6c2	Fix typo in SceneLoader.cs (#495)	3 年前
Ciro Continisio	53bc6c38	Refactored code to remove some warnings	3 年前
Ciro Continisio	30e472a6	Work on night scene	3 年前
Ciro Continisio	27ebfa55	Code formatting and tweaks	3 年前
Ciro Continisio	313f8a7f	Code cleanup, refactored Anchors to be generic	3 年前
Ciro Continisio	202b38ba	More code refactoring around Anchors	3 年前
Ciro Continisio	c284ce4c	Reorganised editor tools, added ReadOnly attribute	3 年前
Ciro Continisio	e0bf1a99	More code cleanup and bug fixes Renamed tools Hidden Quest tool Added debug visualisation to some ScriptableObjects using ReadOnly attribute	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	8bfcef97	StateAction and StateMachine improvements Added a description to StateMachine's StateAction SOs State Machine editor now displays descriptions for StateActions Reorganised Protagonist's StateActions into folders	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 年前
Ciro Continisio	2a223039	Fixed bugs Addressable issues (stray loc tables), and a bug on the UI (inventory menu not updating a button prompt)	3 年前