Ciro Continisio
9856af6d
Packages, Empty project
4 年前
Ciro Continisio
9b81ac62
More packages
4 年前
Ciro Continisio
08043a2c
3D Playground
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 年前
Ayhan Sakarya
ca81b380
Upgraded TMPro package to 2.1.1
4 年前
Ciro Continisio
9f26d492
Upgraded to 2019.4.11
Updated Unity version and several packages to the latest
4 年前
Ciro Continisio
4aaa3b36
Spawn system in place
4 年前
GitHub
a9604394
Merge branch 'master' into TMPro-Import
4 年前
Andrew Real
bd2f9dce
Merge branch 'master' into remove-magic-numbers
4 年前
Ciro Continisio
b194fe99
Merge branch 'master' into Wodopo/spawn-system
# Conflicts:
# UOP1_Project/Assets/Scenes/CharController.unity
# UOP1_Project/Assets/Scripts/CameraManager.cs
4 年前
mwert09
a291c583
Merge remote-tracking branch 'upstream/master'
4 年前
Unknown
55b5f63c
Updated to Unity version 2019.4.11
4 年前
Ciro Continisio
e27f318b
Merge branch 'master' into custom-lighting-shader
# Conflicts:
# UOP1_Project/Packages/manifest.json
# UOP1_Project/ProjectSettings/ProjectVersion.txt
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 年前
Unknown
851efcad
Merge remote-tracking branch 'origin/main' into Scene-Loading
4 年前
NicknEma
27a139f7
Added CameraManager and SpawnSystem to the scene
4 年前
Chema Damak
54306cec
Added localization package
4 年前
Ciro Continisio
3b44ba51
Upgraded project to 2019.4.14f1, imported new packages
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
7aa245f6
found fix for todo #2
4 年前
Chema Damak
597b3f7b
Merge branch 'localization' into main
4 年前
Chema Damak
093779d0
Fix cutscenes
4 年前
Chema Damak
3aaa37cc
Add UI system, Inventory UI and update Inventory System
4 年前
Ciro Continisio
58d65aa2
Merge remote-tracking branch 'tech-mkt/main' into pr-bashing
4 年前
Ciro Continisio
8d5f074b
Imported the recorder package, ignored Recordings folder
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 年前
treivize
df2ab2a2
Merge branch 'art-assets' into feature/art/slime_critter
4 年前
GitHub
19a7c4c5
Upgrade to 2020.2.13b ( #247 )
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
90998767
Merge remote-tracking branch 'origin/Inventory' into interaction
4 年前
Amel Negra
9bae4220
Merge remote-tracking branch 'origin/interaction' into main
4 年前
Ciro Continisio
77242d26
Merge branch 'main' of github.com:UnityTechnologies/open-project-1 into main
# Conflicts:
# UOP1_Project/Assets/Scenes/TestingGround.unity
4 年前
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 年前
Ciro Continisio
ec83929b
After merge fixes
4 年前
Ciro Continisio
aa1215c0
Package updates
4 年前
HarshNarayanJha
06438a1a
Pulled from upstream/main
4 年前
Amel Negra
c444c501
Merge remote-tracking branch 'origin/main' into scenes-re-architecture
4 年前
Smurjo
10477f56
Added maize
It's the same texture for all, 1024x1024.
Triangles:
- maize cob 640
- single grain 88
- maize in box 1630
4 年前
GitHub
54240307
Devlog 3: Handling complex input ( #307 )
Project upgrade to 2021.1
4 年前
uChema
c28d9833
Merge branch 'main' into QuestSystem
4 年前
Ciro Continisio
91884744
Updated to 2019.4.18f1, updated packages
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 年前
Dane Byrd
c6beedc4
Merge branch 'art-assets' into ground_shader
4 年前
uChema
0f397e96
Merge branch 'main' into QuestSystem
4 年前
Ciro Continisio
89d048fc
Package updates
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
423633f0
Updated to 2019.4.20f1
4 年前
Yohann Puyhaubert
0b3da4fa
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
4 年前
uChema
5e51d58b
UI Improvements
4 年前
Ciro Continisio
91a763b7
Updated project to 2020 LTS
4 年前
uChema
7abf0997
WIP - UI Integration
4 年前
GitHub
c0b2931f
Merge pull request #1 from UnityTechnologies/main
Update fork
4 年前
uChema
31d75482
Add controls. Switch Quest/Questline.cs names. And Button add Questline , quests, step
4 年前
Amel
7b1ed2b2
Merge branch 'main' into UI
4 年前
uChema
27225bd9
Fix localization error
4 年前
Ciro Continisio
cd038ff9
IET packages imported
4 年前
Ciro Continisio
b5a142b5
Updated to 2020.3.7f1
4 年前
uChema
3ce06cf5
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Ciro Continisio
bc17972b
Merge branch 'main' into iet
# Conflicts:
# UOP1_Project/Packages/manifest.json
4 年前
Amel Negra
c094f333
Merge branch 'main' into AmelMain
4 年前
Ciro Continisio
9632e498
IET v3
4 年前
uChema
167ca847
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Amel Negra
ddcc378c
Merge branch 'main' into AmelMain
4 年前
Ciro Continisio
bad80c8c
Updated ProBuilder and Polybrush
Also enabled ProBuilder experimental features
3 年前
Ciro Continisio
edf6638e
Packages updated
3 年前
uChema
8b7ce38c
Create questlines
3 年前
Ciro Continisio
8d008f8c
Updated packages
Fixing issue with Addressables
3 年前
Amel
6f206e69
Merge remote-tracking branch 'origin/main' into mainAmel
3 年前
Amel
6d56e31b
Merge branch 'main' into mainAmel
3 年前
uChema
d0523373
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Ciro Continisio
85c5bf58
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Prefabs/Gameplay/CameraSystem.prefab
# UOP1_Project/Assets/Scenes/Locations/Beach.unity
3 年前
Ciro Continisio
c0958996
Updated project to 2020.3.12f1
Updated relevant packages
Fixed 2 animation clips that behaved differently
3 年前
Ciro Continisio
3baf3a06
Updated Animation Rigging to 1.1.0
3 年前
uChema
37e5adb2
Fix Quests SO
3 年前
Ciro Continisio
709521fa
Merge branch 'main' into worldbuilding
3 年前
Ciro Continisio
b622ace5
Updated to 2020.3.17f1
3 年前
Ciro Continisio
2ffae207
General changes
3 年前