Smurjo
c6862e6f
palm leaf set and lobster
Prefabs for the cooking festival
4 年前
Ciro Continisio
cd138aa3
Imported lobster, palm leaf set, tavern owner's hair
4 年前
Smurjo
178053c0
Almonds, artichokes, cucumbers, lemons, onions, oranges, truffles, vanilla
Almonds, artichokes, cucumbers, lemons, onions, oranges, truffles, vanilla
4 年前
Smurjo
50b64a9a
added ginger, applied transform at Blender fbx export for almonds, artichokes, cucumber and lemons
added ginger
applied transform at Blender fbx export for almonds, artichokes, cucumber and lemons
moved prefabs to prefab folder "food"
4 年前
Smurjo
0c706b8e
applied transform at Blender fbx export for oranges, onions, truffles and vanilla
applied transform at Blender fbx export for oranges, onions, truffles and vanilla
moved prefabs to prefab folder
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 年前
Smurjo
61e85048
Added mangetout
2 slightly different versions plus one with the ends cut off
The texture is 1024x1024.
Triangles:
mangetout pod (2 versions) 380 and 290
mangetout cooked 134
mangetout in box 2885
4 年前
Smurjo
90fe71a7
critter eggs, critter seeds and chicolade
Fantasy food ingredients obtained from critters.
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 年前
Dane Byrd
c6beedc4
Merge branch 'art-assets' into ground_shader
4 年前
uChema
0f397e96
Merge branch 'main' into QuestSystem
4 年前
Smurjo
456c7bdd
Whiteboxing of general map in medium size divided into 6 scenes
- contains minimalistic scene loading and unloading scripts only for trying this out
- contains small editor tool to create views. Don't delete deactivated objects in spawn scene if you want to update the views. There is the issue that the created views are too dark, I suspect it is a problem between the Texture2D-Format and the RenderTexture-Format - I would appreciate advice which formats to use.
- contains few additional art assets like shiitake mushrooms, big trees, bushes and creepers. The bushes are intended only for the whiteboxing to be replaced with more elaborate art assets later. The creepers and big trees are to be refined somewhat if we decide to use them.
To try out the map open the spawn scene and press play in the editor. Make sure all scenes were added to the build settings.
4 年前
Smurjo
e7c4b415
Added cooking festival to whiteboxing of medium scale map
whiteboxing as shown in https://youtu.be/TnBEHHI2FtA
4 年前
Ciro Continisio
bd33c8df
Merge branch 'main' of https://github.com/Smurjo/open-project-1 into pr-bash
4 年前
Ciro Continisio
477798f0
Relocated temp assets in whiteboxing folder
4 年前
Yohann Puyhaubert
068abd40
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
4 年前
uChema
7321e9d0
UI Integration (WIP)
4 年前
Ciro Continisio
91a763b7
Updated project to 2020 LTS
4 年前
uChema
7abf0997
WIP - UI Integration
4 年前
Ciro Continisio
544c3cc9
Eliminated some outlins
4 年前
GitHub
c0b2931f
Merge pull request #1 from UnityTechnologies/main
Update fork
4 年前
Ciro Continisio
293f994f
Merge branch 'graphic-rework'
4 年前
uChema
997b50ae
Merge branch 'main' into pr/393
4 年前
Amel
7b1ed2b2
Merge branch 'main' into UI
4 年前
uChema
0ed45c81
Add Collectible Prefab
4 年前
Ciro Continisio
2d718f1c
Merge branch 'main' into vegetation-tweaks
# Conflicts:
# UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
4 年前
Amel Negra
e0ede3d5
Merge branch 'main' into AmelMain
4 年前
Ciro Continisio
dc51f9ac
More scenery work
4 年前
uChema
d36df8f3
Adding save to disk on questline update
3 年前
uChema
71dcdcfd
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Ciro Continisio
1b98a3e3
Merge branch 'main' of github.com:UnityTechnologies/open-project-1
3 年前
uChema
4413ebd5
Adding missing items + missing questline to a finite quest. Fixing errors.
Use TestingInventory with TestingGround_Questline scene to test the full quest
3 年前
Ciro Continisio
056f6536
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/BardHare.prefab
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/BardHare.prefab.meta
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/FryKing.prefab
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/FryKing.prefab.meta
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/Townsfolk_1.prefab.meta
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/Townsfolk_2.prefab.meta
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/Townsfolk_3.prefab
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/Townsfolk_3.prefab.meta
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/Townsfolk_4.prefab.meta
# UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/Ayud.prefab.meta
# UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/BardHare-Maqam.prefab
# UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/BardHare-Maqam.prefab.meta
# UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/BardHare.pr...
3 年前
itsLevi0sa
340dd8dc
Merge branch 'main' into CaveWhiteboxing
3 年前
Ciro Continisio
33395788
RockCritter egg and Gold RockCritter egg
3 年前
Amel Negra
a676cd5d
Merge remote-tracking branch 'origin/main' into main
3 年前
Ciro Continisio
81c9fb97
Graphic work (mostly Cave)
3 年前
Amel Negra
e9f4e34e
Merge remote-tracking branch 'origin/main' into main
3 年前
uChema
dc07bb35
Merge remote-tracking branch 'upstream/main' into main
3 年前