{"push_id":790308962,"size":40,"distinct_size":40,"ref":"refs/heads/MagicEffectsRefactorDraft3","head":"ceada145ab20049f95b7baf558372dc80274decd","before":"8e2fe1985d8a794aaf70173c71e7c63cd4ac3f1a","commits":[{"sha":"6a9218ee07a81c9ca56faf8661c9d38e84ba3028","author":{"email":"d33c80bc45d65303e33ca83108a9952b745af9ef@zpages.de","name":"Marc Zinnschlag"},"message":"replaced State_Compiling (not requried anymore) with State_Merging","distinct":true,"url":"https://api.github.com/repos/dteviot/openmw/commits/6a9218ee07a81c9ca56faf8661c9d38e84ba3028"},{"sha":"15e8275443eee5d777fe7ed98556b9805bec159f","author":{"email":"d33c80bc45d65303e33ca83108a9952b745af9ef@zpages.de","name":"Marc Zinnschlag"},"message":"Merge remote-tracking branch 'slothlife/moon-settings' into mergetool","distinct":true,"url":"https://api.github.com/repos/dteviot/openmw/commits/15e8275443eee5d777fe7ed98556b9805bec159f"},{"sha":"9392e426c086fd46a8cff8d17bd8c7fd9697d280","author":{"email":"d33c80bc45d65303e33ca83108a9952b745af9ef@zpages.de","name":"Marc Zinnschlag"},"message":"Merge remote-tracking branch 'origin/master' into mergetool","distinct":true,"url":"https://api.github.com/repos/dteviot/openmw/commits/9392e426c086fd46a8cff8d17bd8c7fd9697d280"},{"sha":"9ee3f1bfe7a35a81d41483575872cf1c3b32aba5","author":{"email":"d33c80bc45d65303e33ca83108a9952b745af9ef@zpages.de","name":"Marc Zinnschlag"},"message":"Merge remote-tracking branch 'slothlife/moon-settings' into mergetool","distinct":true,"url":"https://api.github.com/repos/dteviot/openmw/commits/9ee3f1bfe7a35a81d41483575872cf1c3b32aba5"},{"sha":"b83f9445a96fda4dc14e43a2db363a748344227f","author":{"email":"d33c80bc45d65303e33ca83108a9952b745af9ef@zpages.de","name":"Marc Zinnschlag"},"message":"added UI for merge tool (merge tool itself is still missing)","distinct":true,"url":"https://api.github.com/repos/dteviot/openmw/commits/b83f9445a96fda4dc14e43a2db363a748344227f"},{"sha":"4fd3097c1cf2329cef071aee7a1b149e280e4974","author":{"email":"d33c80bc45d65303e33ca83108a9952b745af9ef@zpages.de","name":"Marc Zinnschlag"},"message":"improved adjuster widget problem reporting","distinct":true,"url":"https://api.github.com/repos/dteviot/openmw/commits/4fd3097c1cf2329cef071aee7a1b149e280e4974"},{"sha":"708cacdec403793a0337c6e536a1ecf53a58bd6e","author":{"email":"d33c80bc45d65303e33ca83108a9952b745af9ef@zpages.de","name":"Marc Zinnschlag"},"message":"disable merge menu item when a merge is already in progress","distinct":true,"url":"https://api.github.com/repos/dteviot/openmw/commits/708cacdec403793a0337c6e536a1ecf53a58bd6e"},{"sha":"904ad949524864239f4b1f428d03a947360728a0","author":{"email":"d33c80bc45d65303e33ca83108a9952b745af9ef@zpages.de","name":"Marc Zinnschlag"},"message":"added merge operation (doesn't do anything yet)","distinct":true,"url":"https://api.github.com/repos/dteviot/openmw/commits/904ad949524864239f4b1f428d03a947360728a0"},{"sha":"e2377396a7cf7b9cd1ec91e0f385721a124a49cc","author":{"email":"d33c80bc45d65303e33ca83108a9952b745af9ef@zpages.de","name":"Marc Zinnschlag"},"message":"inheriting Merge from QWidget instead of QDialog, because QDialog is bloody useless for non-modal dialogues (which makes the class completely useless, since modal dialogues are the spawn of Satan)","distinct":true,"url":"https://api.github.com/repos/dteviot/openmw/commits/e2377396a7cf7b9cd1ec91e0f385721a124a49cc"},{"sha":"d8655f2ff862dbaf90fb285ef01cdf6891cdbea6","author":{"email":"d33c80bc45d65303e33ca83108a9952b745af9ef@zpages.de","name":"Marc Zinnschlag"},"message":"forgot to connect merge operation signals","distinct":true,"url":"https://api.github.com/repos/dteviot/openmw/commits/d8655f2ff862dbaf90fb285ef01cdf6891cdbea6"},{"sha":"1b663f01aff94811a46825467cad8f38ed025b24","author":{"email":"d33c80bc45d65303e33ca83108a9952b745af9ef@zpages.de","name":"Marc Zinnschlag"},"message":"create merged document and open a view for it (document is still empty at this point)","distinct":true,"url":"https://api.github.com/repos/dteviot/openmw/commits/1b663f01aff94811a46825467cad8f38ed025b24"},{"sha":"47dd9505a9464dc5c947f409c3c4a80cf4d8e395","author":{"email":"d33c80bc45d65303e33ca83108a9952b745af9ef@zpages.de","name":"Marc Zinnschlag"},"message":"copy meta data from game file when merging","distinct":true,"url":"https://api.github.com/repos/dteviot/openmw/commits/47dd9505a9464dc5c947f409c3c4a80cf4d8e395"},{"sha":"3902513e65206908c0f0f54db213a7c9ea7f2fd0","author":{"email":"d33c80bc45d65303e33ca83108a9952b745af9ef@zpages.de","name":"Marc Zinnschlag"},"message":"merge id collections","distinct":true,"url":"https://api.github.com/repos/dteviot/openmw/commits/3902513e65206908c0f0f54db213a7c9ea7f2fd0"},{"sha":"c92898a5bc18584708bd9c0e1e76c517adb3499b","author":{"email":"d33c80bc45d65303e33ca83108a9952b745af9ef@zpages.de","name":"Marc Zinnschlag"},"message":"flag newly merged documents as dirty (triggering an 'are you sure' dialogue when closing without saving first)","distinct":true,"url":"https://api.github.com/repos/dteviot/openmw/commits/c92898a5bc18584708bd9c0e1e76c517adb3499b"},{"sha":"103073150e87d62582649ea6943fdc510eb5ca59","author":{"email":"d33c80bc45d65303e33ca83108a9952b745af9ef@zpages.de","name":"Marc Zinnschlag"},"message":"added info tables and pathgrid table to merge operation","distinct":true,"url":"https://api.github.com/repos/dteviot/openmw/commits/103073150e87d62582649ea6943fdc510eb5ca59"},{"sha":"16dda281cee3fb1bab7276cc21448b754d5db3c5","author":{"email":"d33c80bc45d65303e33ca83108a9952b745af9ef@zpages.de","name":"Marc Zinnschlag"},"message":"made merge operation more fluent","distinct":true,"url":"https://api.github.com/repos/dteviot/openmw/commits/16dda281cee3fb1bab7276cc21448b754d5db3c5"},{"sha":"40753aa9a3759e247b1fc907f5ef61af2656d533","author":{"email":"d33c80bc45d65303e33ca83108a9952b745af9ef@zpages.de","name":"Marc Zinnschlag"},"message":"simplifying merge stage","distinct":true,"url":"https://api.github.com/repos/dteviot/openmw/commits/40753aa9a3759e247b1fc907f5ef61af2656d533"},{"sha":"9cf793c0b519143fd7d3ac3cfb7beb82f65b72f3","author":{"email":"d33c80bc45d65303e33ca83108a9952b745af9ef@zpages.de","name":"Marc Zinnschlag"},"message":"silenced a warning","distinct":true,"url":"https://api.github.com/repos/dteviot/openmw/commits/9cf793c0b519143fd7d3ac3cfb7beb82f65b72f3"},{"sha":"f95950e8d815997da34eb9939b81cd27afb62dbb","author":{"email":"d33c80bc45d65303e33ca83108a9952b745af9ef@zpages.de","name":"Marc Zinnschlag"},"message":"merge referenceables table","distinct":true,"url":"https://api.github.com/repos/dteviot/openmw/commits/f95950e8d815997da34eb9939b81cd27afb62dbb"},{"sha":"845cafd61c12142a353119a6304845370037d7a5","author":{"email":"d33c80bc45d65303e33ca83108a9952b745af9ef@zpages.de","name":"Marc Zinnschlag"},"message":"fixed record state issues after merge","distinct":true,"url":"https://api.github.com/repos/dteviot/openmw/commits/845cafd61c12142a353119a6304845370037d7a5"}]}