Jason Durand 01 4d59cedef3 Merge remote-tracking branch 'origin/dev' into jason ...

# Conflicts:
#	Assets/Scripts/AIEntity.cs
#	Assets/Scripts/GameFlowManager.cs

2022-04-03 13:25:16 -04:00

..

JasonScene.unity

Pause menu!

2022-04-03 13:21:15 -04:00

JasonScene.unity.meta

Pause menu!

2022-04-03 13:21:15 -04:00

Main Menu.unity

Pause menu!

2022-04-03 13:21:15 -04:00

Main Menu.unity.meta

Main menu

2022-04-02 16:30:32 -04:00

SampleScene.unity

merge Soulaha into dev

2022-04-03 03:02:31 -04:00

SampleScene.unity.meta

Initial commit

2022-03-30 20:31:37 -04:00

SoulahaScene.unity

merge Soulaha into dev

2022-04-03 03:02:31 -04:00

SoulahaScene.unity.meta

merge Soulaha into dev

2022-04-03 03:02:31 -04:00

YannTest.unity

Entities drop shadows

2022-04-03 11:00:07 -04:00

YannTest.unity.meta

Lights

2022-04-03 10:46:00 -04:00