GSP362DeVryNov2014/TheTraveler — pull request #37 by jajav33 (2014-11-20 00:33:00+00:00)
Title: Adding GUIs like Crazy,  minor conflict error

Hey Damien I had a conflict error, and I think I fixed it, it doesn't show any more atleast. But looking at the merge request, it shows some deletions in the Area01 scene. Not sure if this will be a problem. Maybe we can back up the area01 part from the original just in case. I did add a object to the scene so it might be that moving things around. Anyways...

Added GUIs that were lost in the conflict, and created function in GameplayStateMachine that can call a DoActoin(str MapEventType, str Resroucetype) event. ResourceType can be null.