{"push_id":2491176445,"size":3,"distinct_size":3,"ref":"refs/heads/master","head":"f29cf1a586564c7eeeb8630b785f776ca03c74f6","before":"81239263dbd522756a79737744f474d3897fe224","commits":[{"sha":"545f4dba656ecf9fa593252dc238eb4f20363972","author":{"name":"nomadsinteractive","email":"c6ca2a5eef7ad5d9df50f0045a81b400237b4dbf@gmail.com"},"message":"Deprecating GLModel interface, introducing GLModelLoader interface","distinct":true,"url":"https://api.github.com/repos/nomadsinteractive/ark/commits/545f4dba656ecf9fa593252dc238eb4f20363972"},{"sha":"9db562a6e18f6536ffef1506e11b9a624949c57d","author":{"name":"nomadsinteractive","email":"c6ca2a5eef7ad5d9df50f0045a81b400237b4dbf@gmail.com"},"message":"GLBuffer uploader redesign","distinct":true,"url":"https://api.github.com/repos/nomadsinteractive/ark/commits/9db562a6e18f6536ffef1506e11b9a624949c57d"},{"sha":"f29cf1a586564c7eeeb8630b785f776ca03c74f6","author":{"name":"nomadsinteractive","email":"c6ca2a5eef7ad5d9df50f0045a81b400237b4dbf@gmail.com"},"message":"Merge branch 'master' of https://github.com/nomadsinteractive/ark\n\n# Conflicts:\n#\tCMakeLists.txt\n#\tplugin/assimp/impl/layer/assimp_model_layer.cpp\n#\tsrc/core/forwarding.h\n#\tsrc/graphics/base/transform.cpp\n#\tsrc/graphics/base/transform.h\n#\tsrc/renderer/base/gl_buffer.cpp\n#\tsrc/renderer/base/gl_buffer.h\n#\tsrc/renderer/base/gl_elements.cpp\n#\tsrc/renderer/base/gl_elements.h\n#\tsrc/renderer/base/gl_resource_manager.cpp\n#\tsrc/renderer/forwarding.h\n#\tsrc/renderer/gles30/impl/layer/particle_layer.cpp\n#\tsrc/renderer/impl/gl_model/gl_model_line.cpp\n#\tsrc/renderer/impl/gl_model/gl_model_line.h\n#\tsrc/renderer/impl/gl_model/gl_model_nine_patch.cpp\n#\tsrc/renderer/impl/gl_model/gl_model_nine_patch.h\n#\tsrc/renderer/impl/gl_model/gl_model_point.cpp\n#\tsrc/renderer/impl/gl_model/gl_model_point.h\n#\tsrc/renderer/impl/gl_model/gl_model_quad.cpp\n#\tsrc/renderer/impl/gl_model/gl_model_quad.h\n#\tsrc/renderer/impl/gl_model_loader/gl_model_loader_nine_patch.cpp\n#\tsrc/renderer/impl/gl_model_loader/gl_model_loader_nine_patch.h\n#\tsrc/renderer/impl/gl_model_loader/gl_model_loader_quad.cpp\n#\tsrc/renderer/impl/gl_model_loader/gl_model_loader_quad.h\n#\tsrc/renderer/impl/layer/gl_model_layer.cpp\n#\tsrc/renderer/impl/layer/gl_model_layer.h\n#\tsrc/renderer/impl/layer/image_layer.cpp\n#\tsrc/renderer/impl/layer/image_layer.h\n#\tsrc/renderer/impl/layer/nine_patch_layer.cpp\n#\tsrc/renderer/impl/layer/nine_patch_layer.h\n#\tsrc/renderer/impl/layer/point_layer.cpp\n#\tsrc/renderer/impl/layer/point_layer.h\n#\tsrc/renderer/impl/renderer/shader_frame.cpp\n#\tsrc/renderer/impl/renderer/shader_frame.h\n#\tsrc/renderer/inf/gl_model.h\n#\tsrc/renderer/inf/gl_model_loader.h","distinct":true,"url":"https://api.github.com/repos/nomadsinteractive/ark/commits/f29cf1a586564c7eeeb8630b785f776ca03c74f6"}]}
{"actor":{"display_login":"nomadsinteractive"}}