Ciro Continisio
|
b8753400
|
Merge remote-tracking branch 'tech-mkt/main' into main
|
3 年前 |
|
Ciro Continisio
|
9429e445
|
Imported SlimeCritter animations
|
3 年前 |
|
Ciro Continisio
|
154737ee
|
[Bot] Automated dotnet-format update
|
3 年前 |
|
Ciro Continisio
|
1cd999fc
|
Merge branch 'art-assets' of https://github.com/lpchow/open-project-1 into pr-bash
|
3 年前 |
|
Ciro Continisio
|
8cfe9d97
|
ProjectSettings
|
3 年前 |
|
Ciro Continisio
|
7c088a1f
|
Merge branch 'pr-bash' into main
|
3 年前 |
|
Ciro Continisio
|
6e9237b6
|
Walkling cane as weapon, tweaks to animations
|
3 年前 |
|
Ciro Continisio
|
84e76f64
|
Fixes, typos and tweaks
|
3 年前 |
|
Ciro Continisio
|
162a06e3
|
Refactoring, renaming, comments
|
3 年前 |
|
Ciro Continisio
|
6592ba26
|
Tweaks
Protagonist now moves to Idle state after attack, with the right timing
|
3 年前 |
|
Ciro Continisio
|
e6e1f38f
|
Merge branch 'feature/sub/plant_critter_combat_system' of https://github.com/treivize/open-project-1 into pr-bash
|
3 年前 |
|
Ciro Continisio
|
c925b56b
|
Merge branch 'feature/code/plant_critter_sm' of https://github.com/treivize/open-project-1 into pr-bash
|
3 年前 |
|
Ciro Continisio
|
ef68d3e0
|
Imported WoodenBench
|
3 年前 |
|
Ciro Continisio
|
b15b206e
|
Merge branch 'main' of https://github.com/HarshNarayanJha/open-project-1 into pr-bash
|
3 年前 |
GitHub
|
e7361ebf
|
Images of the Transition Table for docs
|
3 年前 |
Amel Negra
|
86717d66
|
[Bot] Automated dotnet-format update
|
3 年前 |
|
Amel Negra
|
e8d73e33
|
Merge branch 'scenes-re-architecture' into main
|
3 年前 |
|
Ciro Continisio
|
6cbf4d99
|
[Bot] Automated dotnet-format update
|
3 年前 |
|
Ciro Continisio
|
8412c94b
|
Small camera tweak
|
3 年前 |
|
Ciro Continisio
|
9d05162d
|
Merge branch 'main' of https://github.com/Hey-Mikelangelo/open-project-1 into pr-bash
|
3 年前 |
|
Ciro Continisio
|
1f10f375
|
Merge branch 'art-assets' into pr-bash
|
3 年前 |
|
Ciro Continisio
|
0f73b995
|
Renaming and refactoring on UI
|
3 年前 |
|
Ciro Continisio
|
8218bfce
|
[Bot] Automated dotnet-format update
|
3 年前 |
|
Ciro Continisio
|
aa1215c0
|
Package updates
|
3 年前 |
|
Ciro Continisio
|
ec83929b
|
After merge fixes
|
3 年前 |
|
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
|
3 年前 |
|
Ciro Continisio
|
7e93f4c9
|
Bush texture update
|
3 年前 |
|
Ciro Continisio
|
74441aab
|
Fix to load correct light probes
|
3 年前 |
|
GitHub
|
6e9b7f56
|
Fix SceneAccessTool build fail issue (#274)
* Added the Quick Scene Access Tool
* removed unused file
* orgainized script for SceneAccessTool to their proper folders. Build should work now
|
3 年前 |
|
GitHub
|
3977c081
|
ReplaceTool selection and sibling index fix (#277)
* Change Selection to newly created instances
* Keep correct sibling index on replace
|
3 年前 |
|
Ciro Continisio
|
5efb9eed
|
Tweaks to landing particles
|
3 年前 |
|
Ciro Continisio
|
48a39328
|
Merge remote-tracking branch 'davidhenshaw/main' into pr-bash
|
3 年前 |
|
Ciro Continisio
|
6294ecab
|
Merge branch 'art-assets' into pr-bash
|
3 年前 |
