GitHub PushEvent at 2014-04-02 20:22:07
Repository: SpaceGladiators
Actor: jacobdeichert
Payload: {"shas":[["d722cb3698c1a1ab1260b7d8009bdf85d64be12f","a95b51605527c01bfdb451a9fbd517bf20a4cb4e@bell.net","Ryan Commit .\n\nAdded a Texture to the Obstacle , plus , need physics for obstacle.","Ryan Allan James Holubeshen",false],["4857173b227a799abeaed8780baaaa325da5240c","cf8d4926129a904087a0c39310bcce16ed5b8908@gmail.com","re-inserting game","Odin von Doom",false],["2b0c789c339d93aeaaecce38a0bf9990b0068ade","cf8d4926129a904087a0c39310bcce16ed5b8908@gmail.com","Revert \"Ryan Commit .\"\n\nThis reverts commit d722cb3698c1a1ab1260b7d8009bdf85d64be12f.","Odin von Doom",false],["579004dac07f22ee8a3a94074cbd596306bf6e7c","cf8d4926129a904087a0c39310bcce16ed5b8908@gmail.com","nothing","Odin von Doom",false],["75656fe2ae69a6a979de7a0fc17e87e1678059d1","cf8d4926129a904087a0c39310bcce16ed5b8908@gmail.com","new project without conflict issues","Odin von Doom",false],["0042e583e7552b4e879fabd767b8acf710caa1bc","cf8d4926129a904087a0c39310bcce16ed5b8908@gmail.com","Attempt to use GameWorldManager singleton","Odin von Doom",false],["fdb922554a749439f2b6b75cfa3d53f34ddc8bf0","cf8d4926129a904087a0c39310bcce16ed5b8908@gmail.com","Not much added","Odin von Doom",false],["4e8368634289bea5b89a3fb033196b2627a90e18","cf8d4926129a904087a0c39310bcce16ed5b8908@gmail.com","nothing really","Odin von Doom",false],["ef8313317262476fc0c54d9b22f2e832418abb92","cf8d4926129a904087a0c39310bcce16ed5b8908@gmail.com","Getting images to load, with an error\n\nIf you can figure out what the problem is, go for it.","Odin von Doom",false],["431130b9dca8b39d9673800ec357081bd3b32ddc","a95b51605527c01bfdb451a9fbd517bf20a4cb4e@bell.net","Fixed Errors. Ryan Commit\n\nFixed Image errors . load WITH images. but loads on the same point in\nthe window.","Ryan Allan James Holubeshen",false],["e91e66e9cbbe5283ec54a898bad806bd2f580aac","d3b0d6619fd20d9a34d409d7207986b00edff6df@users.noreply.github.com","Temporary quick fix for error.\n\nRyan will figure out a solution for this.","Jacob Deichert",false],["73ea6d8c0ad6d2f00376d7320340ab45d1748dcf","d3b0d6619fd20d9a34d409d7207986b00edff6df@users.noreply.github.com","Ignore this commit.\n\nONLY USE THIS BRANCH FOR COMMIT HISTORY FOR ALI.\n\nConflicts:\n\tBaseProject/BaseProject/BaseProject/GameObject.cpp\n\tBaseProject/BaseProject/BaseProject/GameObject.h\n\tBaseProject/BaseProject/BaseProject/GameObjectManager.cpp\n\tBaseProject/BaseProject/BaseProject/GameObjectManager.h\n\tBaseProject/BaseProject/BaseProject/Obstacle.cpp\n\tBaseProject/BaseProject/BaseProject/Player.h\n\tBaseProject/BaseProject/BaseProject/main.cpp","Jacob Deichert",true]],"size":12,"ref":"refs/heads/game-logic","head":"73ea6d8c0ad6d2f00376d7320340ab45d1748dcf"}