Feature interactable objects

PIE-NU / Expedition-2018

Our game developed as part of the 2018 Expedition!

0 stars 0 forks source link

Feature interactable objects #14

Closed AlexMartin4 closed 6 years ago

AlexMartin4 commented 6 years ago

New scripts for interactable objects
Trigger(Interactable)/Receiver(Interactor) work in tandem
Created Example for a pushable object in the test scene

murfalo commented 6 years ago

Hey @AlexMartin4! There is a merge conflict in one of the scene files. Please revert the changes you made to this scene file and instead include whatever changes you made in a separate scene file. We can then combine the scenes when at the next team meeting.

After you have done so, I'll go through and fix the remaining merge conflicts as they are trivial and merge the PR.