GitHub PushEvent at 2014-05-27 14:06:19
Repository: dava.framework
Actor: klesch
Payload: {"shas":[["d4f4848739ccaf790b602fa27be671444122d87c","f901c095c6dcf231f7161cdb02bf68cd2aedc228@gmail.com","[DF-2911] Added debug information for occlusion culling","binaryzebra",false],["0eb6264881952c82df43fe316a1a27b9b54cc851","f901c095c6dcf231f7161cdb02bf68cd2aedc228@gmail.com","[DF-185] Removed old code. Cosmetic fixes. Moved inline functions to bottom of .h file","binaryzebra",false],["b19c96da0aea6e6cfddf9fcfa16e25f2022fbc5d","f901c095c6dcf231f7161cdb02bf68cd2aedc228@gmail.com","[DF-2911] Occlusion Added Ability to render one box. Fixed some of the bugs","binaryzebra",false],["1b1fcd372f704bc03f32ae88e4726ffe85ea7386","f901c095c6dcf231f7161cdb02bf68cd2aedc228@gmail.com","Merge branch 'development' of github.com:dava/dava.framework into development\n\nConflicts:\n\tSources/Internal/Render/Highlevel/StaticOcclusionRenderPass.cpp\n\tSources/Internal/Render/RenderManagerGL.cpp\n\tSources/Internal/Scene3D/Systems/StaticOcclusionSystem.cpp","binaryzebra",false],["a497200fdd5a8f5653ef9900a62e5307466e0c49","ac96d8fec691818337a9f1c125ddf386e6be11f1@wargaming.net","DF-4250 added default preset, saved default preset in fonts.yaml","d_shpakov",false],["b8525f99e9e23beaf1ab8dc9c0e3512cd9245530","ac96d8fec691818337a9f1c125ddf386e6be11f1@wargaming.net","Merge branch 'development' of https://github.com/dava/dava.framework into development","d_shpakov",false],["e167516b3b8d6a7bbe41b6af5dee32f872e20e48","ac96d8fec691818337a9f1c125ddf386e6be11f1@wargaming.net","Merge branch 'development' of https://github.com/dava/dava.framework into development","d_shpakov",false],["51d0a35d965a8df2d4cee5f848d3937f78226762","88fa846e5f8aa198848be76e1abdcb7d7a42d292@davaconsulting.com","[DF-185] Fixed unittest project","klesch",false],["08461b7728219e7b76a545390755e65e82e611f6","ac96d8fec691818337a9f1c125ddf386e6be11f1@wargaming.net","DF-4250 removed unneeded function declaration","d_shpakov",false],["2a6c4365332fd80e3baf0f0afb4b3000097c1604","f901c095c6dcf231f7161cdb02bf68cd2aedc228@gmail.com","[DF-2911] Fixes of static occlusion render camera bug","binaryzebra",false],["c055fc00a819a0a56fa1b788f403d845cdc7914d","88fa846e5f8aa198848be76e1abdcb7d7a42d292@davaconsulting.com","[DF-185] Removed unactual code","klesch",false],["40505ebcbb9b3eee9a024c32e134f08c8d4a7300","f901c095c6dcf231f7161cdb02bf68cd2aedc228@gmail.com","Merge branch 'development' of github.com:dava/dava.framework into development\n\nConflicts:\n\tTools/ResourceEditor/Classes/Qt/Main/mainwindow.cpp\n\tTools/ResourceEditor/DataQt/mainwindow.ui","binaryzebra",false],["83c8f33272e68199168c38cc4b1913268e391735","f901c095c6dcf231f7161cdb02bf68cd2aedc228@gmail.com","Merge branch 'development' of github.com:dava/dava.framework into development","binaryzebra",false],["29cb58478f64e5352ac2a24fee3025807e6ea429","1b7c59ded76cbc848851fd36af7ef61b9d44580b@wargaming.net","[DF-4274] Fixed bug, when there was no add button for some material properties.\n\nConflicts:\n\tTools/ResourceEditor/Classes/Qt/MaterialEditor/MaterialEditor.cpp","smile4u",false],["c29805458047427d4fc709755f0f1e024d8281ac","1b7c59ded76cbc848851fd36af7ef61b9d44580b@wargaming.net","[DF-4274] Fixed bug, when there was no add button for some material properties.\n\nConflicts:\n\tTools/ResourceEditor/Classes/Qt/MaterialEditor/MaterialEditor.cpp","smile4u",false],["6de75a68d76a2cc9dc9b58c4f44f3d804936c071","1b7c59ded76cbc848851fd36af7ef61b9d44580b@wargaming.net","[DF-185] Added red highlight for properties, that aren't used in shader\n\nConflicts:\n\tTools/ResourceEditor/Classes/Qt/MaterialEditor/MaterialEditor.cpp","smile4u",false],["d32ce680ab00107852250788fd4efa82130da8db","1b7c59ded76cbc848851fd36af7ef61b9d44580b@wargaming.net","[DF-185] Added red highlight for properties, that aren't used in shader\n\nConflicts:\n\tTools/ResourceEditor/Classes/Qt/MaterialEditor/MaterialEditor.cpp","smile4u",false],["670f9dec14ee97a6472535513fc71a48587d32cb","ac96d8fec691818337a9f1c125ddf386e6be11f1@wargaming.net","DF-4250 fixes after review","d_shpakov",false],["288f70db0ae34c6199a1ed9cb9db6599aa89c746","88fa846e5f8aa198848be76e1abdcb7d7a42d292@davaconsulting.com","[DF-4275] Fixed setting of path to TextureDescriptor","klesch",false],["23a823b5af77069f72df04ea59f75ef2be6ecbfe","88fa846e5f8aa198848be76e1abdcb7d7a42d292@davaconsulting.com","Merge branch 're_stable' into development","klesch",false]],"size":25,"ref":"refs/heads/multistringparsing","head":"aa8c60d960d649f7b383569850569a19a8673d12"}