Ciro Continisio
953afd39
Merge branch 'loading-refactor' into pr-bash
# Conflicts:
# UOP1_Project/Assets/Prefabs/GameplayEssentials/SceneLoader.prefab
4 年前
Bronson Zgeb
dcb17d52
[Bot] Automated dotnet-format update
4 年前
Bronson Zgeb
da00990f
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Bronson Zgeb
81d376d9
Merge branch 'CybernetHacker14-save-system' into main
4 年前
Bronson Zgeb
5d81bec6
Removed BinaryFormatter and Refactor.
Removed the BinaryFormatter because it's unsafe to use, so we're currently serializing and deserializing to json.
Refactored the code for simplicity and readability.
4 年前
Bronson Zgeb
efec78c5
Merge branch 'save-system' of https://github.com/CybernetHacker14/open-project-1 into CybernetHacker14-save-system
4 年前
Ciro Continisio
b53cf466
Fix to Editor scripts blocking the build process
4 年前
Ciro Continisio
f023e9d4
Imported polished animations
4 年前
BrettHuang
f726b402
[Bot] Automated dotnet-format update
4 年前
GitHub
7ae9d134
Add feature to localization : Localize TMP font ( #290 )
* Localize TMP font
LocalizeTMProFontEvent.cs - Component to localize a TMP_FontAsset
LocalizeComponent_TMProFont.cs - TextmeshProUGUI context menu "Localize String And Font"
* Auto set up the Localize TMPro Font Event component
4 年前
Ciro Continisio
ee3efeff
Prefab renaming and relocation
4 年前
gheraibia
80ca65d4
[Bot] Automated dotnet-format update
4 年前
GitHub
4df86a3d
Pathway Component ( #371 )
* Pathway component
* Pathway component
* Pathway component
* Pathway component
* Pathway component
* Pathway component
* Update PathwayGizmo.cs
* Update PathwayGizmo.cs
* Update PathwayGizmo.cs
* Update PathwayGizmo.cs
* Update PathwayGizmo.cs
* Update PathwayGizmo.cs
* Pathway component
* Pathway component
* Pathway component
* Pathway component
* Update PathwayEditor.cs
* Pathway component
* Update PathwayEditor.cs
* Pathway component
* Update PathwayGismos.cs
* Pathway component
* Update PathwayEditor.cs
* Update PathwayEditor.cs
* Pathway component
* Pathway component
* Update PathwayEditor.cs
* Update PathwayEditor.cs
* Pathway component
Not doing polls at this time.
* Update PathwayGismos.cs
* Update PathwayGismos.cs
* Pathway component
* Update PathwayEditor.cs
* Update PathwayEditor.cs
* Pathway component
* Pathway component
* Pathway comp...
4 年前
Ciro Continisio
477798f0
Relocated temp assets in whiteboxing folder
4 年前
Ciro Continisio
bd33c8df
Merge branch 'main' of https://github.com/Smurjo/open-project-1 into pr-bash
4 年前
Ciro Continisio
d60ad152
Merge remote-tracking branch 'tech-mkt/main' into main
4 年前
Ciro Continisio
6acf65d7
Tweaked emission graph, added textures
4 年前
Ciro Continisio
363ab4fa
Merge branch 'main' of https://github.com/Donkeylipsh/open-project-1 into main
4 年前
vanoverc
e5c6e42f
Emission Support - Converted custom HLSL into Shadergraph Subgraph, and added that to the Toon Shadergraph
4 年前
Ciro Continisio
ff7a6deb
Removed unused script
4 年前
GitHub
f3361761
Merge pull request #3 from UnityTechnologies/main
Latest build
4 年前
Ciro Continisio
91b6456e
Merge remote-tracking branch 'tech-mkt/main' into main
4 年前
GitHub
9f80c6a1
Merge pull request #2 from Donkeylipsh/em1
Shading Model - Emission Support
4 年前
Ciro Continisio
a1d452fc
Addressable settings
4 年前
GitHub
d07ee56f
Merge pull request #1 from UnityTechnologies/main
Latest changes
4 年前
Ciro Continisio
8a53579e
Refactor done
Individual scene starting from the editor not functional
4 年前
Ciro Continisio
7cd4ce12
Merge remote-tracking branch 'tech-mkt/main' into pr-bash
4 年前
Ciro Continisio
f49cd731
Ignore Addressable Data
4 年前
Ciro Continisio
76ed440e
AddressableAsset settings
4 年前
Ciro Continisio
3cf5b804
Moved scenes
4 年前
Ciro Continisio
48f41150
Simplified GameSceneSO and SceneSelector
4 年前
Ciro Continisio
423633f0
Updated to 2019.4.20f1
4 年前
vanoverc
4816946d
Created a Shader Subgraph that applies Emission to a material using CustomEmission.hlsl, and added Emission to the Toon Shadergraph
4 年前
Nathan V
3ba4a5e6
More Accessories
Clothes:
Belt
Cavalier Hat
Lappvattnet
RuffCollar
ToolBelt
Tudor
Items:
HayStraw
Lute
PanFlute
PitchFork
Tambourine
4 年前
Ciro Continisio
334de1f1
Part 1
4 年前
Ciro Continisio
ff1bfdd1
Imported new animations
4 年前
Ciro Continisio
294b77e0
[Bot] Automated dotnet-format update
4 年前
Ciro Continisio
c799113a
Small tweaks to UI Fader
Still not functional
4 年前
Ciro Continisio
b0118308
Merge branch 'main' of https://github.com/ZombieNub/open-project-1 into pr-bash
4 年前
Ciro Continisio
57258669
Merge branch 'main' into pr-bash
4 年前
Ciro Continisio
3d347e8f
Slime droplets adjustments
4 年前
Ciro Continisio
19c74b30
[Bot] Automated dotnet-format update
4 年前
Ciro Continisio
761001e0
Merge branch 'art/slime-critter-droplet' of https://github.com/treivize/open-project-1 into pr-bash
4 年前
Ciro Continisio
28d4d3bb
Attack system overhaul
4 年前
Ciro Continisio
5ad8ad04
Cameramanager fix
4 年前
Ciro Continisio
277b6fc2
Merge branch 'main' of https://github.com/vjs22334/open-project-1 into pr-bash
4 年前
Ciro Continisio
7ea6bfdf
Merge branch 'feature/player-cane-hit-anim-variant' of https://github.com/treivize/open-project-1 into pr-bash
# Conflicts:
# UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AttackTrigger.asset
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AttackTrigger.asset.meta
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AttackTrigger_OnEnter.asset
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AttackTrigger_OnEnter.asset.meta
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsAttacking_False_OnEnter.asset
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsAttacking_True_OnEnter.asset.meta
4 年前
vjs22334
53886896
Removed _spawnDistanceFromPlayer
4 年前
Ciro Continisio
3d4ab5fa
Merge branch 'feature/combat-player-get-hit' of https://github.com/treivize/open-project-1 into pr-bash
# Conflicts:
# UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab
# UOP1_Project/Assets/Prefabs/Characters/PlantCritter.prefab
# UOP1_Project/Assets/Prefabs/Characters/SlimeCritter_Base.prefab
4 年前
Ciro Continisio
b7e86dc9
Merge branch 'main' of https://github.com/AlexandreGheraibia/open-project-1 into main
# Conflicts:
# UOP1_Project/Assets/Prefabs/Characters/Pig/Interaction.prefab
# UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab
4 年前