77678f6f
Character controller, scene setup
4 年前
08043a2c
3D Playground
4 年前
d0592a4f
Moved around some stuff
4 年前
ee2cec18
Camera rotation, Movement tweaks
Movement now is independent of camera rotation
4 年前
1eef189c
My take on a simple Player Spawn System
4 年前
dab4333d
InputReader made into ScriptableObject asset
4 年前
ed34ab11
Added new obstacle material for lvl2 and tagged Player
4 年前
4aaa3b36
Spawn system in place
4 年前
9c27ba24
Merge pull request #27 from andrew-raphael-lukasik/InputReader_as_ScriptableObject
InputReader made into ScriptableObject asset
4 年前
b194fe99
Merge branch 'master' into Wodopo/spawn-system
# Conflicts:
# UOP1_Project/Assets/Scenes/CharController.unity
# UOP1_Project/Assets/Scripts/CameraManager.cs
4 年前
afc7b64e
Merge pull request #25 from Wodopo/master
Simple Player Spawn System
4 年前
83f426f0
Merge remote-tracking branch 'upstream/master'
4 年前
e27f318b
Merge branch 'master' into custom-lighting-shader
# Conflicts:
# UOP1_Project/Packages/manifest.json
# UOP1_Project/ProjectSettings/ProjectVersion.txt
4 年前
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 年前
6d1b63ae
Reorganising assets
4 年前
a06f9b30
Sample scene
Prefab creation, fixed rotation issue
4 年前
43ebc212
Art reorganisation and cleanup
4 年前
32a19461
Removed serializable actions/conditions. Added current state name in state machine component. Added more spheres to test scene.
4 年前
79a79de9
Imported Townsfolk, Pig Chick
More assets in the environment test scene
4 年前
fb97255e
Moved art assets
4 年前
1e91c076
Added Flower, fixed Signpost, Rubble sizing
4 年前
9df0bbc8
Lowerpoly Townsfolk, imported Sitar
4 年前
2cb26091
Tweaks and comments
Removed StateMachines scene, fixed a small bug on Sliding when spawning in the air and trying to move
4 年前
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 年前
e87c5fdd
Model fixes
Fixed rotation of Walking Cane and Lantern, applied property to StoneCritter Prefab
4 年前
851efcad
Merge remote-tracking branch 'origin/main' into Scene-Loading
4 年前
f76bc5ce
Imported Townsfolk_F, Animations
4 年前
e1f2b62c
Imported rigged RockCritter, renaming
4 年前
dde7dc4c
Beach whitebox ( #145 )
* beach whitebox 1 optimized
originally by @itsLevi0sa (on forums), optimized by @jamercer
* Swapped the missing tree prefab
* beach trees
owch.
* Tree Collider Mesh Assigned
you cannot walk through trees now!
* Trees are now prefabs
Co-authored-by: Unknown <amel.negra@unity3d.com>
4 年前
057b78d2
Torch, PotOverFire
4 年前
af2ab922
Merge branch 'Scene-Loading' into main
4 年前
32d860af
Added fire shader and campfire ( #172 )
* Added fire shader and campfire
* Tweaked campfire light position
Co-authored-by: Ciro Continisio <ciro@unity3d.com>
4 年前
a72a0657
Now possible to start the game from any scene
4 年前
870c4244
created player inventory and first ingredient which can be collected
4 年前
73bc9c3c
Referenced initialization game scene SO in the initializer prefab
4 年前
c3bf387e
Cleanup, Reorganisation of folders and Scenes
4 年前
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 年前
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 年前
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 年前
8dfcd3e8
Merge remote-tracking branch 'upstream/main' into main
4 年前
cdbf1207
Merge branch 'circa94/master' into circa94/inventory-system
4 年前
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 年前
03ff96ac
New test scenes
Big testing scene with Polybrush terrain, small test scene with just primitives
4 年前
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 年前
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 年前
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 年前
0ceeafd9
Refreshed Forest and Beach scenes
4 年前
ad56cb20
Merge remote-tracking branch 'upstream/main' into main
4 年前
c28c6bc6
New Pig and RockCritter animations
4 年前
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 年前
8504c55f
PigChef plays idle and walk animations
Created action to set a bool parameter on the state machine
4 年前
38b89476
Added PostProcessing support
4 年前
1ee5259e
Merge branch 'main' into big-merge
4 年前
2db1442c
docs
4 年前
2c91dabf
Merge branch 'art-assets' into big-merge
# Conflicts:
# UOP1_Project/Assets/Prefabs/Props/PotOverFire.prefab
4 年前
e8f4a6e7
Imported BardHare
4 年前
cd7fea82
Tweaks, cleaning
4 年前
e155c0a6
Added camera dummy, fixed issue with player Prefab tag
4 年前
ecf3b2ef
Art updates
Imported chest, fixed Phoenix Chick, fixed BardHare
4 年前
781633e3
Merge remote-tracking branch 'upstream/main' into main
4 年前
572e0cdd
Added Transparent support on ToonShading and Glass Shader for the lantern
4 年前
7705382e
Merge branch 'main' into state-machine-improvements
# Conflicts:
# UOP1_Project/Assets/Prefabs/Pig.prefab
4 年前
c4dabcbe
merge
4 年前
7aa245f6
found fix for todo #2
4 年前
e193a308
Fixed Lantern prefab
4 年前
280989a8
was able to fix edge case #1
4 年前
26747ac5
Merge branch 'treivize/feature/art/transparent_support' into art-assets
4 年前
e5e7acc6
Merge branch 'art-assets' into main
4 年前
b06aad3e
updates
4 年前
bbca6fd1
Imported rigged Phoenix Chick + 2 animations
4 年前
f6474b49
undid prefab change
4 年前
e2449c18
[WIP] Plant Critter - Model UV Color Rig Animations
4 年前
ededb7c0
Merge branch 'state-machine-improvements' into main
4 年前
245438bb
Fixed Fresnel effect done before outline and add water like movement
4 年前
612432c6
Added Slime Critters variants and final Toon_Fresnel Shader
4 年前
b5ba51b4
Added meshed eyes with animation for them
4 年前
d21bf195
Fix prefabs and FBX import
4 年前
253b73a3
Merge remote-tracking branch 'upstream/main' into main
4 年前
896fc63a
Removed eyes from Plant Critter and set up a proper animator
4 年前
7b04a609
Merge branch 'main' into simple-menu-controls
4 年前
d14b0e45
Cleanup
4 年前
e9e05bd8
Updated Alert animation and clean up branch
4 年前
7be88cca
Removed script Character, moved StateMachine SOs
4 年前
464fd3cf
Merge branch 'pr/130' into Inventory
4 年前
46aadc33
removed action asset reference in event system on prefab
4 年前
3aaa37cc
Add UI system, Inventory UI and update Inventory System
4 年前
3db2e782
Added the ability to talk
4 年前
a0293eb3
Merge remote-tracking branch 'upstream/main' into branching-feature-in-dialogue-system
4 年前
7354551c
Preselect default button
4 年前
12f2649c
Talk animation re-implemented
4 年前
3e2ad7f2
Integrated dust particles
4 年前
b02de935
Changed Pottery game object collider to box
4 年前
5fcc526a
Merge branch 'use-box-collider-for-pottery-objects' of https://github.com/mtakac/open-project-1 into main
4 年前
6804ad52
Boat, Fry king, Lantern fixes
4 年前
11c7a35b
Pig chef fixed animations
4 年前
99c4ccb4
Audio functionality
4 年前
09492dfa
Merge branch 'main' into pr-bashing
4 年前
21cfe483
Art showcase tweaks
4 年前
549a8569
+ added 4 new wildflowers (meshes, Material, texture and prefabs)
4 年前
dd7ca1cc
+ added more wildflowers
+ added vertex painting for correction wind
+ added mask map for Andy's shader variants
4 年前
0728a4c6
Merge branch 'art-assets' into feature/art/pant_critter
4 年前
14e737cc
Merge pull request #1 from UnityTechnologies/art-assets
Art assets
4 年前
8c8cc61d
Fixed boat hierarchy
4 年前
955d7516
Nature Assets Fix V1.2
- Changes in the Textures, Topology and pivots
-Different types of plants and one big house.
4 年前
5a311bc8
Updated the outline value to 2 as recommended in the Art Guidelines and created a prefab
4 年前
a05af5c2
Merge branch 'main' into art-assets
4 年前
e09986b8
Merge branch 'main' into fix/object-pool
4 年前
47c639cb
Create silhouette pass
Added some URP render features to silhouette characters when they're behind static scenery
4 年前
b9257924
TownAssets
More enviroment 3D assets.
-Small house in the same style.
-Empty market stands
-Small market items for decoration
-A door.
4 年前
09419cf4
Tweaks, dither shader
4 年前
71b3bcca
Merge branch 'art-assets' of https://github.com/Llaczky/open-project-1 into art-assets
4 年前
a0ac9ece
Imported and tweaked extra vegetation
4 年前
b414fbe0
Merge branch 'art-assets' into main
4 年前
36980642
Merge branch 'HammerTool' of https://github.com/erizzoalbuquerque/open-project-1 into art-assets
4 年前
c1c36a96
Imported hammer
4 年前
821a306a
Imported accessories
4 年前
ab1e315f
Merge branch 'art-assets' of https://github.com/JamieNooten/open-project-1 into art-assets
4 年前
291ae413
New flowers, fixes
Switched many small assets to bake with light probes instead of lightmaps
4 年前
1d26bec4
Merge branch 'main' into state-machine-improvements
4 年前
df2ab2a2
Merge branch 'art-assets' into feature/art/slime_critter
4 年前
8845aa98
Merge branch 'main' into HollowBoatEffect
# Conflicts:
# UOP1_Project/Assets/Settings/Graphics/ToonRendererData.asset
# UOP1_Project/ProjectSettings/TagManager.asset
4 年前
420aec35
Imported new rocks, asset fixes
Tweaked size of some trees
4 年前
d9dd5e5e
Tweaked RenderFeatures
4 年前
ce50c2eb
Merge branch 'art-assets' of github.com:UnityTechnologies/open-project-1 into art-assets
4 年前
87226439
Put the big rocks on the OccludingObjects layer
4 年前
ded7ec7c
Merge branch 'feature/art/pant_critter' of https://github.com/treivize/open-project-1 into pr-bash
4 年前
163fb9ae
Merge branch 'feature/art/slime_critter' of https://github.com/treivize/open-project-1 into pr-bash
4 年前
0661be42
Re-preffabbed the slimes
4 年前
1413811f
Material properties
4 年前
bd14256e
Material and prefab tweaks
4 年前
5a9a452f
Fix Plant Critter mesh scaling and name ( #239 )
4 年前
101906b4
Townsfolk_M animations, Palm2
4 年前
bd72e4e6
Merge remote-tracking branch 'UnityTechnologies/art-assets' into art-assets
4 年前
f588e37a
New tree type
4 年前
7559c2e4
[WIP] Added some table furniture ( #233 )
* Added some table furnitures
* Corrected all furniture prefabs to be prefab variant
4 年前
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 年前
4687dbf1
Added interaction to main character prefab
4 年前
1f2315aa
Added Rigidbody component to the Interaction GO on the pig
4 年前
3def478b
Imported Smurjo's models, reorganised folders
4 年前
11189097
Merge remote-tracking branch '_tech-mkt/art-assets' into art-assets
4 年前
03b337f2
Updated prefabs
4 年前
8da148bf
Introduced RuntimeAnchors
Used in Spawn and CameraSystem for decoupling purposes
4 年前
efd5063f
Imported latest town assets
4 年前
9918fbce
Interaction go on the pig is now a prefab
4 年前
74658126
Added Frying Pan asset ( #252 )
* Added Frying pan assets
* Changed material smothness
4 年前
8c61e1d3
Updated furnishing texture and colliders on furniture ( #251 )
4 年前
582ea351
Added interaction events and updated interaction manager
4 年前
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 年前
5c82e99e
Merge pull request #2 from UnityTechnologies/main
import changes from main
4 年前
b5c513e4
Small tweaks
4 年前
443b4a6c
New FryKing animations and prefab
4 年前
648aa035
First setup
4 年前
90998767
Merge remote-tracking branch 'origin/Inventory' into interaction
4 年前
8d423ac9
post merge fixes
4 年前
de0da3ef
ChefHat accessory
4 年前
e7b2e446
New art assets
4 年前
8871d820
Changed Events to Event Channels
4 年前
770c4301
setup IK for the pig on the arms
4 年前
268ab82e
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
5418926e
added null check before event raise on interaction
4 年前
7438112a
Reworked the CM camera, added collider, noise
4 年前
2051a72a
Adding interaction UI + Events
4 年前
2c9810c9
Merge branch 'main' into interaction
4 年前
8a166bf0
Merge branch 'interaction' of https://github.com/UnityTechnologies/open-project-1 into interaction
4 年前
76c0c04b
Fix last commit
4 年前
1cd68b6d
Add an on Interaction Ended Event raise
4 年前
ceeb6c1e
Added collider on bard hare prefab
4 年前
6434aa7b
Renaming and cleaning folders
4 年前
564a406f
Added new interaction scene example
4 年前
bbcf3752
Add control over cooking when near pot
4 年前
96e4f244
Merge remote-tracking branch 'origin/interaction' into interaction
4 年前
370a7993
Merge remote-tracking branch 'origin/main' into interaction
4 年前
9bae4220
Merge remote-tracking branch 'origin/interaction' into main
4 年前
77242d26
Merge branch 'main' of github.com:UnityTechnologies/open-project-1 into main
# Conflicts:
# UOP1_Project/Assets/Scenes/TestingGround.unity
4 年前
716120b4
Bushes, new Fern plant
4 年前
fed9be4d
Reintroduced camera noise
4 年前
cd138aa3
Imported lobster, palm leaf set, tavern owner's hair
4 年前
86b055e0
Merge remote-tracking branch 'amel-unity/main' into pr-bash
4 年前
2149cc50
AnimationRigging setup, lantern grab clip
4 年前
26d5b059
Added the ability to run for keyboard players
4 年前
f96d9f1e
Input and Camera tweaking
4 年前
f6be0d86
Input and Camera tweaking
4 年前
7ce66d74
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
a3fdb227
Merge branch 'main' into whiteboxing
4 年前
3476d6ab
Added new Accessory: Unibrow
Unibrow is a new accessory, similiar in style to the moustache, intended to use the same textures.
4 年前
9946260e
Add anims for slimecritter, create animcontroller, update its prefab with latest rig
4 年前
786fb321
Fixed colliders on the trees
Added child GO to the trees named "leaves", added colliders to the leaves and set layer of leaves to "TreeLeaves" (So, also added this new layer. Set in physics properties to not collide with anything). In CameraSystem/FreeLook_VCam in "Cinemachine collider" added "TreeLeaves" layer in the field "Collide Against".
4 年前
d80af9c6
Imported new art
Fern2, Shell2 and Shell3, new faint animation
4 年前
e5c1ed4b
Initial Plant Critter behaviour - Idle - Alert - Attack
4 年前
e1f4210f
A Wooden Bench to Sit and eat
4 年前
6294ecab
Merge branch 'art-assets' into pr-bash
4 年前
93934dc5
recreate SlimeCritter_Base prefab with the right SlimeCritter_Rig fbx
4 年前
2bf575bd
Tweak Landing Particle effects
4 年前
a4dc96e7
Initial Plant Critter combat system - Get Hit - Killed
4 年前
038d588e
Oven from DanTen66
Here is the Oven that I have been working on with Albedo, Material and a Prefab Variant. I am including the .meta files just in case.
You mentioned not to adjust the material shader, though this one has an outline and from what I understand the buildings and enviroment are not supposed to.
4 年前
48a39328
Merge remote-tracking branch 'davidhenshaw/main' into pr-bash
4 年前
5efb9eed
Tweaks to landing particles
4 年前
c852ab5b
Update Cutscenes to use Event Channels
4 年前
c128feff
Fix Dialogue branching and add UI
4 年前
d0298f3d
Merge pull request #3 from UnityTechnologies/art-assets
Art assets
4 年前
0f81c55a
Merge branch 'simple-menu-controls' into pr-bash
# Conflicts:
# UOP1_Project/Assets/Scenes/TestingGround.unity
# UOP1_Project/Assets/Scripts/Input/GameInput.cs
4 年前
a16fe655
Dialogue And Quest Managers + Refractoring some scripts
4 年前
748ff00f
Add a quest, and test; WIP
4 年前
50b64a9a
added ginger, applied transform at Blender fbx export for almonds, artichokes, cucumber and lemons
added ginger
applied transform at Blender fbx export for almonds, artichokes, cucumber and lemons
moved prefabs to prefab folder "food"
4 年前
edca0f63
Rename Task to Step
4 年前
0c706b8e
applied transform at Blender fbx export for oranges, onions, truffles and vanilla
applied transform at Blender fbx export for oranges, onions, truffles and vanilla
moved prefabs to prefab folder
4 年前
b2cf2c5b
Refractoring
4 年前
06438a1a
Pulled from upstream/main
4 年前
c444c501
Merge remote-tracking branch 'origin/main' into scenes-re-architecture
4 年前
10477f56
Added maize
It's the same texture for all, 1024x1024.
Triangles:
- maize cob 640
- single grain 88
- maize in box 1630
4 年前
37b819b9
Revisioned The Bench
4 年前
61e85048
Added mangetout
2 slightly different versions plus one with the ends cut off
The texture is 1024x1024.
Triangles:
mangetout pod (2 versions) 380 and 290
mangetout cooked 134
mangetout in box 2885
4 年前
90fe71a7
critter eggs, critter seeds and chicolade
Fantasy food ingredients obtained from critters.
4 年前
9d05162d
Merge branch 'main' of https://github.com/Hey-Mikelangelo/open-project-1 into pr-bash
4 年前
8412c94b
Small camera tweak
4 年前
553316ab
Made SceneLoader a prefab
4 年前
fca4d219
Menu and location specific editor initializers
4 年前
466ba8a5
added event ref to spawn prefab
4 年前
62cef1ec
renamed LocationLoader prefab to SceneLoader
4 年前
d00568b8
Added the event for editor initializer and updated prefabs to ref it
4 年前
03bdc2e4
Now loading screen works
4 年前
a6b2a938
Using bool instead of event because on the same GO
4 年前
e8d73e33
Merge branch 'scenes-re-architecture' into main
4 年前
b15b206e
Merge branch 'main' of https://github.com/HarshNarayanJha/open-project-1 into pr-bash
4 年前
ef68d3e0
Imported WoodenBench
4 年前
c925b56b
Merge branch 'feature/code/plant_critter_sm' of https://github.com/treivize/open-project-1 into pr-bash
4 年前
e6e1f38f
Merge branch 'feature/sub/plant_critter_combat_system' of https://github.com/treivize/open-project-1 into pr-bash
4 年前
162a06e3
Refactoring, renaming, comments
4 年前
84e76f64
Fixes, typos and tweaks
4 年前
6e9237b6
Walkling cane as weapon, tweaks to animations
4 年前
7c088a1f
Merge branch 'pr-bash' into main
4 年前
1cd999fc
Merge branch 'art-assets' of https://github.com/lpchow/open-project-1 into pr-bash
4 年前
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 年前
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 年前
49f39298
Imported new animations
4 年前
6e1104f0
Merge branch 'pr-bash' into main
4 年前
c28d9833
Merge branch 'main' into QuestSystem
4 年前
1853f7ab
Added Critter SO - Item drop when killed - FR critter names ( #299 )
4 年前
008bad73
Fix Merge
4 年前
01936592
Merge remote-tracking branch 'origin/art-assets' into main
4 年前
4b89665c
Wind shader improved and painted more meshes
4 年前
54f79bad
Added slime critter behavior ( #312 )
* Slime Critter initial behavior
* Added slime critter behavior
4 年前
183fdac0
Merge remote-tracking branch 'tech-mkt/main' into main
4 年前
4e8cb14b
Replace Dialogue lines with Localized string, Fix Quest System with questline
4 年前
eb670224
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
82b90ca9
Created a Farmer Hat for Accessories
Added a prefab, model, and a texture for the Farmer Hat.
4 年前
faf70fc8
Slime critter propel attack ( #315 )
4 年前
361478ea
re added pick up event in interaction prefab
4 年前
c691552b
Merge branch 'pr-bash' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Samples.meta
4 年前
2f001d27
Prefab tweaks
4 年前
1c9c17d2
Reorganisation
4 年前
2c375fd1
Merge branch 'art-assets' of https://github.com/MortyJHin/open-project-1 into pr-bash
4 年前
01b4cabf
Food and vegetables
# Conflicts:
# UOP1_Project/Packages/packages-lock.json
# UOP1_Project/ProjectSettings/PackageManagerSettings.asset
# UOP1_Project/ProjectSettings/ProjectVersion.txt
4 年前
2e94b876
Renames
4 年前
4ffa416f
Rename again
4 年前
bba6e8cc
Merge branch 'art-assets' of https://github.com/danten66/open-project-1 into pr-bash
4 年前
4ca6acbc
Oven in scene
4 年前
81be45e7
Merge branch 'art-assets' of https://github.com/BarthaSzabolcs/open-project-1 into main
4 年前
b8227469
Moustache prefabbed
4 年前
c6beedc4
Merge branch 'art-assets' into ground_shader
4 年前
0f397e96
Merge branch 'main' into QuestSystem
4 年前
9b89eaca
Whiteboxing with reduced size
Scene "GeneralMapReduced". Including art asset "BigFallenTreeWithLeaves" which serves to block the path until the player has finished the tutorial quest.
4 年前
5ca74ffe
Beach and Glade midboxing
4 年前
837d24dd
Fix Shared Tables (Localization) conflict.
4 年前
a30ece4a
Merge branch 'pr-bash' into art-assets
4 年前
bd2b6359
Midboxing again
4 年前
b60fe6c7
Tweaks and bamboos
4 年前
07983754
Added Slime Critter droplets when moving
4 年前
81481d8b
Merge pull request #4 from UnityTechnologies/main
update my local branch
4 年前
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 年前
1bf52eb2
2.5D sounds on character
4 年前
290cf250
Merge branch 'pr-bash' into main
4 年前
2f536097
Merge remote-tracking branch 'upstream/main' into main
4 年前
01f30d5a
Imported animations and art
4 年前
9fd881be
Fix Interaction System doesn't follow the FSM
4 年前
1dc5ecc0
Fix Interaction System doesn't follow the FSM
4 年前
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 年前
762d050f
Merge pull request #6 from UnityTechnologies/main
Updating my branch
4 年前
a5261cf1
Combat System - Added player getting hit and killed states
4 年前
df03afb9
Merge branch 'main' of https://github.com/Smurjo/open-project-1 into main
4 年前
1690f35f
PigChef jump fixes, particles on jump liftoff
4 年前
ed7d963f
Added Player Cane Hit variant and enabling attack based on animation events
4 年前
4ca519fc
Fix Interaction System doesn't follow the FSM
4 年前
0d4b9d8a
Refactoring, moved items
4 年前
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 年前
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 年前
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 年前
28d4d3bb
Attack system overhaul
4 年前
761001e0
Merge branch 'art/slime-critter-droplet' of https://github.com/treivize/open-project-1 into pr-bash
4 年前
3d347e8f
Slime droplets adjustments
4 年前
c799113a
Small tweaks to UI Fader
Still not functional
4 年前
7ece782e
Merge branch 'main' into QuestSystem
4 年前
3ba4a5e6
More Accessories
Clothes:
Belt
Cavalier Hat
Lappvattnet
RuffCollar
ToolBelt
Tudor
Items:
HayStraw
Lute
PanFlute
PitchFork
Tambourine
4 年前
7f7c4818
Fix Merge
4 年前
e7bcdcfd
Fixing the merge
4 年前
fab44b36
Merge fixes completed
4 年前
7cd4ce12
Merge remote-tracking branch 'tech-mkt/main' into pr-bash
4 年前
8a53579e
Refactor done
Individual scene starting from the editor not functional
4 年前
d07ee56f
Merge pull request #1 from UnityTechnologies/main
Latest changes
4 年前
b5417125
Merge pull request #7 from UnityTechnologies/main
Updating my local repository
4 年前
bd33c8df
Merge branch 'main' of https://github.com/Smurjo/open-project-1 into pr-bash
4 年前
477798f0
Relocated temp assets in whiteboxing folder
4 年前
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 年前
ee3efeff
Prefab renaming and relocation
4 年前
068abd40
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
4 年前
22788ea0
Included pathway component to edit PathwayConfigSO
4 年前
52cb413e
Capitalisation fix part2
4 年前
dcf0b00e
Refactor part 3
4 年前
7eee90e5
Loading refactor part 4
4 年前
1a55f5b1
More Accessories ( #358 )
Clothes:
Belt
Cavalier Hat
Lappvattnet
RuffCollar
ToolBelt
Tudor
Items:
HayStraw
Lute
PanFlute
PitchFork
Tambourine
4 年前
9dadf27e
Created Fence
I am not sure if the material is set properly. And I have used 4k texture for them. Here 👇 is the link to download the model project. Please feel free to do anything with it 😊 and stay healthy.
https://drive.google.com/file/d/1_V9Np0h9emKdIrJ0cd4HNZq2FenlYn-P/view?usp=sharing
4 年前
253267ff
Save Data when you add or remove an item
4 年前
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 年前
7bc138f1
Merge remote-tracking branch 'MortyJHin/art-assets' into main
4 年前
a19b2328
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
2f0661e3
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
646874a1
Merge branch 'art-assets' of https://github.com/RTBRuhan/open-project-1 into pr-bash
4 年前
e59508f5
Imported fence assets
4 年前
05b8a006
Merge branch 'main' into art-assets
4 年前
80efbc3c
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
70978d9d
Audio changes
4 年前
2e6b1d55
Merge remote-tracking branch 'origin/main' into main
4 年前
07f4bf25
Music playing
4 年前
26ab9830
Fixed CaneSwing SFX, new toon Slash effect
4 年前
3d4fdc12
UI Integration (WIP)
4 年前
5e51d58b
UI Improvements
4 年前
460eb34c
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
4 年前
7321e9d0
UI Integration (WIP)
4 年前
1bec3630
Updated water shader added.
Stored with a new plane, material and timeline asset.
4 年前
da6359bd
small improvements
4 年前
91a763b7
Updated project to 2020 LTS
4 年前
b1d0c051
Correction following Alexandre review
4 年前
5bb0b53c
Fixing some UIs / Adding localized preview image for the items
4 年前
bfe7e497
New fire effect
4 年前
627867d3
UI Tweeks + some items descriptions
4 年前
aadc5919
Add beer keg model, material, and prefab
4 年前
7abf0997
WIP - UI Integration
4 年前
09ce5d71
Tweaks
4 年前
65674583
Add cutting board model, material, and prefab
4 年前
4474d79c
Fire prefabs and torch
4 年前
13426031
Tweak
4 年前
67e5ce82
Merge remote-tracking branch 'treivize/feature/npc-pathway-movement' into main
4 年前
e63ce59b
Lighting adjustments, probes
4 年前
5464088e
Merge branch 'feature/combat-update-consume-input' into main
4 年前
c0b2931f
Merge pull request #1 from UnityTechnologies/main
Update fork
4 年前
c0e6aa2f
New painted skybox
4 年前
ccbaa8cd
Recreating clips with staff
4 年前
f52bd332
Skybox v2
4 年前
148520ea
Animation tweaks
4 年前
6683b1e2
Torches, shader changes
4 年前
eaff6ea8
Fire, embers, smoke
4 年前
abada924
Torch number of particles
4 年前
293f994f
Merge branch 'graphic-rework'
4 年前
75d340a3
Merge remote-tracking branch 'redcurry/art-assets' into main
4 年前
997b50ae
Merge branch 'main' into pr/393
4 年前
7b1ed2b2
Merge branch 'main' into UI
4 年前
27225bd9
Fix localization error
4 年前
09ec279d
Fix Input when closing Inventory
4 年前
3d8f54ca
Select with controller method
4 年前
2a357495
Open/Close Inventory with Input system. No mouse needed
4 年前
0509be25
Refactored the whole cold startup mechanism
4 年前
129eaee3
Control Dialogue with keyboard/controller
4 年前
e4b71f99
Add controls
4 年前
5d435a5e
Merge branch 'main' into UI
4 年前
9ac17dff
Change Tab in inventory with Left/right shoulder and T/Y keyboard buttons
4 年前
5c109f22
Fix Items / Condense Localization tables. NB : Quests are not working anymore
4 年前
86db6931
Rename Quest Data to quest manager + Add Game Manager
4 年前
0db80293
Change disabled and Selected button graphics. Add reset UI when reloaded
4 年前
d1f0a9e1
Add healthbar logic
4 年前
2847ceef
Fix current questline + Add UI Healthbar into Game play scene
4 年前
76adf666
Tweaks to plants
All 3D models of vegetation have been tweaked in size, and have proper green channel for wind. Removed isolated mesh assets.
4 年前
0ed45c81
Add Collectible Prefab
4 年前
3bd54bf1
New colliders for BigRocks and BigTree
4 年前
b5d3a5bb
Townsfolks prefabs
4 年前
6dbe9c46
Trees collider tweaks
4 年前
20cfec67
clean up folders
4 年前
49d768c5
Rebaked TestingGround and ArtShowcase
4 年前
2d718f1c
Merge branch 'main' into vegetation-tweaks
# Conflicts:
# UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
4 年前
f40bd45e
Phoenix Chick 2.0
4 年前
05c41c7f
Rebaked scenes
4 年前
051c3841
Adding townsfolk backup prefabs before merge
4 年前
f5139875
Inventory Prefab fix
4 年前
3aeda760
Change collectable Item to trigger
4 年前
73995838
Merge remote-tracking branch 'tech-mkt/main'
4 年前
509abae6
Add small bridge model, material, and prefab ( #423 )
4 年前
6620446f
Navigation-related prefab tweaks
4 年前
e0ede3d5
Merge branch 'main' into AmelMain
4 年前
8f5b1bdb
Refined PigChef animations
4 年前
2e8f265c
After merge townsfolk back up
4 年前
ebc69c75
New path configs for townsfolk walking
4 年前
7004ced9
Updating townsfolk F and M prefabs
4 年前
3ce06cf5
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
81b3de1b
Fix interaction
4 年前
7120f338
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
3c2d8e55
Fix UI Interaction
4 年前
bc17972b
Merge branch 'main' into iet
# Conflicts:
# UOP1_Project/Packages/manifest.json
4 年前
c094f333
Merge branch 'main' into AmelMain
4 年前
cf9b5d2c
WIP Settings menu
4 年前
d0830611
Updating townsfolk prefab
4 年前
b52c1a1f
Add UI to Main Menu + Add Popup + Working on Settings
4 年前
e8da7a59
Adding intractable prefabs for townsfolk we can interact with
4 年前
30ea906a
Add close button to Settings and Credits screens
4 年前
9a5842e7
removed not needed old prefabs
4 年前
78eac924
Pause Screen
4 年前
837dcf96
removed state machine added twice on prefab
4 年前
7828a4fe
Asset folder Clean up
4 年前
aef41f89
All townsfolk are intractable (removed variant)
4 年前
c3699920
Fix Subscribe/unsubscribe issue in UI. Implement Pause Menu with all its functions
3 年前
1bdfb7ff
Added townsfolk walking condition
4 年前
1f8d4c95
Updated prefabs to add new event from step controller
4 年前
3b82d4e6
Editor cold startup tweaks
It now works even if the SceneDataSO is not referenced
4 年前
e4d15d8c
Relocated whiteboxing scenes and folders
4 年前
4c903dff
Whiteboxing master scene v1
4 年前
84d448b1
Reordered Townsfolk M prefab components to match F prefab
4 年前
bcecfc68
Whiteboxing master scene v2
4 年前
6c927ef3
Whiteboxing master scene v3
4 年前
ab253bb8
adjusting colliders so characters don't go through each other when talking
4 年前
7dc8e8aa
Whiteboxing v5
3 年前
86f9401b
Updating townsfolk prefabs to be prefab variants from fbx
4 年前
b1dc4e31
Added NPC script to Bard Hare
4 年前
30038c42
Bard hare Animator controller and Prefab update
4 年前
8151f1b5
Merge remote-tracking branch 'origin/main' into AmelMain
4 年前
127bd54d
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
350159af
Merge branch 'main' into whiteboxing
3 年前
be536522
Merge with main and fix Selection bug
3 年前
7d552600
Sectioned world into Prefabs
3 年前
6c3280b4
Fix Dialogue closing when finished and Inventory close button
3 年前
8965948b
Rock Critter egg prefab and
3 年前
079dfbbc
Rock Critter full prefab added
3 年前
b506fbc5
renamed slime critter
3 年前
7633b40d
pushing rock critter prefab
3 年前
e0700a24
slowing walk speed for slime critter
3 年前
6bb088d5
Attack animation works
3 年前
348c8c14
Merge branch 'AmelMain' into main
3 年前
c7f86452
Merge remote-tracking branch 'origin/main' into main
3 年前
c24dd21f
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
52d6b39f
post merge bard hare fix
3 年前
66b47933
Default Button improvement
3 年前
ac509ab2
Merge remote-tracking branch 'origin/main' into main
3 年前
52a617fe
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
d41e7e87
Merge branch 'whiteboxing'
# Conflicts:
# UOP1_Project/UserSettings/EditorUserSettings.asset
3 年前
eed33324
ForestEntrance landmass
3 年前
46aad295
Fixing bug in Button selection (Confirmation Popup)
3 年前
4a525440
Scene separated
3 年前
b13a9a92
Refactor and rearrange folders
3 年前
42b7725e
Connected almost all scenes
Missing TownMarket and TownUpper
3 年前
946cf3fe
updating bard hare state machine with new changes from townsfolk v2 SM
3 年前
75076141
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
b73d6df4
Fix last commit + Make Interaction item resizable
3 年前
e6dcfc27
Merge branch 'main' into whiteboxing
3 年前
474f2d07
Camera tweaks
3 年前
49a9a175
Baked all location scenes
3 年前
2ad7557f
Added collider + NPC tag and needed components for Fry King prefab
3 年前
f4f39c50
Adding Dialogue shot VCam for the different NPC prefabs
3 年前
586b9eed
Added noise for dialogue shot cameras of NPCs
3 年前
0b4f451f
Merge branch 'AmelMain' into main
3 年前
aa88e701
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
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
3 年前
5183e8cd
Reverted camera speed
3 年前
23bd82d4
Beach landmass painting v1
3 年前
33211714
Using new rock critter state machine on the prefab
3 年前
ebe81a73
Worldbuilding in progress
Landmasses vertex paint, water plane tweaks
3 年前
a2299fee
Water shaders, landmasses
3 年前
5cc9de68
Beach changes, worldbuilding
Light settings, shader changes, prefab tweaks, model tweaks
3 年前
f5afc4ea
Scenery
3 年前
ad0bf614
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
6bf9cfe1
Merge remote-tracking branch 'tech-mkt/main'
3 年前
47ed0d6a
Merge branch 'main' into worldbuilding
3 年前
17ad7091
Random tint shader
Added wind to random position tint shader
3 年前
c22729d3
More worldbuilding
Full bake of all scenes
3 年前
47348d31
Bridges and Earrings(Mesh, Material, and Prefabs) ( #429 )
Added more accessories for the [Accessories for Townsfolk card]
I also added the Bridge with the Side Railings.
3 年前
735363c3
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
31008d48
Added critter audio class to the plant critter prefab
3 年前
6f206e69
Merge remote-tracking branch 'origin/main' into mainAmel
3 年前
3765dafe
Adding critter audio script and its SOs to the slime critter prefab
3 年前
61430f4d
Adding audio critter script to rock critter
3 年前
fecdb9df
Merge branch 'main' into mainAmel
3 年前
7654f9e8
Merge remote-tracking branch 'amel-unity/main' into main
3 年前
d0523373
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
fbfa7e61
Adding NPC script to prefabs and assigned AudioCue SOs
3 年前
68d32d66
Bard hare prefab update on audio
3 年前
4f16b6a2
pushing bard hare prefab after updating sounds
3 年前
43ef6d4e
Townsfolk F and M now talk as long as the animation plays
3 年前
fc682e87
Critter prefabs now use new sound config 3D
3 年前
29cb354f
Legendary Chef now talk as long as the animation plays
3 年前
de5ce681
Pig chef audio event added to fbx and pushing prefab
3 年前
bc98f737
Bard hare prefab after updates
3 年前
a0b65245
Dialogue shot tweaking
3 年前
59efe5a3
Rock prefabs
3 年前
bbf35a4d
SFX tweaks
Volume adjustments, moved Audio listener to Protagonist
3 年前
4bd4a06c
Lightmap rebakes
3 年前
8d6a3cb2
Audio tweaks
3 年前
53d9fe16
Scene work
3 年前
85c5bf58
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Prefabs/Gameplay/CameraSystem.prefab
# UOP1_Project/Assets/Scenes/Locations/Beach.unity
3 年前
8167037b
Worldbuilding
3 年前
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
3 年前
7798b04e
Addressable changes
Packaged more files into Addressables
3 年前
eab4c107
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
2e9fcf21
BigTree shadow caster tweaks
Created custom shadow casting geometry for BigTrees, to get more light in the forest
3 年前
283617f7
Creating Win/Lose quests and how to handle - Saving quests WIP
3 年前
636d8dbd
Lighting tweaks
3 年前
dc51f9ac
More scenery work
3 年前
34861adb
Location entrance camera
We can now configure a custom camera shot for each location entrance
3 年前
51187a9d
Location work
3 年前
587a2230
Worldbuilding
Scenes, rocks, waterfalls, foam, ...
Added fog
Rebaked all lighting
3 年前
709521fa
Merge branch 'main' into worldbuilding
3 年前
53cfbb69
Camera tweaks
3 年前
d36df8f3
Adding save to disk on questline update
3 年前
71dcdcfd
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
1b98a3e3
Merge branch 'main' of github.com:UnityTechnologies/open-project-1
3 年前
d2ffcb9e
Added IK and new animations for BardHare
Adeed IK to the legs
Created new Sing_Sitting and Sing_Sitting2 sing variations
Created a new Listening animation starting from a talk one
3 年前
9fd51f47
Add camera shake on protagonist hit. ( #454 )
* Add camera shake on protagonist hit.
* add cam shake on critters hit
3 年前
86579ca9
Camera tweaks
Tweaks to the prefab
Added Ground layer, camera now avoids that (but landmasses not on the Ground layer yet)
3 年前
f8947aa6
Sound tweaks and timing
Tweaked SFX timing on animation clips
3 年前
5f2c082e
Put sound on torches
Also added them to Field_Hill
3 年前
e25d45dc
Audio tweaks and reorganisation
Renamed some voice files (evidencing when short or long)
Reorganised protagonist GetHit and Die AudioCues
Created variations on GetHit
3 年前
0f212cd8
Add Questline Testing ground
3 年前
a30ef766
Added Statue(Mesh, Material, and Prefabs) ( #458 )
Statue was a contribution that was discussed in the forums and not based on any codecks card. The name I do have for him is from a Youtube Video, so I don't have any ideas for an original name if needed.
Meshes and Prefabs are in their specific folders.
Please delete the questions below, and type the answers in their place instead
3 年前
ab2b6a73
Tweaks to Statue prefab
Different collider, static flags
3 年前
b768a7dc
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
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 年前
d8f2c2f3
Merge branch 'main' into ciro
3 年前
cc99c71a
Added 3D to main menu (temp)
3 年前
8a2721d9
Setting Questline + rename SO's files
3 年前
09ae3bfc
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
fd58c9ac
Add new item icons
3 年前
06df8c3e
Add script to orient audio listener with the camera ( #457 )
* Add script to orient audio listener with the camera
* Use TransformAnchor to compute listener orientation
3 年前
4b2bcaf1
Mountain Path scene
3 年前
115a64e1
Cave and Path entrance/exit
3 年前
e022f2ee
Rework on questline naming
3 年前
0d96fe7f
Implement pause menu music ( #463 )
3 年前
42ba5e06
Merge remote-tracking branch 'origin/main' into AmelMain
3 年前
b4892bfe
Merge with main
3 年前
d9900de0
Cutscene can be triggered by specific cinematic events (+ kept collider trigger for test purpose)
3 年前
719e6464
updating prefab and scene for cutscene
3 年前
79c4bba1
Removed not needed child game objects from cutscene prefab
3 年前
b214f102
Work on character controller
3 年前
f3bd8b00
Three raycasts
3 年前
c3118a36
New day, new test
3 年前
5b2ff381
More tweaks to CC
3 年前
832dd088
Merge branch 'ciro'
3 年前
d7205d06
Add all questlines and rework Dialogue structure and Dialogue/Quest System. Winning and losing outcome WIP
3 年前
f26da778
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
ad52a32a
hot fixes - Questline integration
3 年前
4413ebd5
Adding missing items + missing questline to a finite quest. Fixing errors.
Use TestingInventory with TestingGround_Questline scene to test the full quest
3 年前
e7a11cf3
Interactables for Beach, Hill and Farms
3 年前
a1b0eb29
Modifying Railed Bridge Meshes
This PR was based on a discussion on the Forums, where I modified the bridges for specific reasons, such as having support beams to reach the ground or no support beams to make the bridge look like it's floating.
Longer Beams: https://forum.unity.com/threads/3d-art-assets.980892/page-7
No Support Beams: https://forum.unity.com/threads/3d-art-assets.980892/page-8
3 年前
ba483324
Ayud and Felfel looks
3 年前
eee951e1
Farms
3 年前
509b93fe
Removed ForestEntrance scene
3 年前
472b2651
Merge branch 'main' of https://github.com/MortyJHin/open-project-1 into worldbuilding
3 年前
60b486d5
Scene work
3 年前
3835c521
Skybox and water tweaks
Now endless water plane!
3 年前
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 年前
5ef923fb
Material and model tweaks
3 年前
a0a16da1
Scene work
3 年前
718b6321
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
cdba81f2
Pushing animations, ACs and prefabs tweaked for cutscenes
3 年前
441fd47b
Add Mountain rock critter variant.
3 年前
bce4012a
Made the cutscene prefab specific to the candy cutscene
3 年前
a156875a
Merge remote-tracking branch 'origin/main' into main
3 年前
d9d8d631
Adding talk sfx events to pig chef talk clips
3 年前
02a13eae
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
a4661c6b
Beach cutscene as a prefab on the beach scene
3 年前
fab03691
Merge branch 'pr/396' into main . Fix Player Inventory/ Testing inventory data.
3 年前
e858cef4
Market landmasses
3 年前
7c507f4a
Create save file on editor cold startup if needed
4 年前
93832439
Landmass work
3 年前
340dd8dc
Merge branch 'main' into CaveWhiteboxing
3 年前
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 年前
d3f9f09c
Added general cutscenePlayableDirector prefab
3 年前
6479be22
Ground patches
3 年前
6c5d90c9
Adding slime cutscene prefab and playable
3 年前
1aeed5db
Water mill
3 年前
33395788
RockCritter egg and Gold RockCritter egg
3 年前
d3537763
Art assets
Tweaked wooden bench UVs and texture, created Campfire prefab out of PotOverFire
3 年前
8e056bbc
Wok
Added wok model, created composite wok cooking prefab, added CookingSteam fx
3 年前
2d712a99
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Scenes/Locations/Beach.unity
3 年前
e0c72522
Fixed BardHare dialogue camera being on at all times
3 年前
a676cd5d
Merge remote-tracking branch 'origin/main' into main
3 年前
12905f99
Prefabs and playableDirectors placeholders created for different cutscenes
3 年前
2de40c96
Work on mountain
3 年前
c0f37c31
Merge branch 'worldbuilding'
3 年前
178534d3
Adding v1 of slime critters cutscene
3 年前
339144dd
Pushing path config changes as prefab
3 年前
8128c471
Tweaking cutscene camera shake frequency and amplitude
3 年前
81c9fb97
Graphic work (mostly Cave)
3 年前
25505e81
Worldbuilding
3 年前
8e61f477
Added light probes to prefabs
3 年前
e693d85c
Worldbuilding
3 年前
e4121299
TownMarket work
3 年前
c0d04e7a
TownMarket
3 年前
83ea7526
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Scenes/Locations/Field_Farms.unity
3 年前
a60d5a44
Adding Townsfolk NPCs prefab variants examples
3 年前
b1c2f634
Integrating Cutscenes and Questlines in final scenes
3 年前
ecc29c82
Sweet dish prefab
3 年前
1121acab
Reset Interactable prefab
3 年前
a75fef44
Moving table in front of Chef Comb (only prefab touched, not scene)
3 年前
9f6faf19
Change default Dialogue for Bard hare in town
3 年前
e9f4e34e
Merge remote-tracking branch 'origin/main' into main
3 年前
38195933
Disable audio sfx events on animation during cutscenes
3 年前
de1dc005
Add game state to pig chef prefab
3 年前
17e7e8f4
Pushing cutscene placeholders to the different scenes
3 年前
b8f152c8
Beach light fixes and rebaked lightmaps
3 年前
6790825d
Adding game state ref to Chef Comb and Bard Hare prefabs
3 年前
c5f38fb8
Merge remote-tracking branch 'tech-mkt/main'
3 年前
2f39fb35
NPCs examples accessories hierarchy order fixed
3 年前
2a8c28f6
Sweet dish cutscene wip
3 年前
97322354
Disabling interaction GO on pigchef during cutscene (To remove talk UI)
3 年前
4836919b
Disabled trigger and play on awake for cutscene
3 年前
75728ee5
wip win cutscene
3 年前
eea075cb
Integrating new phoenix chick animations into candy cutscene + tweaking
3 年前
125046cc
polishing candy cutscene
3 年前
6242d7cf
wip win cutscene
3 年前
29d23b0e
Beach game end cutscene
3 年前
7db5cdba
placeholder for final cutscene
3 年前
b472d7a2
Adding load scene signal to load a location from timeline
3 年前
ca019671
Disabled debug transition on pig chef
3 年前
ee9d138e
Sweet dish cutscene now loads final beach cutscene on the end
3 年前
4b681a41
Adding more towsfolk variants for the crowd
3 年前
98847b01
Added celebration animations to cutscene
3 年前
b3541b2e
Updated townsfolk example prefab
3 年前
ec8eb680
Beach night final cutscene now starts main menu in the end
3 年前
b75d5771
Polishing celebration part on win cutscene and added phoenix chick animation
3 年前
e751564b
Tweaking sweet dish cutscene
3 年前
265dcb02
Added savory dish cutscene
3 年前
90cc66d9
Merge branch 'main' of https://github.com/uChema/open-project-1 into main
3 年前
1ce93bca
Small fixes in Game State System
3 年前
4ad4a353
Settings System
3 年前
9511bfd5
Fixing Asset Table
3 年前
dc07bb35
Merge remote-tracking branch 'upstream/main' into main
3 年前
41cc566f
Merge Settings with main
3 年前
0a1c31a0
Add healthbar
3 年前
c0237ad9
Merge branch 'UnityTechnologies:main' into main
3 年前
378fc807
Merge branch 'main' of https://github.com/uChema/open-project-1 into main
3 年前
0e1137be
Adding Icons + New Interaction system
3 年前
f29c7129
Add Icons placeholders - Set Game Scene UI - Add Aggro System
3 年前
92cb047d
Merge remote-tracking branch 'upstream/main' into main
3 年前
8a36c2bf
Fix UI Rescaling. Test The whole game. WIP Interaction after cutscene
3 年前
5511adb3
Disabled cutscene test colliders for 2 final cutscenes
3 年前
1d5d51cb
Added beach intro cutscene + plays only when we play new game
3 年前
c2dc91c9
Added placeholder on UI for intro cutscene since it's wip
3 年前
5319d9b4
Disable the cutscene placeholder text by default
3 年前
93300a72
Rolling Credits
3 年前
1eaafa64
Add Rolling credits to GameplayScene
3 年前
22980250
Merge remote-tracking branch 'origin/main' into main
3 年前
79795bad
Credits integration in final cutscene
3 年前
7b7510b3
Fix dialogue shots
3 年前
c263ded6
Fixing beach cutscenes timeline binding confusion
3 年前
bad6196e
Fixed talk interaction enabled forever after cutscenes
3 年前
667efa1d
Added farming animation with wip example
3 年前
662602a1
Glucoses now show up only after cutscene
3 年前
e529677a
Glucoses now show up only after cutscene and removed line pause in cutscene
3 年前
b8e46c19
New farming animation in-place with Timeline example
3 年前
57caaba3
Keep health between scenes
3 年前
5ad05c8e
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
94daf002
Restore health and Apply changes to MainMenuCanvas prefab
3 年前
2e7057c0
Error message when can't cook
3 年前
5c14c0b9
Update Switch tab button display to show both controls
3 年前
265562c0
"Add to Inventory" animated panel
3 年前
6520caab
Separated Timeline scene loading from the LocationExit script
3 年前
80427a24
Disabled fire flame on phoenix chick during cutscene
3 年前
a0e8bc6f
character disabled during beach intro cutscene
3 年前
cb4d2d6e
E interaction disabled during cutscenes
3 年前
7fdb5bae
Merge branch 'main' into UI-icons
3 年前
510caa41
Small tweaks to UI elements
3 年前
20443cb5
Added Short Stone Wall(Mesh, Material, and Prefabs) ( #492 )
This includes:
A prefab of a Stone Wall Section
Stone Wall Mesh/Prefab
And a piece that you can attach on the sides of the walls
3 年前
30e472a6
Work on night scene
3 年前
202b38ba
More code refactoring around Anchors
3 年前
534f3a7b
Fixes to ScriptableObjects values
3 年前
6b104b55
Mega code cleanup
3 年前
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 年前
f1c2b9e1
Added Teleporter cheat menu
Press C key to activate, only in the editor
3 年前
f0d72306
Moving files and tweaks
3 年前
2a223039
Fixed bugs
Addressable issues (stray loc tables), and a bug on the UI (inventory menu not updating a button prompt)
3 年前
Ciro Continisio
Wodopo
Andrzej Łukasik
Unknown
GitHub
mwert09
DeivSky
circa94
kgc00
treivize
Chema Damak
rainaldisatria
Marek Takac
jamieTSC
Llaczky
Eduardo de Albuquerque
shuttle127
Dane Byrd
Amel Negra
Jan Urbanec
Amel
Dan Young
uChema
Bartha Szabolcs
lpchow
Hey-Mikelangelo
HarshNarayanJha
David Henshaw
Smurjo
Nathan V
Yohann Puyhaubert
alex
RTBRuhan
Bronson Zgeb
Kyle Minors
Carlos Anderson
fqureshi
itsLevi0sa