YOOOOOO
Merge commit '644fe830e02d96304ba25939a4f3dea400a78a01' into LevelDesign

Conflicts:
	Assets/Scenes/LevelDesign2.unity
Level design Edit

Added space in some choke points

Thickened terrain colliders

New navmesh
#117 Final Audio

EfffectSystem
-Note: many sounds are too quiet or too loud even after changing volume settings
-EffectManager not playing sounds quite right, currently not being used
-Sounds working for: boss and player lasers, minion explosions, music, minion explosions, mortar explosions
idk lol
Merge commit '6fff084f6a4033f3f389cbd2345fa1cd72b6af0b' into LevelDesign

Conflicts:
	Assets/LevelDesignImport/New Terrain 1.asset
Merge remote-tracking branch 'origin/master' into audio_integration
Worked on LevelDesign2

Added Drop Pod Model
Building placement modifications
added rock wall to water
New solid texture
#117 Final Audio

EffectSystem
- All sounds outside of Boss movement implemented, see issue for further details
#117 Final Audio

EffectSystem
- Applied music volume settings to level manager prefab
Indicators
- Implemented an ammo ring indicator for both shotgun and beam rifle
Indicators
- Work on reimplementation of Immunity pickup
- No longer timed and instead creates shield that lasts until destroyed by enemies
Added new texture pack.

Changed grass texture for LevelDesign2 scene
Added new building textures for LevelDesignNewTextures, use this scene to preview some sample textures
rotated directional light. literally, thats all i did
Merge pull request #151 from ModSquadWorkshop/visual_effects

Player and Boss Size
Merge pull request #144 from ModSquadWorkshop/audio_integration

Audio integration
Merge branch 'master' into feedback

Conflicts:
	Assets/Prefabs/Perks/BeamRifleDrop.prefab
	Assets/Prefabs/Perks/ShotgunDrop.prefab
	Assets/Prefabs/Player.prefab
Merge pull request #147 from ModSquadWorkshop/feedback

Indicators
Player Sinking Fix
closes #140
- Super hacky fix, just manually set the player's height to 0 in fixed update.
Merge pull request #152 from ModSquadWorkshop/iss140

Player Sinking Fix