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 年前
8504c55f
PigChef plays idle and walk animations
Created action to set a bool parameter on the state machine
4 年前
38b89476
Added PostProcessing support
4 年前
e155c0a6
Added camera dummy, fixed issue with player Prefab tag
4 年前
781633e3
Merge remote-tracking branch 'upstream/main' into main
4 年前
7705382e
Merge branch 'main' into state-machine-improvements
# Conflicts:
# UOP1_Project/Assets/Prefabs/Pig.prefab
4 年前
c4dabcbe
merge
4 年前
ededb7c0
Merge branch 'state-machine-improvements' into main
4 年前
253b73a3
Merge remote-tracking branch 'upstream/main' into main
4 年前
7b04a609
Merge branch 'main' into simple-menu-controls
4 年前
a0293eb3
Merge remote-tracking branch 'upstream/main' into branching-feature-in-dialogue-system
4 年前
0728a4c6
Merge branch 'art-assets' into feature/art/pant_critter
4 年前
14e737cc
Merge pull request #1 from UnityTechnologies/art-assets
Art assets
4 年前
df2ab2a2
Merge branch 'art-assets' into feature/art/slime_critter
4 年前
03b337f2
Updated prefabs
4 年前
8da148bf
Introduced RuntimeAnchors
Used in Spawn and CameraSystem for decoupling purposes
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 年前
268ab82e
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
7438112a
Reworked the CM camera, added collider, noise
4 年前
2c9810c9
Merge branch 'main' into interaction
4 年前
8a166bf0
Merge branch 'interaction' of https://github.com/UnityTechnologies/open-project-1 into interaction
4 年前
fed9be4d
Reintroduced camera noise
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 年前
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 年前
d0298f3d
Merge pull request #3 from UnityTechnologies/art-assets
Art assets
4 年前
c444c501
Merge remote-tracking branch 'origin/main' into scenes-re-architecture
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 年前
a6b2a938
Using bool instead of event because on the same GO
4 年前
e8d73e33
Merge branch 'scenes-re-architecture' into main
4 年前
84e76f64
Fixes, typos and tweaks
4 年前
7c088a1f
Merge branch 'pr-bash' into main
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 年前
c28d9833
Merge branch 'main' into QuestSystem
4 年前
eb670224
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
c691552b
Merge branch 'pr-bash' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Samples.meta
4 年前
2f001d27
Prefab tweaks
4 年前
c6beedc4
Merge branch 'art-assets' into ground_shader
4 年前
0f397e96
Merge branch 'main' into QuestSystem
4 年前
c799113a
Small tweaks to UI Fader
Still not functional
4 年前
7ece782e
Merge branch 'main' into QuestSystem
4 年前
8a53579e
Refactor done
Individual scene starting from the editor not functional
4 年前
b5417125
Merge pull request #7 from UnityTechnologies/main
Updating my local repository
4 年前
ee3efeff
Prefab renaming and relocation
4 年前
068abd40
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
4 年前
dcf0b00e
Refactor part 3
4 年前
7eee90e5
Loading refactor part 4
4 年前
07f4bf25
Music playing
4 年前
460eb34c
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
4 年前
b1d0c051
Correction following Alexandre review
4 年前
09ce5d71
Tweaks
4 年前
13426031
Tweak
4 年前
67e5ce82
Merge remote-tracking branch 'treivize/feature/npc-pathway-movement' into main
4 年前
c0b2931f
Merge pull request #1 from UnityTechnologies/main
Update fork
4 年前
c0e6aa2f
New painted skybox
4 年前
293f994f
Merge branch 'graphic-rework'
4 年前
997b50ae
Merge branch 'main' into pr/393
4 年前
7b1ed2b2
Merge branch 'main' into UI
4 年前
0509be25
Refactored the whole cold startup mechanism
4 年前
5d435a5e
Merge branch 'main' into UI
4 年前
3b82d4e6
Editor cold startup tweaks
It now works even if the SceneDataSO is not referenced
4 年前
7dc8e8aa
Whiteboxing v5
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
4 年前
d41e7e87
Merge branch 'whiteboxing'
# Conflicts:
# UOP1_Project/UserSettings/EditorUserSettings.asset
4 年前
42b7725e
Connected almost all scenes
Missing TownMarket and TownUpper
4 年前
474f2d07
Camera tweaks
4 年前
49a9a175
Baked all location scenes
4 年前
5183e8cd
Reverted camera speed
4 年前
5cc9de68
Beach changes, worldbuilding
Light settings, shader changes, prefab tweaks, model tweaks
3 年前
735363c3
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
6f206e69
Merge remote-tracking branch 'origin/main' into mainAmel
3 年前
a0b65245
Dialogue shot tweaking
3 年前
59efe5a3
Rock prefabs
3 年前
bbf35a4d
SFX tweaks
Volume adjustments, moved Audio listener to Protagonist
3 年前
8d6a3cb2
Audio tweaks
3 年前
85c5bf58
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Prefabs/Gameplay/CameraSystem.prefab
# UOP1_Project/Assets/Scenes/Locations/Beach.unity
3 年前
eab4c107
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
34861adb
Location entrance camera
We can now configure a custom camera shot for each location entrance
3 年前
53cfbb69
Camera tweaks
3 年前
71dcdcfd
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
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 年前
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 年前
09ae3bfc
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
0d96fe7f
Implement pause menu music ( #463 )
3 年前
42ba5e06
Merge remote-tracking branch 'origin/main' into AmelMain
3 年前
b4892bfe
Merge with main
3 年前
fab03691
Merge branch 'pr/396' into main . Fix Player Inventory/ Testing inventory data.
3 年前
7c507f4a
Create save file on editor cold startup if needed
4 年前
2d712a99
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Scenes/Locations/Beach.unity
3 年前
e693d85c
Worldbuilding
3 年前
e9f4e34e
Merge remote-tracking branch 'origin/main' into main
3 年前
dc07bb35
Merge remote-tracking branch 'upstream/main' into main
3 年前
30e472a6
Work on night scene
3 年前
202b38ba
More code refactoring around Anchors
3 年前
f1c2b9e1
Added Teleporter cheat menu
Press C key to activate, only in the editor
3 年前
f0d72306
Moving files and tweaks
3 年前
Ciro Continisio
GitHub
kgc00
circa94
rainaldisatria
treivize
Jan Urbanec
Dan Young
Amel
Chema Damak
Amel Negra
Hey-Mikelangelo
uChema
Dane Byrd
Yohann Puyhaubert
fqureshi