{"push_id":1000416620,"size":20,"distinct_size":2,"ref":"refs/heads/T6-01-Particle-effects-ingame","head":"46659f823a0044c2b0e1e46ee989d1e9e1abe921","before":"3187b051e5c32b6701306e5289a35ed3bafa339f","commits":[{"sha":"d5348f2b98ba7579ae48de7cf9e085d04e492983","author":{"email":"4994c00839326a1cb39734ec9912c132ba9bd098@gmail.com","name":"Herr Andersson"},"message":"REMOVED atl stuff","distinct":false,"url":"https://api.github.com/repos/rikhardsvensson/StortSpel-Grupp1/commits/d5348f2b98ba7579ae48de7cf9e085d04e492983"},{"sha":"ea8ae8939cd929b36ccca594cdfdec5daa49562c","author":{"email":"4994c00839326a1cb39734ec9912c132ba9bd098@gmail.com","name":"Herr Andersson"},"message":"CHANGED tile to hold a vector of GameObject* instead of an array. This eliminated the creation of a new vector every time the GetAllObjectsOnTile function.","distinct":false,"url":"https://api.github.com/repos/rikhardsvensson/StortSpel-Grupp1/commits/ea8ae8939cd929b36ccca594cdfdec5daa49562c"},{"sha":"26c1d5236ccb9639335d178f2c74e534dbd457e2","author":{"email":"4994c00839326a1cb39734ec9912c132ba9bd098@gmail.com","name":"Herr Andersson"},"message":"ADDED CombinedMeshGenerator-class. This class will be used to combine floors etc into a single mesh.","distinct":false,"url":"https://api.github.com/repos/rikhardsvensson/StortSpel-Grupp1/commits/26c1d5236ccb9639335d178f2c74e534dbd457e2"},{"sha":"7303ab3abf5026010e5c8683baa465308fc7ba65","author":{"email":"4994c00839326a1cb39734ec9912c132ba9bd098@gmail.com","name":"Herr Andersson"},"message":"MOVED particle \"tutorial\" to ParticleUtils","distinct":false,"url":"https://api.github.com/repos/rikhardsvensson/StortSpel-Grupp1/commits/7303ab3abf5026010e5c8683baa465308fc7ba65"},{"sha":"f2fcfcecb4a974f1ef6687f38c339805527dc809","author":{"email":"4994c00839326a1cb39734ec9912c132ba9bd098@gmail.com","name":"Herr Andersson"},"message":"ADDED functionality to retrieve the data from a vertex buffer of a mesh","distinct":false,"url":"https://api.github.com/repos/rikhardsvensson/StortSpel-Grupp1/commits/f2fcfcecb4a974f1ef6687f38c339805527dc809"},{"sha":"72a0bd9b4d3ee357f3f23c867e2600bc2c35d1b6","author":{"email":"4994c00839326a1cb39734ec9912c132ba9bd098@gmail.com","name":"Herr Andersson"},"message":"ADDED some functionality for combining, but the final result is not done","distinct":false,"url":"https://api.github.com/repos/rikhardsvensson/StortSpel-Grupp1/commits/72a0bd9b4d3ee357f3f23c867e2600bc2c35d1b6"},{"sha":"0b93d9de72f90699cd779508e44ec86774956c0e","author":{"email":"4994c00839326a1cb39734ec9912c132ba9bd098@gmail.com","name":"Herr Andersson"},"message":"MOVED DecrementUsers-implementation from AssetManager.cpp to RenderUtils.h, where the struct is located","distinct":false,"url":"https://api.github.com/repos/rikhardsvensson/StortSpel-Grupp1/commits/0b93d9de72f90699cd779508e44ec86774956c0e"},{"sha":"956de98a1e954de13850192580a916d410b683e9","author":{"email":"4994c00839326a1cb39734ec9912c132ba9bd098@gmail.com","name":"Herr Andersson"},"message":"CHANGED name of the function used to render light volumes, as the function really is a general rendering of a vertex buffer","distinct":false,"url":"https://api.github.com/repos/rikhardsvensson/StortSpel-Grupp1/commits/956de98a1e954de13850192580a916d410b683e9"},{"sha":"5367a83ec7ce37fccd5fa3ab2202ebaf465693b7","author":{"email":"4994c00839326a1cb39734ec9912c132ba9bd098@gmail.com","name":"Herr Andersson"},"message":"ADDED correct combination of objects","distinct":false,"url":"https://api.github.com/repos/rikhardsvensson/StortSpel-Grupp1/commits/5367a83ec7ce37fccd5fa3ab2202ebaf465693b7"},{"sha":"2574f3e4b6ada4f917499055d011543a4c4e8160","author":{"email":"4994c00839326a1cb39734ec9912c132ba9bd098@gmail.com","name":"Herr Andersson"},"message":"ADDED the possibility to combine a given number of objects. For example combine all walls 2 and 2","distinct":false,"url":"https://api.github.com/repos/rikhardsvensson/StortSpel-Grupp1/commits/2574f3e4b6ada4f917499055d011543a4c4e8160"},{"sha":"b595d4a8b5afc02b6f51a7e6c4beceda9284c9fd","author":{"email":"4994c00839326a1cb39734ec9912c132ba9bd098@gmail.com","name":"Herr Andersson"},"message":"Merge remote-tracking branch 'origin/Developer' into T6-14-Reducing-draw-calls\n\nConflicts:\n\tStortSpelprojekt/StortSpelprojekt/Game.cpp\n\tStortSpelprojekt/StortSpelprojekt/StateMachine/LevelSelectState.cpp\n\tStortSpelprojekt/StortSpelprojekt/StateMachine/StateMachine.cpp","distinct":false,"url":"https://api.github.com/repos/rikhardsvensson/StortSpel-Grupp1/commits/b595d4a8b5afc02b6f51a7e6c4beceda9284c9fd"},{"sha":"c6bd409d5728020dcd64660fe5208bc4fff24b40","author":{"email":"4994c00839326a1cb39734ec9912c132ba9bd098@gmail.com","name":"Herr Andersson"},"message":"ADDED \"static\" particles used for object marking","distinct":false,"url":"https://api.github.com/repos/rikhardsvensson/StortSpel-Grupp1/commits/c6bd409d5728020dcd64660fe5208bc4fff24b40"},{"sha":"eff2b50c50f01eec3af0d371e0dc07be01ea3d11","author":{"email":"4994c00839326a1cb39734ec9912c132ba9bd098@gmail.com","name":"Herr Andersson"},"message":"ADDED correct combination of all objects. In my tests, with a huge map with walls and floors, the FPS went from ~12 to ~31","distinct":false,"url":"https://api.github.com/repos/rikhardsvensson/StortSpel-Grupp1/commits/eff2b50c50f01eec3af0d371e0dc07be01ea3d11"},{"sha":"ab76f7a0b1b51cfa3c628da6d1631044356b9e6f","author":{"email":"4994c00839326a1cb39734ec9912c132ba9bd098@gmail.com","name":"Herr Andersson"},"message":"ADDED a base to combine vertex buffers more optimized, removing unnecessary vertices. Still broken","distinct":false,"url":"https://api.github.com/repos/rikhardsvensson/StortSpel-Grupp1/commits/ab76f7a0b1b51cfa3c628da6d1631044356b9e6f"},{"sha":"2a19bcb509dfd6d908fd8c330959142947641f95","author":{"email":"4994c00839326a1cb39734ec9912c132ba9bd098@gmail.com","name":"HerrAndersson"},"message":"ADDED wireframe mode to be able to test the combined meshes","distinct":false,"url":"https://api.github.com/repos/rikhardsvensson/StortSpel-Grupp1/commits/2a19bcb509dfd6d908fd8c330959142947641f95"},{"sha":"88987a7ff9d691d27980fab99688b2860347fa1a","author":{"email":"4994c00839326a1cb39734ec9912c132ba9bd098@gmail.com","name":"HerrAndersson"},"message":"FIXED off by one errors","distinct":false,"url":"https://api.github.com/repos/rikhardsvensson/StortSpel-Grupp1/commits/88987a7ff9d691d27980fab99688b2860347fa1a"},{"sha":"d57e07ebbaf32396bc9f51645a6bb95429342642","author":{"email":"4994c00839326a1cb39734ec9912c132ba9bd098@gmail.com","name":"HerrAndersson"},"message":"ADDED comment to future self","distinct":false,"url":"https://api.github.com/repos/rikhardsvensson/StortSpel-Grupp1/commits/d57e07ebbaf32396bc9f51645a6bb95429342642"},{"sha":"ca470a9a15ca8fce985c8184a2149668b5202a7f","author":{"email":"4994c00839326a1cb39734ec9912c132ba9bd098@gmail.com","name":"Herr Andersson"},"message":"FIXED floors are now rendered again","distinct":false,"url":"https://api.github.com/repos/rikhardsvensson/StortSpel-Grupp1/commits/ca470a9a15ca8fce985c8184a2149668b5202a7f"},{"sha":"e5b2fcc34ef9ba9e7d9d5248cf0b83b148f75a68","author":{"email":"92365cf4aca2411f1aa11662be40d47de021b58d@live.se","name":"Mattias Lunderot"},"message":"Merge remote-tracking branch 'origin/T6-14-Reducing-draw-calls' into T6-01-Particle-effects-ingame\n\nConflicts:\n\tStortSpelprojekt/AssetManager/AssetManager.cpp\n\tStortSpelprojekt/Renderer/RenderUtils.h\n\tStortSpelprojekt/StortSpelprojekt/Game.cpp","distinct":true,"url":"https://api.github.com/repos/rikhardsvensson/StortSpel-Grupp1/commits/e5b2fcc34ef9ba9e7d9d5248cf0b83b148f75a68"},{"sha":"46659f823a0044c2b0e1e46ee989d1e9e1abe921","author":{"email":"92365cf4aca2411f1aa11662be40d47de021b58d@live.se","name":"Mattias Lunderot"},"message":"ADDED no placement and occupied icon and static icon particle type","distinct":true,"url":"https://api.github.com/repos/rikhardsvensson/StortSpel-Grupp1/commits/46659f823a0044c2b0e1e46ee989d1e9e1abe921"}]}