Jason Durand 01 91961f6622 Merge remote-tracking branch 'origin/dev' into jason ...

# Conflicts:
#	Assets/Scripts/PlayerMovement.cs

2022-04-04 01:16:28 -04:00

..

Animations

Correct playerAnimationController

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

Prefabs

Merge remote-tracking branch 'origin/dev' into jason

2022-04-04 01:16:28 -04:00

Scenes

Merge remote-tracking branch 'origin/dev' into jason

2022-04-04 01:16:28 -04:00

Scripts

Merge remote-tracking branch 'origin/dev' into jason

2022-04-04 01:16:28 -04:00

Settings

added better keyboard inputs

2022-04-03 16:58:31 -04:00

Sound

Music placeholder

2022-04-03 18:24:10 -04:00

Sprites

Merge remote-tracking branch 'origin/dev' into jason

2022-04-04 01:16:28 -04:00

TextMesh Pro

Correct playerAnimationController

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

Xelu_Free_Controller&Key_Prompts

Added control icon set

2022-04-02 22:29:55 -04:00

Animations.meta

Player sprite

2022-04-02 18:58:13 -04:00

AudioMixer.mixer

Sound manager

2022-04-02 00:45:56 -04:00

AudioMixer.mixer.meta

Sound manager

2022-04-02 00:45:56 -04:00

PauseVolumeProfile.asset

Pause menu!

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

PauseVolumeProfile.asset.meta

Pause menu!

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

Prefabs.meta

Initial commit

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

Scenes.meta

Initial commit

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

Scripts.meta

Initial commit

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

Settings.meta

Initial commit

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

Sound.meta

SFX imported

2022-04-03 14:45:39 -04:00

Sprites.meta

Highlight halo

2022-04-02 15:00:06 -04:00

TextMesh Pro.meta

Minion bar start

2022-04-01 23:21:49 -04:00

Xelu_Free_Controller&Key_Prompts.meta

Added control icon set

2022-04-02 22:29:55 -04:00

Zero Friction.physicsMaterial2D

Actually use rigidbody2d

2022-04-01 23:50:33 -04:00

Zero Friction.physicsMaterial2D.meta

Actually use rigidbody2d

2022-04-01 23:50:33 -04:00