{"push_id":2448120187,"size":484,"distinct_size":0,"ref":"refs/heads/master","head":"ea5f712a6833dc32b01b9e5432af5082333d857a","before":"7efac5bf49a3a0fe38b3c0ed31147fdc8113e93b","commits":[{"sha":"d93481e4ca7f105feb4a5f1c8e847dfd5fa2b5ff","author":{"name":"esolneman","email":"27b3864a57ce18ed22123d0c7e851bfe3012a7b5@gmx.de"},"message":"Set up Prototyp\n\nAdd first Building Module (includs Rooms: Krankenzimmer, Gang01, Kinderzimmer, Garten)\nAdd first Assets, not finish Versions (Bed, Water Dispencer, Doors, Med.Box)","distinct":false,"url":"https://api.github.com/repos/FelixRDL/MergeConflictGames_Subject42/commits/d93481e4ca7f105feb4a5f1c8e847dfd5fa2b5ff"},{"sha":"3d74d20d3026057efcc3ace986b1625ee37f9f57","author":{"name":"esolneman","email":"27b3864a57ce18ed22123d0c7e851bfe3012a7b5@gmx.de"},"message":"Create Scene_0 for first implementations\n\nCreate Buildingpart (Hospitalroom, corridor_0, childsroom)\nAdd interactable Objects (Door, Pill_0, neutralisator, light switch)\nAdd prototyp interior for feeling","distinct":false,"url":"https://api.github.com/repos/FelixRDL/MergeConflictGames_Subject42/commits/3d74d20d3026057efcc3ace986b1625ee37f9f57"},{"sha":"928d4266b4e34738767a44b43676055da590ddaf","author":{"name":"esolneman","email":"27b3864a57ce18ed22123d0c7e851bfe3012a7b5@gmx.de"},"message":"Update Scene_0\n\nAdd Objects (childBed -> not final Version)","distinct":false,"url":"https://api.github.com/repos/FelixRDL/MergeConflictGames_Subject42/commits/928d4266b4e34738767a44b43676055da590ddaf"},{"sha":"745681deb0494210730e37500dc703ffa9c4966e","author":{"name":"Vitus","email":"a4c69ff1bfec433012306123eef359b33718223c@gmail.com"},"message":"Update Prototype\n\nAdd first basic interactions and animations","distinct":false,"url":"https://api.github.com/repos/FelixRDL/MergeConflictGames_Subject42/commits/745681deb0494210730e37500dc703ffa9c4966e"},{"sha":"a8fe7c547c82d3426479abf11a268697a8b04e91","author":{"name":"esolneman","email":"27b3864a57ce18ed22123d0c7e851bfe3012a7b5@gmx.de"},"message":"Added some materials and pictures\nUpdated childsbed asset and added some more furniture (pillow, blanket nightstand)","distinct":false,"url":"https://api.github.com/repos/FelixRDL/MergeConflictGames_Subject42/commits/a8fe7c547c82d3426479abf11a268697a8b04e91"},{"sha":"08cfe4c2b791dc81dee1edbae5ec7d34cbaa850f","author":{"name":"esolneman","email":"27b3864a57ce18ed22123d0c7e851bfe3012a7b5@gmx.de"},"message":"Add pictures (family and teddy sad version)","distinct":false,"url":"https://api.github.com/repos/FelixRDL/MergeConflictGames_Subject42/commits/08cfe4c2b791dc81dee1edbae5ec7d34cbaa850f"},{"sha":"fb40239a69101ad40feb55439f7302e2c90d0677","author":{"name":"Felix Riedl","email":"567db94aec9d2d5616090c5a3c79a87964e6fbd7@gmail.com"},"message":"Add LoFi Dialogues for Level 0 and Level 1","distinct":false,"url":"https://api.github.com/repos/FelixRDL/MergeConflictGames_Subject42/commits/fb40239a69101ad40feb55439f7302e2c90d0677"},{"sha":"ebfbab160a9abd0285fcba2a3e3f76b7e4386fac","author":{"name":"Felix Riedl","email":"567db94aec9d2d5616090c5a3c79a87964e6fbd7@gmail.com"},"message":"Add music assets for level 1","distinct":false,"url":"https://api.github.com/repos/FelixRDL/MergeConflictGames_Subject42/commits/ebfbab160a9abd0285fcba2a3e3f76b7e4386fac"},{"sha":"7a5e90deb02bb751bf3291ee14b078e2c2fae6dd","author":{"name":"Felix Riedl","email":"567db94aec9d2d5616090c5a3c79a87964e6fbd7@gmail.com"},"message":"Fix normalmap for hospital room\n\nSigned-off-by: Felix Riedl <feronimo92@gmail.com>","distinct":false,"url":"https://api.github.com/repos/FelixRDL/MergeConflictGames_Subject42/commits/7a5e90deb02bb751bf3291ee14b078e2c2fae6dd"},{"sha":"6beb346606a1512dc4cfe4fe7ac751c8b08d7e4c","author":{"name":"Felix Riedl","email":"567db94aec9d2d5616090c5a3c79a87964e6fbd7@gmail.com"},"message":"Material Tweaking on Bed and Door Assets\n\nMostly specular tweaking\n\nSigned-off-by: Felix Riedl <feronimo92@gmail.com>","distinct":false,"url":"https://api.github.com/repos/FelixRDL/MergeConflictGames_Subject42/commits/6beb346606a1512dc4cfe4fe7ac751c8b08d7e4c"},{"sha":"db357a7bd0b23acbd2941a8eaed9f4dfcd172c2e","author":{"name":"Felix Riedl","email":"567db94aec9d2d5616090c5a3c79a87964e6fbd7@gmail.com"},"message":"Add Audio Meta files\n\nSigned-off-by: Felix Riedl <feronimo92@gmail.com>","distinct":false,"url":"https://api.github.com/repos/FelixRDL/MergeConflictGames_Subject42/commits/db357a7bd0b23acbd2941a8eaed9f4dfcd172c2e"},{"sha":"b88452bbdb941c89a9ce4b62bb50fbb74d6650a8","author":{"name":"Felix Riedl","email":"567db94aec9d2d5616090c5a3c79a87964e6fbd7@gmail.com"},"message":"Add ceiling tiles material\n\nSigned-off-by: Felix Riedl <feronimo92@gmail.com>","distinct":false,"url":"https://api.github.com/repos/FelixRDL/MergeConflictGames_Subject42/commits/b88452bbdb941c89a9ce4b62bb50fbb74d6650a8"},{"sha":"5dd856fe705cda76ac6d2af5b673d4904bd8be56","author":{"name":"Felix Riedl","email":"567db94aec9d2d5616090c5a3c79a87964e6fbd7@gmail.com"},"message":"Add hospital floor material\n\nSigned-off-by: Felix Riedl <feronimo92@gmail.com>","distinct":false,"url":"https://api.github.com/repos/FelixRDL/MergeConflictGames_Subject42/commits/5dd856fe705cda76ac6d2af5b673d4904bd8be56"},{"sha":"213704f580ddde6a052cbcd9efda7c5f4e4507a3","author":{"name":"Felix Riedl","email":"567db94aec9d2d5616090c5a3c79a87964e6fbd7@gmail.com"},"message":"Add ceiling light asset\n\nSigned-off-by: Felix Riedl <feronimo92@gmail.com>","distinct":false,"url":"https://api.github.com/repos/FelixRDL/MergeConflictGames_Subject42/commits/213704f580ddde6a052cbcd9efda7c5f4e4507a3"},{"sha":"64a2880e335f54ce47a592d8b62d1d026160389f","author":{"name":"Felix Riedl","email":"567db94aec9d2d5616090c5a3c79a87964e6fbd7@gmail.com"},"message":"Add hospital wall material\n\nSigned-off-by: Felix Riedl <feronimo92@gmail.com>","distinct":false,"url":"https://api.github.com/repos/FelixRDL/MergeConflictGames_Subject42/commits/64a2880e335f54ce47a592d8b62d1d026160389f"},{"sha":"4d54d4b8c3987a2f64748e94bcca5497db6b00f4","author":{"name":"Felix Riedl","email":"567db94aec9d2d5616090c5a3c79a87964e6fbd7@gmail.com"},"message":"Added lighting and reflections to the scene\n\nSigned-off-by: Felix Riedl <feronimo92@gmail.com>","distinct":false,"url":"https://api.github.com/repos/FelixRDL/MergeConflictGames_Subject42/commits/4d54d4b8c3987a2f64748e94bcca5497db6b00f4"},{"sha":"b9ca6f678cbf7e3a8040585a11474525a921f75f","author":{"name":"Felix Riedl","email":"567db94aec9d2d5616090c5a3c79a87964e6fbd7@gmail.com"},"message":"First Bake of Lighting and Reflections\n\nSigned-off-by: Felix Riedl <feronimo92@gmail.com>","distinct":false,"url":"https://api.github.com/repos/FelixRDL/MergeConflictGames_Subject42/commits/b9ca6f678cbf7e3a8040585a11474525a921f75f"},{"sha":"b2d47c7c5b97660598eae21ad7ea5dd505301a4d","author":{"name":"Felix Riedl","email":"567db94aec9d2d5616090c5a3c79a87964e6fbd7@gmail.com"},"message":"Add Pill 0 model\n\nSigned-off-by: Felix Riedl <feronimo92@gmail.com>","distinct":false,"url":"https://api.github.com/repos/FelixRDL/MergeConflictGames_Subject42/commits/b2d47c7c5b97660598eae21ad7ea5dd505301a4d"},{"sha":"197c8362b0d1bad559257b94c1b02e121833a358","author":{"name":"Felix Riedl","email":"567db94aec9d2d5616090c5a3c79a87964e6fbd7@gmail.com"},"message":"Add Pill 0 model\n\nSigned-off-by: Felix Riedl <feronimo92@gmail.com>","distinct":false,"url":"https://api.github.com/repos/FelixRDL/MergeConflictGames_Subject42/commits/197c8362b0d1bad559257b94c1b02e121833a358"},{"sha":"9a8c7c606bc42fed65507dee279b5aa6bcfdd718","author":{"name":"Felix Riedl","email":"567db94aec9d2d5616090c5a3c79a87964e6fbd7@gmail.com"},"message":"Merge branch 'Polishing_Branch' of https://bitbucket.org/FelixRDL/game-engineering-2017 into Polishing_Branch","distinct":false,"url":"https://api.github.com/repos/FelixRDL/MergeConflictGames_Subject42/commits/9a8c7c606bc42fed65507dee279b5aa6bcfdd718"}]}
{"actor":{"display_login":"FelixRDL"}}