Blender Git Statistics -> Branches -> asset-engine

"Asset-engine" branch

Total commits : 1 509
Total committers : 8
First Commit : December 3, 2014
Latest Commit : March 18, 2019


Commits by Month

DateNumber of Commits
March, 20191
February, 20193
January, 20196
December, 20180
November, 20180
October, 20180
September, 20181
August, 20180
July, 20182
June, 20182
May, 20181
April, 20187
March, 20182
February, 201814
January, 20188
December, 201711
November, 201754
October, 201749
September, 201723
August, 201723
July, 201740
June, 201746
May, 20174
April, 20175
March, 201722
February, 201741
January, 201717
December, 201615
November, 20162
October, 20162
September, 201627
August, 201618
July, 201610
June, 201652
May, 201645
April, 201645
March, 201633
February, 201647
January, 201638
December, 201533
November, 201543
October, 201575
September, 2015121
August, 201532
July, 201532
June, 201542
May, 201571
April, 201581
March, 201563
February, 201548
January, 201552
December, 2014100

Committers

AuthorNumber of Commits
Bastien Montagne1 470
Sybren A. Stüvel13
Sergey Sharybin11
Campbell Barton8
Joshua Leung4
Aaron Carlisle1
Lukas Stockner1
Thomas Beck1

Popular Files

FilenameTotal Edits
filelist.c154
library.c110
wm_operators.c59
readfile.c55
filelist.h47
DNA_space_types.h42
space_file.c39
rna_asset.c38
file_ops.c35
DNA_ID.h35

Latest commits Feed

March 18, 2019, 19:28 (GMT)
Merge branch 'master' into asset-engine

Kinda painful merge thanks to extensive changes to things like Main
listbases names, linking code, etc.

Conflicts:
source/blender/blenkernel/BKE_library.h
source/blender/blenloader/BLO_readfile.h
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/makesdna/DNA_space_types.h
source/blender/windowmanager/intern/wm_files_link.c
February 19, 2019, 09:33 (GMT)
Merge branch 'master' into asset-engine
February 9, 2019, 19:08 (GMT)
Merge branch 'master' into asset-engine
February 4, 2019, 10:30 (GMT)
Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenkernel/BKE_global.h
source/blender/python/intern/bpy_app.c
January 30, 2019, 22:04 (GMT)
Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenkernel/BKE_library.h
source/blender/blenloader/BLO_readfile.h
source/blender/editors/space_file/file_ops.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_file/filelist.h
source/blender/makesdna/DNA_space_types.h
source/blender/windowmanager/intern/wm_files_link.c
January 14, 2019, 13:35 (GMT)
Merge branch 'master' into asset-engine
January 9, 2019, 16:13 (GMT)
Update Amber & generic Asset Engine code for changes in 2.8.

Many noisy changes in past 6 months... ;)
January 9, 2019, 16:09 (GMT)
Merge branch 'master' into asset-engine
January 9, 2019, 12:46 (GMT)
Merge branch 'master' into asset-engine

Conflicts:
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_space_types.h
January 6, 2019, 16:27 (GMT)
Merge branch 'master' into asset-engine

Rather painful, too much cleanup/renamings in between...

Note that this is not currently functionnal, builds but does not show
AEs in filebrowser selector for some reason. No time to track that now.

Conflicts:
source/blender/blenkernel/intern/library.c
source/blender/blenloader/BLO_readfile.h
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_defaults.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_file/filelist.h
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_script/script_edit.c
source/blender/editors/space_script/script_intern.h
source/blender/editors/space_script/script_ops.c
source/blender/makesrna/intern/rna_internal.h
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_files_link.c
September 10, 2018, 17:12 (GMT)
Merge branch 'blender2.8' into asset-engine

Conflicts:
release/scripts/startup/bl_ui/space_filebrowser.py
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_280.c
source/blender/blenloader/intern/versioning_defaults.c
source/blender/editors/include/UI_interface.h
source/blender/editors/space_view3d/space_view3d.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_dragdrop.c
source/blender/windowmanager/intern/wm_files_link.c
July 1, 2018, 14:53 (GMT)
Merge branch 'blender2.8' into asset-engine
July 1, 2018, 14:49 (GMT)
Merge branch 'blender2.8' into asset-engine

Conflicts:
source/blender/blenkernel/BKE_library.h
source/blender/blenloader/intern/versioning_280.c
source/blender/blenloader/intern/versioning_defaults.c
source/blender/windowmanager/WM_api.h
June 18, 2018, 11:03 (GMT)
Fix broken Amber after Group -> Collection change.
June 18, 2018, 10:59 (GMT)
Merge branch 'blender2.8' into asset-engine

Conflicts:
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_file/file_draw.c
source/blender/editors/space_file/file_intern.h
source/blender/editors/space_file/file_ops.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_space.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_files_link.c
source/blender/windowmanager/intern/wm_init_exit.c
May 29, 2018, 09:15 (GMT)
Merge branch 'blender2.8' into asset-engine

Conflicts:
release/scripts/startup/bl_ui/space_info.py
source/blender/blenloader/BLO_readfile.h
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_280.c
source/blender/makesdna/DNA_ID.h
source/blender/makesrna/intern/rna_space.c
source/blender/windowmanager/intern/wm_files_link.c
source/blenderplayer/bad_level_call_stubs/stubs.c
April 13, 2018, 10:25 (GMT)
Merge branch 'blender2.8' into asset-engine

Conflicts:
release/scripts/startup/bl_ui/space_filebrowser.py
April 13, 2018, 09:58 (GMT)
Typo
April 11, 2018, 13:24 (GMT)
Merge branch 'blender2.8' into asset-engine
April 11, 2018, 13:16 (GMT)
Fix again 'auto override' system.

Got lost in big undo refactor.

Note that this is probably (maybe) not how we want to have it in the
end, things like EditMode undo should probably not trigger this check?

MiikaHweb - Blender Git Statistics v1.06
By: Miika HämäläinenLast update: Nov-07-2014 14:18 MiikaHweb | 2003-2019