Merge branch 'dev' of pixhawk.ethz.ch:qgroundcontrol into dev
Showing
- map.earth 7 additions, 0 deletionsmap.earth
- qgroundcontrol.pro 4 additions, 12 deletionsqgroundcontrol.pro
- src/ui/map3D/GCManipulator.cc 307 additions, 0 deletionssrc/ui/map3D/GCManipulator.cc
- src/ui/map3D/GCManipulator.h 20 additions, 20 deletionssrc/ui/map3D/GCManipulator.h
- src/ui/map3D/Imagery.cc 0 additions, 594 deletionssrc/ui/map3D/Imagery.cc
- src/ui/map3D/Imagery.h 0 additions, 115 deletionssrc/ui/map3D/Imagery.h
- src/ui/map3D/Pixhawk3DWidget.cc 158 additions, 157 deletionssrc/ui/map3D/Pixhawk3DWidget.cc
- src/ui/map3D/Pixhawk3DWidget.h 12 additions, 21 deletionssrc/ui/map3D/Pixhawk3DWidget.h
- src/ui/map3D/PixhawkCheetahGeode.cc 6 additions, 5 deletionssrc/ui/map3D/PixhawkCheetahGeode.cc
- src/ui/map3D/PixhawkCheetahGeode.h 17 additions, 7 deletionssrc/ui/map3D/PixhawkCheetahGeode.h
- src/ui/map3D/Q3DWidget.cc 45 additions, 169 deletionssrc/ui/map3D/Q3DWidget.cc
- src/ui/map3D/Q3DWidget.h 169 additions, 52 deletionssrc/ui/map3D/Q3DWidget.h
- src/ui/map3D/Q3DWidgetFactory.h 42 additions, 0 deletionssrc/ui/map3D/Q3DWidgetFactory.h
- src/ui/map3D/Texture.cc 0 additions, 221 deletionssrc/ui/map3D/Texture.cc
- src/ui/map3D/Texture.h 0 additions, 91 deletionssrc/ui/map3D/Texture.h
- src/ui/map3D/TextureCache.cc 0 additions, 114 deletionssrc/ui/map3D/TextureCache.cc
- src/ui/map3D/WebImage.cc 0 additions, 232 deletionssrc/ui/map3D/WebImage.cc
- src/ui/map3D/WebImage.h 0 additions, 90 deletionssrc/ui/map3D/WebImage.h
- src/ui/map3D/WebImageCache.cc 0 additions, 191 deletionssrc/ui/map3D/WebImageCache.cc
- src/ui/map3D/WebImageCache.h 0 additions, 65 deletionssrc/ui/map3D/WebImageCache.h
Loading
Please register or sign in to comment