add version graph window
some starting work for scene merging module
some bug fix
implement three-way-merge (no debug)
add UI.Viewer, Viewer Window
make UI.Vindow resizable
debug scene merging algorithm, all except the delete-modify conflict detecting module passed
add Merge Window
add z-index to UI.Window
make UI.Viewer resizable
add merge information window
fix commit algorithm for merge, debug not pass
commit for checkout
basic test of merge commit passed
some bugs of merge algorithm are fixed,
but still not finished yet.
fix merge algorithm bugs
until now, new bugs haven't been found yet.
rearrage the layout during merge
add interface for object updating
implement matrix adjustment function in merged scene
add verion attribute value info in MergeControlWin
reconstruct code of merge module with MVC patterns
mv func updateObject from MergeWin to MergeEditor
reconstruct MergeWin with 3 Viewer and 1 MergeControlWin
prepare for reconstruction of MergeControlWin
reconstruct MergeControlWin, without debug
finish the reconstruction of MergeControlWin, no bug detected
add name to geometry and image assets