Chema Damak
fab44b36
Merge fixes completed
4 年前
Chema Damak
e7bcdcfd
Fixing the merge
4 年前
uChema
dd1963d1
[Bot] Automated dotnet-format update
4 年前
uChema
7f7c4818
Fix Merge
4 年前
uChema
7ece782e
Merge branch 'main' into QuestSystem
4 年前
uChema
47ad6cc8
[Bot] Automated dotnet-format update
4 年前
uChema
2f8fcd7c
Merge branch 'QuestSystem' of https://github.com/UnityTechnologies/open-project-1 into QuestSystem
4 年前
uChema
837d24dd
Fix Shared Tables (Localization) conflict.
4 年前
uChema
821d5ccf
[Bot] Automated dotnet-format update
4 年前
uChema
0f397e96
Merge branch 'main' into QuestSystem
4 年前
uChema
b48675a8
Add italian locale
4 年前
uChema
4995dad7
Merge branch 'pr/290' into QuestSystem
4 年前
uChema
3ab7bd4b
Remove test questline
4 年前
Dan Young
eb670224
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
uChema
4e8cb14b
Replace Dialogue lines with Localized string, Fix Quest System with questline
4 年前
uChema
964f7361
New Quest System with Questlines
4 年前
uChema
13a140e3
[Bot] Automated dotnet-format update
4 年前
uChema
008bad73
Fix Merge
4 年前
uChema
c28d9833
Merge branch 'main' into QuestSystem
4 年前
uChema
f826d844
Merge branch 'QuestSystem' of https://github.com/UnityTechnologies/open-project-1 into QuestSystem
4 年前
uChema
62b1e728
[Bot] Automated dotnet-format update
4 年前
uChema
88cf490e
Fix interaction Manager
4 年前
uChema
7ba49641
Merge branch 'QuestSystem' of https://github.com/UnityTechnologies/open-project-1 into QuestSystem
4 年前
uChema
01c0ef6b
Modify Quest1
4 年前
Smurjo
90fe71a7
critter eggs, critter seeds and chicolade
Fantasy food ingredients obtained from critters.
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 年前
uChema
2aa92a2d
Merge
4 年前
Amel Negra
76588955
moved script to scripts scene management folder
4 年前
Amel Negra
a6b2a938
Using bool instead of event because on the same GO
4 年前
Amel Negra
a60986ee
updated loading screen
4 年前
Amel Negra
d78abfcb
to do added
4 年前
Amel Negra
03bdc2e4
Now loading screen works
4 年前
Amel Negra
03efa5a6
renamed the prefab in the scene to SceneLoader
4 年前
Amel Negra
eb568505
renamed LocationLoader to SceneLoader
4 年前
Amel Negra
d00568b8
Added the event for editor initializer and updated prefabs to ref it
4 年前
Amel Negra
1fe9c023
Added method to broadcast that scene is ready (Press play from any sc)
4 年前
Amel Negra
f558e77c
removed unused variable in location loader
4 年前
Amel Negra
38fdca31
Made GameSceneSo TextArea to better see scenes descriptions
4 年前
Amel Negra
62cef1ec
renamed LocationLoader prefab to SceneLoader
4 年前
Amel Negra
a98227d6
images for loading screen tests
4 年前
Amel Negra
403824da
major changes on location loader to fit the new scene re architecture
4 年前
Amel Negra
466ba8a5
added event ref to spawn prefab
4 年前
Amel Negra
33c5fde8
Added listener to scene ready event in spawn manager
4 年前
Amel Negra
5d87a633
Pushing scenes
4 年前
Amel Negra
35619468
Added onSceneReady event to inform when scene is loaded and set active
4 年前
Amel Negra
a2507600
removed unused class
4 年前
Amel Negra
fca4d219
Menu and location specific editor initializers
4 年前
Amel Negra
decd485f
Added persistentManagers and gameplay scenes to build settings
4 年前
Amel Negra
1492ed7f
Added PersistentManagers scene
4 年前
Amel Negra
f86d071b
Added LoadMenu specific channel
4 年前