GitHub PushEvent at 2014-03-15 00:39:15
Repository: ScenesOfAnarchy
Actor: ArmandSaro
Payload: {"shas":[["77eaac1af9ed005686bc2bd8f4918764ab89c6f9","b039e85b17ea3dfad0991eaa8be7f522acecd8ba@users.noreply.github.com","Merge pull request #4 from CSUNProjectAnarchy/master\n\ngetting the latest update from master","bardiakeyvani",true],["b788fb9c36358ae0cfe0fa27391ab9ead373f3bb","0c8a604ec63e958db99db2870eff1954799ab7a2@rocketmail.com","Added Dialogs Folder/User input for Blocks in TOD\n\nThe Dialogs folder contains all relevant data for the Pop Up GUI for\nTOD.","Michael",true],["88c09a7689ad48ff2f3871ed9d3b794784bceff7","0c8a604ec63e958db99db2870eff1954799ab7a2@rocketmail.com","Merge branch 'master' of https://github.com/CSUNProjectAnarchy/ScenesOfAnarchy","Michael",true],["4926544e99abf3df85f55ad679f03e24cee42154","697060a7b4a78c4a9a0a7ed63444426e6cde7584@my.csun.edu","Particle Rain\n\nNeeds to clean","Ian Graham",true],["7cb0531ed12b789a85bf376d9b54dea604601f2a","6be01692a637b2ef5494b6bad71196487ae462b7@gmail.com","water scene","bardiakeyvani",true],["35c0ae545bc0e4c90b9e4ec0dec14defe97fccaa","b92b4c334cbbcadd223972b392386fbb982c9c4b@gmail.com","Merge pull request #1 from bardiakeyvani/id8/28-37\n\nGetting Bardias Updates","Juan",true],["4de9246130893530d935106957a4ad78c607200a","b92b4c334cbbcadd223972b392386fbb982c9c4b@gmail.com","Merge pull request #2 from CSUNProjectAnarchy/Ian-to-be-merged\n\nMergin Bardia and Ian","Juan",true],["c75255a9401ca1ea79e247a902ad7cfdf4f6f693","5567c406590ac26aa37242e43e64c1d071205da3@gmail.com","Merge pull request #7 from juanflores631/master\n\nGetting Juan's master branch (Bardia + Ian)","Carlos",true],["472ab63181b8c615dbb7e62bd74371bbede91180","5567c406590ac26aa37242e43e64c1d071205da3@gmail.com","Drain works","Carlos",true],["2ff0d829b1bd3ce1d419b6834413bc2a28321182","5567c406590ac26aa37242e43e64c1d071205da3@gmail.com","Defined camera for platforms\n\nWindows loads a static (non-moving) camera. For Android  implemented a\nfree camera. Fixed some wrong logic with drain.","Carlos",true],["bd28f4eca747a8b47612e1f11c4c4383de6dd8d2","5567c406590ac26aa37242e43e64c1d071205da3@gmail.com","Moved Water Simulation Controller logic to IController\n\nCreated methods in IController to be used in Water Simulation\nController. Triggerbox gets casted every time, need to find a work\naround that since it might affect performance if we're casting it every\nframe that we're draining. Tub texture isn't rendered yet for debugging\npurposes.","Carlos",true],["cdd26188d8ca1eb4177a689cf6d21a75fc39e24a","bea633fc622d4557b1e813fd7fe3a69221b26845@my.csun.edu","Commit working TOD dialog on windows\n\nThe dialog works on windows. There is a bug where the dialog does not\nclose.","Brian Marroquin",true],["cd006d4ce5af9e10ea0b8fd51b24e1126a073abe","bea633fc622d4557b1e813fd7fe3a69221b26845@my.csun.edu","Working tod menu system.","Brian Marroquin",true],["70d6a212d7d3fcb77fd159a5a9348a9f5940b7f4","bea633fc622d4557b1e813fd7fe3a69221b26845@my.csun.edu","Mereged Ian to be merged into master","Brian Marroquin",true],["8c66667b9020c7b2dcebe89e0638f476d38385bb","bea633fc622d4557b1e813fd7fe3a69221b26845@my.csun.edu","Fixed unhandled merged conflict","Brian Marroquin",true],["b957fd9636bb568d60164e939312d657c0ad75b5","bea633fc622d4557b1e813fd7fe3a69221b26845@my.csun.edu","Fixed merge conflicts from water simulation","Brian Marroquin",true],["f64489343fcf8389ad2db1403e94d46008582cb1","3929dd38ee3575e909c6f89ec56ad08096f6cfc1@my.csun.edu","Merge pull request #3 from CSUNProjectAnarchy/master\n\nUpdate master","Armand Saroghlanian",true]],"size":17,"ref":"refs/heads/master","head":"f64489343fcf8389ad2db1403e94d46008582cb1"}