GitHub PushEvent at 2014-11-13 18:54:10
Repository: Bond-O-Friendship
Actor: setrapp
Payload: {"shas":[["a8ac7c956087170afc4624792103d49abc99e01e","6dffc842831cf209a4018b7502a7956d2e488be6@IGMGRAD-12.main.ad.rit.edu","ok","unknown",false],["5626475804d73510770cbd951362a0060e58181d","6dffc842831cf209a4018b7502a7956d2e488be6@IGMGRAD-12.main.ad.rit.edu","Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into develop\n\nConflicts:\n\tAssets/Depth Mask Example/Meshes/Materials/Water.mat","unknown",false],["b86136045feb627c397c8fe4e77da1adc6cb7048","bc5dcbfafd2e0cc28202e0d0a3952b9a8133a491@g.rit.edu","Merge branch 'feature/generative_experiments' of https://github.com/arun-abraham/Bond-O-Friendship into feature/generative_experiments","Arun Abraham",false],["29f0a779462e5c7625969573ce6c3cff26e98906","bc5dcbfafd2e0cc28202e0d0a3952b9a8133a491@g.rit.edu","Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into feature/generative_experiments","Arun Abraham",false],["a5a72d1fd82e38516eebb42df28867e93973e697","6dffc842831cf209a4018b7502a7956d2e488be6@IGMGRAD-12.main.ad.rit.edu","Tinkering with Scenes. Created RingBreaker prefab","unknown",false],["4cd5da119acfe77758ac4e977baa27c3ec8d7899","6dffc842831cf209a4018b7502a7956d2e488be6@IGMGRAD-12.main.ad.rit.edu","Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into develop\n\nConflicts:\n\tAssets/Scenes/prototype.unity","unknown",false],["b623cef482e8bb2983e1ce967423d70a0ddb5c64","6dffc842831cf209a4018b7502a7956d2e488be6@IGMGRAD-12.main.ad.rit.edu","no message","unknown",false],["810fb7ab8a9bbb5f3371ba732e2c70f7098d936a","6dffc842831cf209a4018b7502a7956d2e488be6@IGMGRAD-12.main.ad.rit.edu","Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into develop","unknown",false],["465bd4d79634c66b58e831e4c3584e96e106a438","bc5dcbfafd2e0cc28202e0d0a3952b9a8133a491@IGMGRAD-14.main.ad.rit.edu","Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into feature/generative_experiments","unknown",false],["e1bb9e47bf74c592637c74567aacaf3b60a3cf74","bc5dcbfafd2e0cc28202e0d0a3952b9a8133a491@IGMGRAD-14.main.ad.rit.edu","Merge branch 'feature/generative_experiments' of https://github.com/arun-abraham/Bond-O-Friendship into feature/generative_experiments","unknown",false],["cc2ebd33fa6165cbb1b34d6b1faa53941c463196","3e5f5c6f48d35ff5dedc8ad22346aae7600221c0@rit.edu","Wow, rigidbody makes this stuff waaaaay easier than character controller.","Sam Trapp",false],["b21c2b75780cc6ee083be1d7cb88dba8aac4d38f","3e5f5c6f48d35ff5dedc8ad22346aae7600221c0@rit.edu","Testing dandelion visuals.","Sam Trapp",false],["351c9e355ec045314375249c78305d7e061566cb","4251a2ec4acb5f995fe3505e4a605393d41d7416@g.rit.edu","Added cube puzzle, and discovered that particle effect velocities can be manipulated through script.","Bryan O'Neill",false],["0d3bca7a413d88c8d7c28e62561c9001cbf95d67","4251a2ec4acb5f995fe3505e4a605393d41d7416@g.rit.edu","Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into develop\n\nConflicts:\n\tAssets/Scenes/prototype.unity","Bryan O'Neill",false],["aea85259bf925eaeb3eb1874097b7b19cd2b4230","3e5f5c6f48d35ff5dedc8ad22346aae7600221c0@rit.edu","Added mouse aiming to keyboard controls.","Sam Trapp",false],["8b004d78f249db678f6eae6f981c3bbe27d85db0","3e5f5c6f48d35ff5dedc8ad22346aae7600221c0@rit.edu","Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into develop\n\nConflicts:\n\tProjectSettings/TagManager.asset","Sam Trapp",false],["b30afabafaecfd61b39aae249f77ef892c5fe2c3","3e5f5c6f48d35ff5dedc8ad22346aae7600221c0@rit.edu","Create separated 'cradles' for players.\nCreated opaque layer to collide with pulses and connections, as well as translucent layer to ignore collisions with pulses and connections.","Sam Trapp",false],["3d817e435b1dbc13c41d198659454bc34eadd609","3e5f5c6f48d35ff5dedc8ad22346aae7600221c0@rit.edu","Merge branch 'feature/tutorial' into develop","Sam Trapp",false],["d71e7f3d000f133c8bf5956bcfc7543d02c98720","3e5f5c6f48d35ff5dedc8ad22346aae7600221c0@rit.edu","Changing mover stats when in open 'space'","Sam Trapp",false],["61da33e3595a516a24e73c5f3aca46f4faca184b","bc5dcbfafd2e0cc28202e0d0a3952b9a8133a491@g.rit.edu","Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into feature/generative_experiments","Arun Abraham",false]],"size":102,"ref":"refs/heads/master","head":"9068948e4c50394b7b1bb2f8f887edb12a38ab50"}