GitHub PushEvent at 2014-11-20 04:51:34
Repository: TheTraveler
Actor: drobbs
Payload: {"shas":[["6d545eb8b16bf4f8b868d5224f5c38b9b2206716","fb6f284518f8a628ffbe92498b921269bc49a2ab@yahoo.com","Merging Damiens work\n\ntried merging damiens updates, but git said I had to commit my changes\nor else I would lose them. This commit can be disregarded.","jajav33",false],["2e19aa309b01ebf84ca34ef212091230d855e3a6","fb6f284518f8a628ffbe92498b921269bc49a2ab@yahoo.com","Adding GUIs like crazy\n\n+Keep creating GUIs\n+Created function so MapEvent can call the game controller when an event\noccurs. Function is called DoAction( str eventtype, str resourcetype ).\nResource type can be null if eventype does not require a resource.","jajav33",false],["a34fb9f4ee03ebf40203418b47104dbc32e88706","fb6f284518f8a628ffbe92498b921269bc49a2ab@yahoo.com","Added Movement GUI No integration\n\n+Added Movement GUI but no integration. +Changed the Dice Roll to 1 die\n6 sides.\n+Added End Turn Button for PathToTake\n\nLeft to do:\nJust waiting on movement controls and this state will be complete for\nGUIs","jajav33",false],["4c6043a84442f7fd36db453761722bb861defaa1","a0c4e461fbce920575728c50faea205caebac185@gmail.com","Fixed the conflict issues of PR#38","Damien",false],["bcf8586502458b645855e75db0661bd4e365b52d","31654ac4662c88203dc9e9c6d6afb7012dab9178@users.noreply.github.com","Merge pull request #39 from GSP362DeVryNov2014/jajav33-master\n\nThe branch used for fixing the conflicts in PR#38 by Javier","Damien",true]],"size":5,"ref":"refs/heads/master","head":"bcf8586502458b645855e75db0661bd4e365b52d"}