# Conflicts:
#	Assets/ExampleAssets/Materials/Grid.mat
#	Assets/Materials.meta
#	Assets/Scenes/SampleScene.unity
#	Assets/Scenes/SampleSceneSettings.lighting.meta
#	Assets/Scripts.meta
#	Assets/SteamVR_Input.meta
#	Assets/SteamVR_Input/ActionSetClasses.meta
#	Assets/SteamVR_Input/ActionSetClasses/SteamVR_Input_ActionSet_buggy.cs.meta
#	Assets/SteamVR_Input/ActionSetClasses/SteamVR_Input_ActionSet_default.cs
#	Assets/SteamVR_Input/ActionSetClasses/SteamVR_Input_ActionSet_default.cs.meta
#	Assets/SteamVR_Input/ActionSetClasses/SteamVR_Input_ActionSet_mixedreality.cs.meta
#	Assets/SteamVR_Input/ActionSetClasses/SteamVR_Input_ActionSet_platformer.cs.meta
#	Assets/SteamVR_Input/SteamVR_Actions.asmdef.meta
#	Assets/SteamVR_Input/SteamVR_Input_ActionSets.cs
#	Assets/SteamVR_Input/SteamVR_Input_ActionSets.cs.meta
#	Assets/SteamVR_Input/SteamVR_Input_Actions.cs
#	Assets/SteamVR_Input/SteamVR_Input_Actions.cs.meta
#	Assets/SteamVR_Input/SteamVR_Input_Initialization.cs.meta
#	Assets/XR/XRGeneralSettings.asset
#	ProjectSettings/HDRPProjectSettings.asset
#	UserSettings/EditorUserSettings.asset
#	unityProject.vrmanifest

make damage to balloon

See merge request !8

# Conflicts:
#   Assets/Scripts/PistolScribts/BulletHandler.cs

-

teleporting is now possible

A few known issues:
The bullet flies way faster than the framerate resulting in some weird starting positions of the bullet.
There is no shooting animation yet.

The key to shoot is currently set to space and will be implemented by a VR tester

add teleport

See merge request !6

lightsaber is now grabable again

See merge request !5

TODO: Adjust lightsaber position, apply to prefab

Had to change the barrels mesh and import settings to work. on merge pls revert.

Feature/hangar

See merge request !3