Skip to content

Tags: fpruitt/ViatorVR

Tags

v0.2.1

Toggle v0.2.1's commit message
Merge branch 'dev' of https://github.com/fpruitt/ViatorVR into dev

# Conflicts:
#	ViatoR/Content/ExampleContent/VR_Trace_Interaction/Blueprints/TraceInteractionPawn.uasset
#	ViatoR/Content/Sounds/broom.uasset
#	ViatoR/Content/Sounds/broom2.uasset
#	ViatoR/Content/Sounds/chair.uasset
#	ViatoR/Content/Sounds/chalk.uasset
#	ViatoR/Content/Sounds/chalkboard.uasset
#	ViatoR/Content/Sounds/clock.uasset
#	ViatoR/Content/Sounds/desk.uasset
#	ViatoR/Content/Sounds/door.uasset
#	ViatoR/Content/Sounds/drink.uasset
#	ViatoR/Content/Sounds/eraser.uasset
#	ViatoR/Content/Sounds/floor.uasset
#	ViatoR/Content/Sounds/lamp.uasset
#	ViatoR/Content/Sounds/lightswitch.uasset
#	ViatoR/Content/Sounds/locker.uasset
#	ViatoR/Content/Sounds/notebook.uasset
#	ViatoR/Content/Sounds/outlet.uasset
#	ViatoR/Content/Sounds/pen.uasset
#	ViatoR/Content/Sounds/podium.uasset
#	ViatoR/Content/Sounds/speaker.uasset
#	ViatoR/Content/Sounds/trashcan.uasset
#	ViatoR/Content/Sounds/wall.uasset
#	ViatoR/Content/Sounds/window.uasset

v.02

Toggle v.02's commit message
Merge pull request #1 from fpruitt/dev

Release 0.2