Ciro Continisio
9856af6d
Packages, Empty project
4 年前
Ciro Continisio
93b4aa7d
Actions map, Simple input testing
4 年前
Ciro Continisio
b8b709a6
Character control refactoring
4 年前
Ciro Continisio
08043a2c
3D Playground
4 年前
Ciro Continisio
ee2cec18
Camera rotation, Movement tweaks
Movement now is independent of camera rotation
4 年前
Ciro Continisio
a9617e2b
Toon shading v1
4 年前
Ciro Continisio
74d5128e
Toon shader improvments
- Updated URP from 7.3.0 to 7.5.1
- Moved to most recent 19.4
- New custom lighting shader (Toon 2), not yet toonified
4 年前
Andre McGrail
a9e2d4b6
Tweaks to URP Asset
- Enabled Depth Texture to make sure it is created for use with the outline shader
- Set MSAA 2x so that a Depth Pre-pass is created, this makes sure the depth textrure for opaques is not a frame old
- Switched Color Grading mode to LDR as this is more performant and the visual trade off is generally worth the performance improvements
4 年前
Ciro Continisio
369c0864
Toon Shader v2 in progress
4 年前
Ciro Continisio
b0af5562
Toon shader done
Needs to be broken down into pieces for modularity
4 年前
Ciro Continisio
26b18669
Work and tests on toon shader, plants and rocks
4 年前
GitHub
999566a9
OP Devlog #1 : Toon shading ( #173 )
* upgrade to 2020.2
* add else condition in CustomLighting
* fix missing material in ToonShading scene
Co-authored-by: doJester13 <minarini.work@gmail.com>
Co-authored-by: doJester13 <minairni.work@gmail.com>
4 年前
Ciro Continisio
3dec2ebe
Preset for .fbx files
4 年前
Ciro Continisio
24cc8443
Added crunch compression to all textures + Preset
4 年前
Unknown
851efcad
Merge remote-tracking branch 'origin/main' into Scene-Loading
4 年前
GitHub
a5b61b2f
Added foam + refraction + depth fare to water shader ( #139 )
* Alternative water shader proposition
* Unlit water shader and add shadow
- Unlit water shader
- Add shadow as done in Toon shader
- Add vertex displacement like done in dickmendra shader
- Change the showcase water plane to intersect with the rock close to it to see foam
* Shader clean up
* Water shader improvements
- Water effect distance cut off
- Expose light probe contribution
- Control surface shadow intensity
* Small tweaks to showcase scene
* Water shader fixes
* Showcase water
* Small tweaks
Co-authored-by: Ciro Continisio <ciro@unity3d.com>
4 年前
Ciro Continisio
c3bf387e
Cleanup, Reorganisation of folders and Scenes
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 年前
GitHub
ffe1b8b8
Working dialogue and cutscene system. ( #135 )
* Add Dialogue Track base implementation
* Custom timeline track and clip for dialog
- Can at any time call for a line of dialogue.
- Each clip binds line of dialogue to be later displayed on screen.
- Depending on the options of this clip, the Timeline might pause.
* Made adjustments based on HyagoOliveiran's suggestions
Tried to add more variables to increase legibility.
Added UpdateSlide function.
Deleted some empty lines.
* Update Character.cs
* Update Character.cs
* Update Character.cs
* Update Character.cs
* Update Character.cs
* Update Character.cs
* Update UOP1_Project/Assets/Scripts/Characters/Character.cs
I deleted unnecessary spacing by following atb-brown suggestion.
Co-authored-by: Austin Brown <atb.austin@gmail.com>
* Deleted unnecessary spacing
* Fixed bouncing issue when player hit under floating platform
* My take on a simple Player Spawn System
* Renamed SetRequestS...
4 年前
kgc00
8dfcd3e8
Merge remote-tracking branch 'upstream/main' into main
4 年前
circa94
cdbf1207
Merge branch 'circa94/master' into circa94/inventory-system
4 年前
Ciro Continisio
55d5d2a4
Merge branch 'main' into art-assets
# Conflicts:
# UOP1_Project/Assets/Art/Characters/PhoenixChick.meta
# UOP1_Project/Assets/Cutscenes.meta
# UOP1_Project/Assets/Cutscenes/ExampleCutscene.playable.meta
# UOP1_Project/Assets/Materials/Debug_Semitransparent.mat.meta
# UOP1_Project/Assets/Materials/Obstacles_Blue.mat.meta
# UOP1_Project/Assets/Prefabs/GameplayEssentials.meta
# UOP1_Project/Assets/Prefabs/Input Reader.asset
# UOP1_Project/Assets/Prefabs/Input Reader.asset.meta
# UOP1_Project/Assets/Prefabs/Pig.prefab
# UOP1_Project/Assets/Presets.meta
# UOP1_Project/Assets/Presets/Defaults.meta
# UOP1_Project/Assets/Scenes/CharController.unity
# UOP1_Project/Assets/ScriptableObjects.meta
# UOP1_Project/Assets/ScriptableObjects/Input Reader.asset
# UOP1_Project/Assets/ScriptableObjects/Input Reader.asset.meta
# UOP1_Project/Assets/ScriptableObjects/Input/InputReader.asset
# UOP1_Project/Assets/ScriptableObjects/Input/InputReader.asset.meta
# UOP1_Project/Assets/Settings/Presets.meta
# ...
4 年前
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 年前
kgc00
ad56cb20
Merge remote-tracking branch 'upstream/main' into main
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
38b89476
Added PostProcessing support
4 年前
Ciro Continisio
1ee5259e
Merge branch 'main' into big-merge
4 年前
kgc00
2db1442c
docs
4 年前
Ciro Continisio
2c91dabf
Merge branch 'art-assets' into big-merge
# Conflicts:
# UOP1_Project/Assets/Prefabs/Props/PotOverFire.prefab
4 年前
Ciro Continisio
e155c0a6
Added camera dummy, fixed issue with player Prefab tag
4 年前
kgc00
781633e3
Merge remote-tracking branch 'upstream/main' into main
4 年前
Ciro Continisio
7705382e
Merge branch 'main' into state-machine-improvements
# Conflicts:
# UOP1_Project/Assets/Prefabs/Pig.prefab
4 年前
kgc00
c4dabcbe
merge
4 年前
kgc00
b06aad3e
updates
4 年前
Ciro Continisio
99c4ccb4
Audio functionality
4 年前
Ciro Continisio
826ef58b
AudioSystem functionality
4 年前
treivize
0728a4c6
Merge branch 'art-assets' into feature/art/pant_critter
4 年前
GitHub
14e737cc
Merge pull request #1 from UnityTechnologies/art-assets
Art assets
4 年前
GitHub
e09986b8
Merge branch 'main' into fix/object-pool
4 年前
Eduardo de Albuquerque
dcce5aca
Created a prototype for the effect
4 年前
shuttle127
47c639cb
Create silhouette pass
Added some URP render features to silhouette characters when they're behind static scenery
4 年前
Eduardo de Albuquerque
0cbe6635
Changed the renderer so the shader i did won't be needed anymore
4 年前
Ciro Continisio
09419cf4
Tweaks, dither shader
4 年前
Ciro Continisio
1d26bec4
Merge branch 'main' into state-machine-improvements
4 年前
treivize
df2ab2a2
Merge branch 'art-assets' into feature/art/slime_critter
4 年前
Eduardo de Albuquerque
8845aa98
Merge branch 'main' into HollowBoatEffect
# Conflicts:
# UOP1_Project/Assets/Settings/Graphics/ToonRendererData.asset
# UOP1_Project/ProjectSettings/TagManager.asset
4 年前
Eduardo de Albuquerque
82449ac9
Merged my modifications
4 年前
Ciro Continisio
d9dd5e5e
Tweaked RenderFeatures
4 年前
Ciro Continisio
531159fe
Shadow distance tweaks
4 年前
GitHub
19a7c4c5
Upgrade to 2020.2.13b ( #247 )
4 年前
Amel Negra
78d9ac33
Changed interaction key to E (From K)
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 Negra
9bae4220
Merge remote-tracking branch 'origin/interaction' into main
4 年前
Ciro Continisio
77242d26
Merge branch 'main' of github.com:UnityTechnologies/open-project-1 into main
# Conflicts:
# UOP1_Project/Assets/Scenes/TestingGround.unity
4 年前
Ciro Continisio
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 年前
Dan Young
7ce66d74
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
Amel Negra
a3fdb227
Merge branch 'main' into whiteboxing
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 年前
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 年前
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
6e9237b6
Walkling cane as weapon, tweaks to animations
4 年前
Ciro Continisio
7c088a1f
Merge branch 'pr-bash' into main
4 年前
GitHub
54240307
Devlog 3: Handling complex input ( #307 )
Project upgrade to 2021.1
4 年前
uChema
c28d9833
Merge branch 'main' into QuestSystem
4 年前
Dane Byrd
004c7bd1
Ground Shader WIP
Includes ground shader prototype with vertex color debug. Moves outline subgraph out of the main ToonShading subgraph. I have not included Noise Textures as I need to verify that the noise textures I used for testing are under an open-source license.
4 年前
Dan Young
eb670224
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
Ciro Continisio
c691552b
Merge branch 'pr-bash' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Samples.meta
4 年前
Ciro Continisio
8cb52a33
Fix: OccludingObjects now refracted
4 年前
Dane Byrd
c6beedc4
Merge branch 'art-assets' into ground_shader
4 年前
uChema
0f397e96
Merge branch 'main' into QuestSystem
4 年前
Ciro Continisio
290cf250
Merge branch 'pr-bash' into main
4 年前
alex
2f536097
Merge remote-tracking branch 'upstream/main' into main
4 年前
GitHub
762d050f
Merge pull request #6 from UnityTechnologies/main
Updating my branch
4 年前
Smurjo
df03afb9
Merge branch 'main' of https://github.com/Smurjo/open-project-1 into main
4 年前
uChema
7ece782e
Merge branch 'main' into QuestSystem
4 年前
Ciro Continisio
6acf65d7
Tweaked emission graph, added textures
4 年前
Yohann Puyhaubert
0b3da4fa
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
4 年前
Ciro Continisio
70978d9d
Audio changes
4 年前
Yohann Puyhaubert
460eb34c
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
4 年前
Ciro Continisio
91a763b7
Updated project to 2020 LTS
4 年前
uChema
7abf0997
WIP - UI Integration
4 年前
Ciro Continisio
09ce5d71
Tweaks
4 年前
Ciro Continisio
c8c308d5
Relocated lighting settings
4 年前
Ciro Continisio
e63ce59b
Lighting adjustments, probes
4 年前
GitHub
c0b2931f
Merge pull request #1 from UnityTechnologies/main
Update fork
4 年前
Ciro Continisio
4e0a85c8
Removed outline completely
4 年前
Ciro Continisio
c0e6aa2f
New painted skybox
4 年前
Ciro Continisio
f52bd332
Skybox v2
4 年前
Ciro Continisio
107a317d
Land added
4 年前
Ciro Continisio
44604f6f
Updated testing scenes
4 年前
Ciro Continisio
753835bc
Night sky, sunset
4 年前
Ciro Continisio
293f994f
Merge branch 'graphic-rework'
4 年前
uChema
997b50ae
Merge branch 'main' into pr/393
4 年前
Amel
7b1ed2b2
Merge branch 'main' into UI
4 年前
uChema
e4b71f99
Add controls
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 年前
Ciro Continisio
49d768c5
Rebaked TestingGround and ArtShowcase
4 年前
Ciro Continisio
2d718f1c
Merge branch 'main' into vegetation-tweaks
# Conflicts:
# UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
4 年前
Amel Negra
e0ede3d5
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
c3699920
Fix Subscribe/unsubscribe issue in UI. Implement Pause Menu with all its functions
4 年前
Ciro Continisio
07ac0ab3
Rebaked lightmaps in whiteboxing levels
4 年前
Ciro Continisio
e4d15d8c
Relocated whiteboxing scenes and folders
4 年前
Ciro Continisio
bcecfc68
Whiteboxing master scene v2
4 年前
Amel Negra
8151f1b5
Merge remote-tracking branch 'origin/main' into AmelMain
4 年前
uChema
127bd54d
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
uChema
be536522
Merge with main and fix Selection bug
4 年前
Amel Negra
c7f86452
Merge remote-tracking branch 'origin/main' into main
4 年前
uChema
b13a9a92
Refactor and rearrange folders
4 年前
Ciro Continisio
42b7725e
Connected almost all scenes
Missing TownMarket and TownUpper
4 年前
Ciro Continisio
e6dcfc27
Merge branch 'main' into whiteboxing
4 年前
Ciro Continisio
49a9a175
Baked all location scenes
4 年前
Ciro Continisio
a2299fee
Water shaders, landmasses
4 年前
Ciro Continisio
5cc9de68
Beach changes, worldbuilding
Light settings, shader changes, prefab tweaks, model tweaks
4 年前
Ciro Continisio
c22729d3
More worldbuilding
Full bake of all scenes
4 年前
uChema
735363c3
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Amel
6f206e69
Merge remote-tracking branch 'origin/main' into mainAmel
4 年前
Amel
9c232940
Audio configs tweaking
4 年前
Ciro Continisio
59efe5a3
Rock prefabs
4 年前
Ciro Continisio
71481135
Shader and lighting tweaks
4 年前
Ciro Continisio
8d6a3cb2
Audio tweaks
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 年前
uChema
eab4c107
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Ciro Continisio
636d8dbd
Lighting tweaks
4 年前
Ciro Continisio
dc51f9ac
More scenery work
3 年前
Ciro Continisio
8b71c981
Quality settings and post-fx
Changed MSAA from 8x to 2x again
3 年前
Ciro Continisio
587a2230
Worldbuilding
Scenes, rocks, waterfalls, foam, ...
Added fog
Rebaked all lighting
3 年前
Ciro Continisio
80582a3d
Skyboxes for Forest and Forest Entrance
3 年前
uChema
71dcdcfd
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
uChema
b768a7dc
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Ciro Continisio
a0a16da1
Scene work
3 年前
uChema
718b6321
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Amel Negra
a156875a
Merge remote-tracking branch 'origin/main' into main
3 年前
Ciro Continisio
e693d85c
Worldbuilding
3 年前
Ciro Continisio
c0d04e7a
TownMarket
3 年前
Amel Negra
e9f4e34e
Merge remote-tracking branch 'origin/main' into main
3 年前
Ciro Continisio
a1fdc096
Fixed Protagonist eyes issue
Eyes were rendered after water, showing through. Now fixed.
3 年前
Amel Negra
f0cf14a8
Merge remote-tracking branch 'origin/main' into main
3 年前
uChema
90cc66d9
Merge branch 'main' of https://github.com/uChema/open-project-1 into main
3 年前
uChema
4ad4a353
Settings System
3 年前
uChema
dc07bb35
Merge remote-tracking branch 'upstream/main' into main
3 年前
Ciro Continisio
f1c2b9e1
Added Teleporter cheat menu
Press C key to activate, only in the editor
3 年前