Ciro Continisio
290cf250
Merge branch 'pr-bash' into main
4 年前
Ciro Continisio
1bf52eb2
2.5D sounds on character
4 年前
Ciro Continisio
958e0ce5
[Bot] Automated dotnet-format update
4 年前
Ciro Continisio
3f2b0d3c
Merge branch 'create-editorBase-for-custom-inspector' of https://github.com/rainaldisatria/open-project-1 into main
# Conflicts:
# UOP1_Project/Assets/Scripts/Editor/GameSceneSOEditor.cs
4 年前
Ciro Continisio
e5f66cfc
Tweaks, removing doppler effect
4 年前
Ciro Continisio
4b1081d0
Merge branch 'AudioStop' of https://github.com/island212/open-project-1 into pr-bash
4 年前
Ciro Continisio
5a595e86
MenuItem orders and grouping cleaned
All Create items in assets now appear at the top, and all tools are grouped under ChopChop menu item
4 年前
GitHub
ebbad000
Merge pull request #5 from UnityTechnologies/main
updating my local copy
4 年前
Ciro Continisio
24caa0dc
Fixed InputSystem error in whiteboxing scene
4 年前
Ciro Continisio
5afe13aa
Renames and tweaks
4 年前
GitHub
81481d8b
Merge pull request #4 from UnityTechnologies/main
update my local branch
4 年前
Ciro Continisio
5ca74ffe
Beach and Glade midboxing
4 年前
Marc-Olivier
45cb9412
Add a Stop and Finish option for the AudioManager
4 年前
Smurjo
9b89eaca
Whiteboxing with reduced size
Scene "GeneralMapReduced". Including art asset "BigFallenTreeWithLeaves" which serves to block the path until the player has finished the tutorial quest.
4 年前
Ciro Continisio
d060f07a
Water plane Y scale fix
4 年前
Ciro Continisio
d62c17bb
Merge branch 'bugfix/art/shader_gi_backup' of https://github.com/treivize/open-project-1 into pr-bash
4 年前
Ciro Continisio
4abd0c9c
Merge branch 'bugfix/shader-addedMaxLightWhenThereIsNone' of https://github.com/Tatranskymedved/open-project-1 into pr-bash
# Conflicts:
# UOP1_Project/Assets/Shaders/SubGraphs/ToonLightingModel.shadersubgraph
4 年前
GitHub
32df5510
State Machine Improvements ( #314 )
* Changes to Action and Condition script templates
- Uncommented `OnStateEnter` and `OnStateExit`
- Added property to cast `OriginSO` to the derived class
* Minor changes
- Moved call to method `OnStateEnter` of the initial State from `Awake` to `Start`
- Added summary for `OriginSO` properties
- Added buttons to edit 'To States' in the Transition Table Editor, just like with 'From States'
* [Bot] Automated dotnet-format update
* Fixed reordering transitions
Fixed a bug that was causing states to go out of order when reordering transitions.
* TransitionTableEditor code cleanup and visual improvements
- States and transitions will only show the up/down buttons when they can move up or down (first item can't move up, last item can't move down).
- Changed zebra colours to light grey/lighter grey.
- The state of the window is better preserved to not close an opened state after performing sorting, removing, and/or undo opera...
4 年前
Ciro Continisio
8cb52a33
Fix: OccludingObjects now refracted
4 年前
Ciro Continisio
33bbc827
Merge remote-tracking branch 'treivize/bugfix/water/water-height-not-working' into pr-bash
4 年前
treivize
9fbdf5c8
Extend refraction scale to be lower than 5 ( from 0 to 10)
4 年前
Ciro Continisio
9c8a0189
Merge branch 'bugfix/water/water-height-not-working' of https://github.com/treivize/open-project-1 into pr-bash
4 年前
treivize
cdc1c41c
Issue #321 - Fixed water height not working as expected
4 年前
Ciro Continisio
a87f0330
Merge branch 'feature/art/outline_aa_fading_screen' of https://github.com/treivize/open-project-1 into pr-bash
4 年前
Ciro Continisio
b8227469
Moustache prefabbed
4 年前
Ciro Continisio
81be45e7
Merge branch 'art-assets' of https://github.com/BarthaSzabolcs/open-project-1 into main
4 年前
Ciro Continisio
e4dd1d12
Removed PSD from project
4 年前
Ciro Continisio
4ca6acbc
Oven in scene
4 年前
Ciro Continisio
bba6e8cc
Merge branch 'art-assets' of https://github.com/danten66/open-project-1 into pr-bash
4 年前
Ciro Continisio
4ffa416f
Rename again
4 年前
Ciro Continisio
2e94b876
Renames
4 年前
Ciro Continisio
01b4cabf
Food and vegetables
# Conflicts:
# UOP1_Project/Packages/packages-lock.json
# UOP1_Project/ProjectSettings/PackageManagerSettings.asset
# UOP1_Project/ProjectSettings/ProjectVersion.txt
4 年前
Ciro Continisio
30e58a35
Farmer hat tweaks
4 年前
Ciro Continisio
2c375fd1
Merge branch 'art-assets' of https://github.com/MortyJHin/open-project-1 into pr-bash
4 年前
Ciro Continisio
1c9c17d2
Reorganisation
4 年前
Ciro Continisio
2f001d27
Prefab tweaks
4 年前
Ciro Continisio
10a426d8
Scenes moved around
4 年前
Ciro Continisio
c691552b
Merge branch 'pr-bash' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Samples.meta
4 年前
GitHub
b196db3a
General Map Whiteboxing_1 ( #294 )
4 年前
Amel Negra
a3fdb227
Merge branch 'main' into whiteboxing
4 年前
Ciro Continisio
b5c513e4
Small tweaks
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 年前
Ciro Continisio
1995c542
Merge branch 'whiteboxing' of https://github.com/NicknEma/open-project-1 into NicknEma-whiteboxing
# Conflicts:
# UOP1_Project/Assets/Scenes/Whiteboxing/Beach/Proposal_2/Beach.unity
4 年前
NicknEma
72cb0094
Update Beach.unity
4 年前
NicknEma
27a139f7
Added CameraManager and SpawnSystem to the scene
4 年前
NicknEma
7974b44d
Second whiteboxing for the beach area
4 年前
GitHub
f8f9e06c
Second whiteboxing for the beach area ( #211 )
4 年前
Amel Negra
6504ce17
Generated lighting
4 年前
Amel Negra
9c4c0b8c
Removed terrain and the scene using it
4 年前
GitHub
f9ef3334
Whiteboxing ( #155 )
* Add files via upload
Uploading town whiteboxing as separate files
* Add files via upload
Truffleton scene
* Moved files from the root to a new folder
Co-authored-by: Amel Negra <amel.negra@unity3d.com>
4 年前