Skip to content
Snippets Groups Projects
  • Brian Peiris's avatar
    fcc2df3d
    Squashed commit of the following: · fcc2df3d
    Brian Peiris authored
    commit cbb4d3522fdda01c21158384f41475d6cf3cadca
    Merge: 12ca6c7 e9ac30bc
    Author: Brian Peiris <brianpeiris@gmail.com>
    Date:   Mon Mar 26 11:03:22 2018 -0700
    
        Merge remote-tracking branch 'origin/master' into feature/avatar-switching-ui
    
    commit 12ca6c701e1301b1f41c995ec5d30cb4f95829a5
    Author: Brian Peiris <brianpeiris@gmail.com>
    Date:   Mon Mar 26 10:30:12 2018 -0700
    
        route avatar selector state changes
    
    commit cddeb304e54ec9d104c42bf59179ba642b959099
    Author: Brian Peiris <brianpeiris@gmail.com>
    Date:   Thu Mar 22 15:39:17 2018 -0700
    
        Added avatar model manifest. Moved avatar selector in to React component. Refactoring. Styling
    
    commit a75a7b5c7746c306541748149e0fabc20a6ebcd2
    Author: Brian Peiris <brianpeiris@gmail.com>
    Date:   Thu Mar 22 09:40:38 2018 -0700
    
        partial avatar switching implementation
    
    commit 57566dea
    Merge: a78b0729 78cba0ff
    Author: netpro2k <netpro2k@gmail.com>
    Date:   Fri Mar 16 11:48:24 2018 -0700
    
        Merge branch 'feature/avatar-switching' of https://github.com/robertlong/social-vr-demo into feature/avatar-switching
    
    commit 78cba0ff
    Author: netpro2k <netpro2k@gmail.com>
    Date:   Fri Mar 16 11:45:09 2018 -0700
    
        Missing files
    
    commit a78b0729
    Merge: 63456982 4d9a358c
    Author: netpro2k <netpro2k@gmail.com>
    Date:   Fri Mar 16 11:30:38 2018 -0700
    
        Merge branch 'master' into feature/avatar-switching
    
    commit 63456982
    Author: netpro2k <netpro2k@gmail.com>
    Date:   Thu Mar 15 19:15:00 2018 -0700
    
        Allow creating an a-gltf-entity with no src set initially
    
    commit 0e2dad69
    Author: netpro2k <netpro2k@gmail.com>
    Date:   Thu Mar 15 19:14:06 2018 -0700
    
        Rework how player rig is instantiated to support avatar switching. Also
        requries changing how nametag is networked.
    
    commit e57d3b02
    Author: netpro2k <netpro2k@gmail.com>
    Date:   Thu Mar 15 19:07:44 2018 -0700
    
        Preload all the templates to avoid timing issues with importNode
    
    commit bde46f68
    Author: netpro2k <netpro2k@gmail.com>
    Date:   Wed Mar 14 18:19:51 2018 -0700
    
        Add support for changing src on an a-gltf-entity, also some code cleanup
    
    commit 0423267e
    Author: netpro2k <netpro2k@gmail.com>
    Date:   Wed Mar 14 18:00:37 2018 -0700
    
        Fix inflating of entities with different rotation order from aframe
    
    commit cdba3564
    Author: netpro2k <netpro2k@gmail.com>
    Date:   Wed Mar 14 17:59:50 2018 -0700
    
        Fix inflating of GLTFs with unnamed nodes
    
    commit ea383606
    Author: netpro2k <netpro2k@gmail.com>
    Date:   Wed Mar 14 17:59:02 2018 -0700
    
        Fix cloning of GLTFs with unnamed bones
    fcc2df3d
    History
    Squashed commit of the following:
    Brian Peiris authored
    commit cbb4d3522fdda01c21158384f41475d6cf3cadca
    Merge: 12ca6c7 e9ac30bc
    Author: Brian Peiris <brianpeiris@gmail.com>
    Date:   Mon Mar 26 11:03:22 2018 -0700
    
        Merge remote-tracking branch 'origin/master' into feature/avatar-switching-ui
    
    commit 12ca6c701e1301b1f41c995ec5d30cb4f95829a5
    Author: Brian Peiris <brianpeiris@gmail.com>
    Date:   Mon Mar 26 10:30:12 2018 -0700
    
        route avatar selector state changes
    
    commit cddeb304e54ec9d104c42bf59179ba642b959099
    Author: Brian Peiris <brianpeiris@gmail.com>
    Date:   Thu Mar 22 15:39:17 2018 -0700
    
        Added avatar model manifest. Moved avatar selector in to React component. Refactoring. Styling
    
    commit a75a7b5c7746c306541748149e0fabc20a6ebcd2
    Author: Brian Peiris <brianpeiris@gmail.com>
    Date:   Thu Mar 22 09:40:38 2018 -0700
    
        partial avatar switching implementation
    
    commit 57566dea
    Merge: a78b0729 78cba0ff
    Author: netpro2k <netpro2k@gmail.com>
    Date:   Fri Mar 16 11:48:24 2018 -0700
    
        Merge branch 'feature/avatar-switching' of https://github.com/robertlong/social-vr-demo into feature/avatar-switching
    
    commit 78cba0ff
    Author: netpro2k <netpro2k@gmail.com>
    Date:   Fri Mar 16 11:45:09 2018 -0700
    
        Missing files
    
    commit a78b0729
    Merge: 63456982 4d9a358c
    Author: netpro2k <netpro2k@gmail.com>
    Date:   Fri Mar 16 11:30:38 2018 -0700
    
        Merge branch 'master' into feature/avatar-switching
    
    commit 63456982
    Author: netpro2k <netpro2k@gmail.com>
    Date:   Thu Mar 15 19:15:00 2018 -0700
    
        Allow creating an a-gltf-entity with no src set initially
    
    commit 0e2dad69
    Author: netpro2k <netpro2k@gmail.com>
    Date:   Thu Mar 15 19:14:06 2018 -0700
    
        Rework how player rig is instantiated to support avatar switching. Also
        requries changing how nametag is networked.
    
    commit e57d3b02
    Author: netpro2k <netpro2k@gmail.com>
    Date:   Thu Mar 15 19:07:44 2018 -0700
    
        Preload all the templates to avoid timing issues with importNode
    
    commit bde46f68
    Author: netpro2k <netpro2k@gmail.com>
    Date:   Wed Mar 14 18:19:51 2018 -0700
    
        Add support for changing src on an a-gltf-entity, also some code cleanup
    
    commit 0423267e
    Author: netpro2k <netpro2k@gmail.com>
    Date:   Wed Mar 14 18:00:37 2018 -0700
    
        Fix inflating of entities with different rotation order from aframe
    
    commit cdba3564
    Author: netpro2k <netpro2k@gmail.com>
    Date:   Wed Mar 14 17:59:50 2018 -0700
    
        Fix inflating of GLTFs with unnamed nodes
    
    commit ea383606
    Author: netpro2k <netpro2k@gmail.com>
    Date:   Wed Mar 14 17:59:02 2018 -0700
    
        Fix cloning of GLTFs with unnamed bones