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
1e3626e8
More character controller jump tweaks
4 年前
Ciro Continisio
ee2cec18
Camera rotation, Movement tweaks
Movement now is independent of camera rotation
4 年前
Unknown
1cc14a04
SOs for menus and levels and adding scenes
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 年前
Ciro Continisio
369c0864
Toon Shader v2 in progress
4 年前
Ayhan Sakarya
ca81b380
Upgraded TMPro package to 2.1.1
4 年前
Ayhan Sakarya
90cd0f95
Reverted Settings.json change after TMPro upgrade
4 年前
Unknown
af81ba57
Added level 2 and level end trigger in level 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 年前
Unknown
aa06f015
Added beach and forest scenes for scenes loading tests
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 年前
Ciro Continisio
05c2da74
Project settings
Small tweaks, project naming, etc.
4 年前
Ciro Continisio
ccbf1297
Small feedback tweaks
4 年前
Ciro Continisio
009fdbd5
Even more art
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
2cb26091
Tweaks and comments
Removed StateMachines scene, fixed a small bug on Sliding when spawning in the air and trying to move
4 年前
Ciro Continisio
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 年前
Unknown
851efcad
Merge remote-tracking branch 'origin/main' into Scene-Loading
4 年前
Unknown
af2ab922
Merge branch 'Scene-Loading' into main
4 年前
Ciro Continisio
a58c28d8
Cleanup of temp assets, removal of Terrain
4 年前
NicknEma
27a139f7
Added CameraManager and SpawnSystem to the scene
4 年前
Unknown
5edd2f9e
Changed Scene loader scene name to Initialization
4 年前
Ciro Continisio
c3bf387e
Cleanup, Reorganisation of folders and Scenes
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 年前
Chema Damak
54306cec
Added localization package
4 年前
Ciro Continisio
0ceeafd9
Refreshed Forest and Beach scenes
4 年前
Ciro Continisio
c28c6bc6
New Pig and RockCritter animations
4 年前
Chema Damak
7653f891
Add localized Dialogue
4 年前
Ciro Continisio
38b89476
Added PostProcessing support
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 年前
Ciro Continisio
9bb7eeb2
Forgot Settings.json files
4 年前
kgc00
253b73a3
Merge remote-tracking branch 'upstream/main' into main
4 年前
Chema Damak
597b3f7b
Merge branch 'localization' into main
4 年前
kgc00
7b04a609
Merge branch 'main' into simple-menu-controls
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 年前
rainaldisatria
a0293eb3
Merge remote-tracking branch 'upstream/main' into branching-feature-in-dialogue-system
4 年前
Ciro Continisio
ce5b07db
Fry king in scene, Loading tweaks
4 年前
Ciro Continisio
9a70c543
Product name and version
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 年前
Ciro Continisio
821a306a
Imported accessories
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
f29c5b3e
Switched layers of occluding objects
4 年前
jandd661
baff1741
Proposed fix for issue #229 with test scenes
4 年前
jandd661
b7efdfcb
Revert "Proposed fix for issue #229 with test scenes"
This reverts commit 14a6a3a062c3979cf9fef8d3b156c560f6fcd27b.
4 年前
jandd661
89044d84
Revert "Revert "Proposed fix for issue #229 with test scenes""
This reverts commit 3e9fb2d2aaf01d1a054e2e9f18a8f37540a888a8.
4 年前
GitHub
19a7c4c5
Upgrade to 2020.2.13b ( #247 )
4 年前
Amel Negra
e6d23871
Added tags for interactions
4 年前
Ciro Continisio
5aaad3c6
Merge branch 'Location-Loader-issue-229-fix' into main
4 年前
Ciro Continisio
1fadd410
Merge branch 'add-testscene-trap' into main
# Conflicts:
# UOP1_Project/Assets/Scenes/TestingGround_Small.unity
# UOP1_Project/Assets/Scenes/TestingGround_Small/LightingData.asset
# UOP1_Project/Assets/Scenes/TestingGround_Small/Lightmap-0_comp_dir.png
# UOP1_Project/Assets/Scenes/TestingGround_Small/Lightmap-0_comp_light.exr
# UOP1_Project/Assets/Scenes/TestingGround_Small/Lightmap-1_comp_dir.png
# UOP1_Project/Assets/Scenes/TestingGround_Small/Lightmap-1_comp_light.exr
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 年前
Dan Young
268ab82e
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
Amel
2c9810c9
Merge branch 'main' into interaction
4 年前
Chema Damak
8a166bf0
Merge branch 'interaction' of https://github.com/UnityTechnologies/open-project-1 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 年前
Ciro Continisio
f96d9f1e
Input and Camera tweaking
4 年前
Ciro Continisio
f6be0d86
Input and Camera tweaking
4 年前
Dan Young
7ce66d74
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
Amel Negra
a3fdb227
Merge branch 'main' into whiteboxing
4 年前
Hey-Mikelangelo
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 年前
GitHub
d0298f3d
Merge pull request #3 from UnityTechnologies/art-assets
Art assets
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 年前
Ciro Continisio
9d05162d
Merge branch 'main' of https://github.com/Hey-Mikelangelo/open-project-1 into pr-bash
4 年前
Amel Negra
decd485f
Added persistentManagers and gameplay scenes to build settings
4 年前
Amel Negra
e8d73e33
Merge branch 'scenes-re-architecture' into main
4 年前
Ciro Continisio
8cfe9d97
ProjectSettings
4 年前
GitHub
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 年前
GitHub
54240307
Devlog 3: Handling complex input ( #307 )
Project upgrade to 2021.1
4 年前
Ciro Continisio
c3c044c3
Gitignore and Project settings updates
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 年前
Ciro Continisio
10a426d8
Scenes moved around
4 年前
Dane Byrd
c6beedc4
Merge branch 'art-assets' into ground_shader
4 年前
uChema
0f397e96
Merge branch 'main' into QuestSystem
4 年前
Ciro Continisio
29b0e551
Project version
4 年前
GitHub
81481d8b
Merge pull request #4 from UnityTechnologies/main
update my local branch
4 年前
Ciro Continisio
290cf250
Merge branch 'pr-bash' into main
4 年前
Ciro Continisio
89d048fc
Package updates
4 年前
alex
2f536097
Merge remote-tracking branch 'upstream/main' into main
4 年前
GitHub
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 年前
GitHub
762d050f
Merge pull request #6 from UnityTechnologies/main
Updating my branch
4 年前
Ciro Continisio
2fec19c4
Update to 2019.4.19f1
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
334de1f1
Part 1
4 年前
Ciro Continisio
423633f0
Updated to 2019.4.20f1
4 年前
GitHub
b5417125
Merge pull request #7 from UnityTechnologies/main
Updating my local repository
4 年前
Yohann Puyhaubert
0b3da4fa
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
4 年前
Ciro Continisio
953afd39
Merge branch 'loading-refactor' into pr-bash
# Conflicts:
# UOP1_Project/Assets/Prefabs/GameplayEssentials/SceneLoader.prefab
4 年前
Ciro Continisio
dbb87e76
More Addressables
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
3 年前
GitHub
c0b2931f
Merge pull request #1 from UnityTechnologies/main
Update fork
3 年前
Amel
7b1ed2b2
Merge branch 'main' into UI
3 年前
Ciro Continisio
0509be25
Refactored the whole cold startup mechanism
3 年前
uChema
e4b71f99
Add controls
3 年前
uChema
5d435a5e
Merge branch 'main' into UI
3 年前
Ciro Continisio
2d718f1c
Merge branch 'main' into vegetation-tweaks
# Conflicts:
# UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
3 年前
Ciro Continisio
cd038ff9
IET packages imported
3 年前
Amel Negra
e0ede3d5
Merge branch 'main' into AmelMain
3 年前
Ciro Continisio
b5a142b5
Updated to 2020.3.7f1
3 年前
uChema
3ce06cf5
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Ciro Continisio
bc17972b
Merge branch 'main' into iet
# Conflicts:
# UOP1_Project/Packages/manifest.json
3 年前
Amel Negra
c094f333
Merge branch 'main' into AmelMain
3 年前
uChema
167ca847
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Amel Negra
ddcc378c
Merge branch 'main' into AmelMain
3 年前
Ciro Continisio
be943453
Scenes are all connected
3 年前
uChema
50525348
Fix Quest Tool : Add Remove buttons and AddDialogue Buttons
3 年前
Ciro Continisio
bad80c8c
Updated ProBuilder and Polybrush
Also enabled ProBuilder experimental features
3 年前
Ciro Continisio
6bf9cfe1
Merge remote-tracking branch 'tech-mkt/main'
3 年前
Ciro Continisio
47ed0d6a
Merge branch 'main' into worldbuilding
3 年前
uChema
735363c3
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Amel
6f206e69
Merge remote-tracking branch 'origin/main' into mainAmel
3 年前
Ciro Continisio
59efe5a3
Rock prefabs
3 年前
Ciro Continisio
c0958996
Updated project to 2020.3.12f1
Updated relevant packages
Fixed 2 animation clips that behaved differently
3 年前
uChema
37e5adb2
Fix Quests SO
3 年前
uChema
eab4c107
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
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 年前
uChema
71dcdcfd
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Ciro Continisio
86579ca9
Camera tweaks
Tweaks to the prefab
Added Ground layer, camera now avoids that (but landmasses not on the Ground layer yet)
3 年前
uChema
b768a7dc
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Ciro Continisio
e858cef4
Market landmasses
3 年前
Ciro Continisio
93832439
Landmass work
3 年前
Amel Negra
a676cd5d
Merge remote-tracking branch 'origin/main' into main
3 年前
Amel Negra
120c5b08
Added pause audio signal for cutscene
3 年前
uChema
4ad4a353
Settings System
3 年前
uChema
dc07bb35
Merge remote-tracking branch 'upstream/main' into main
3 年前
uChema
41cc566f
Merge Settings with main
3 年前
uChema
0e1137be
Adding Icons + New Interaction system
3 年前
uChema
f29c7129
Add Icons placeholders - Set Game Scene UI - Add Aggro System
3 年前
uChema
1eaafa64
Add Rolling credits to GameplayScene
3 年前
Amel
22980250
Merge remote-tracking branch 'origin/main' into main
3 年前
uChema
2e7057c0
Error message when can't cook
3 年前
uChema
5c14c0b9
Update Switch tab button display to show both controls
3 年前
Ciro Continisio
b622ace5
Updated to 2020.3.17f1
3 年前
Ciro Continisio
2ffae207
General changes
3 年前
Ciro Continisio
61a205d5
Changed ProjectSettings
Bumped version to 1.0
Enabled Incremental GC
Changed Splash Screen
Introduced stripping of unused meshes
3 年前