Commits · 9e090e7ecc0681f32e95e81428ccc47fe5fe4e9f · Valentin Platzgummer / qgroundcontrol

04 Jul, 2013 4 commits
- Resolved merge conflict · 9e090e7e
  Lorenz Meier authored Jul 04, 2013
  
  9e090e7e
- Updated MAVLink, fixed minor issues with contributed style updates, ready for prime time · fc3c73b2
  Lorenz Meier authored Jul 04, 2013
  
  fc3c73b2
- Merge branch 'master' into integration_merge_connstatus · bd7beb1c
  Lorenz Meier authored Jul 04, 2013
```
nd an empty message aborts
```
  bd7beb1c
- Merge branch 'win_fixes' of github.com:Susurrus/qgroundcontrol into integration_merge_connstatus · 68d97969
  Lorenz Meier authored Jul 04, 2013
  
  68d97969
03 Jul, 2013 5 commits
- Windows compilation fails due to differing datatypes for input to pow() function. · 35bf2700
  Bryant authored Jul 03, 2013
  
  35bf2700
- Missing paren crashes windows compilation · b19d26a7
  Bryant authored Jul 03, 2013
  
  b19d26a7
- Fixed the titlebar styling of the dockwidgets in the main window. · 41134dfc
  Bryant authored Jul 03, 2013
  
  41134dfc
- Fixed compilation warning. · 3731055a
  Bryant authored Jul 03, 2013
  
  3731055a
- The Advanced Mode option is now checked properly if it's enabled. · ca74665a
  Bryant authored Jul 03, 2013
  
  ca74665a
02 Jul, 2013 2 commits
- Disable Google Earth on Mac OS since it was broken on all 64bit systems (thanks Google!) anyway · f8f49896
  Lorenz Meier authored Jul 02, 2013
  
  f8f49896
- Added rotation of mag vector into body frame in HIL · 52dc821e
  Lorenz Meier authored Jul 01, 2013
  
  52dc821e
01 Jul, 2013 2 commits
- Updated MAVLink, fixed up HIL · f9318458
  Lorenz Meier authored Jul 01, 2013
  
  f9318458
- Updated MAVLink · 478b476a
  Lorenz Meier authored Jul 01, 2013
  
  478b476a
22 Jun, 2013 1 commit

Fixed styling of the toolbar, specifically coloring and sizing of the buttons,... · df140d38

Bryant authored Jun 22, 2013

Fixed styling of the toolbar, specifically coloring and sizing of the buttons, and made the labels aware of the current window theme. Also made some changes to updating the toolbar when switching UASes or when UASes disconnect/reconnect.

df140d38

13 Jun, 2013 3 commits
- Merge branch 'master' of github.com:mavlink/qgroundcontrol · 1f55e9c1
  Lorenz Meier authored Jun 13, 2013
  
  1f55e9c1
- Potential fixes for ActiveQt · c2d396db
  Lorenz Meier authored Jun 13, 2013
  
  c2d396db
- Fixed windows build errors. · 9a9ca548
  Lorenz Meier authored Jun 13, 2013
  
  9a9ca548
12 Jun, 2013 4 commits
- Minor changes · bcb61f43
  Lorenz Meier authored Jun 12, 2013
  
  bcb61f43
- Merge branch 'integration_merge_connstatus' of... · a82ee387
  Lorenz Meier authored Jun 12, 2013
```
Merge branch 'integration_merge_connstatus' of github.com:Susurrus/qgroundcontrol into integration_merge_connstatus
```
  a82ee387
- Merge · 44543b30
  Lorenz Meier authored Jun 12, 2013
  
  44543b30
- Merge · 6f3376a2
  Lorenz Meier authored Jun 12, 2013
  
  6f3376a2
11 Jun, 2013 7 commits
- Changed the action button group in the toolbar to have an inset style like they used to. · d622ba22
  Bryant authored Jun 11, 2013
  
  d622ba22
- Fixed HUD / Video widget to be useful · eeda94f3
  Lorenz Meier authored Jun 11, 2013
  
  eeda94f3
- The QGCUnconnectedInfoWidget now remains square and has more rounded edges so... · 9a96e49f
  Bryant authored Jun 11, 2013
```
The QGCUnconnectedInfoWidget now remains square and has more rounded edges so that it looks more like a button.
```
  9a96e49f
- Increased label font size and progress bar height for toolbar child widgets. · 0102cf84
  Bryant authored Jun 11, 2013
  
  0102cf84
- Fixed issue when custom message set is enabled · efd916af
  Lorenz Meier authored Jun 11, 2013
  
  efd916af
- Fixed null pointer issue · 7fb92ad5
  Lorenz Meier authored Jun 11, 2013
  
  7fb92ad5
- Mac compile fixes · 44e5b5d6
  Lorenz Meier authored Jun 11, 2013
  
  44e5b5d6
10 Jun, 2013 12 commits
- Finished merging QGCVehicleConfig.ui, which I hadn't done properly last night.... · a50358e9
  Bryant authored Jun 10, 2013
```
Finished merging QGCVehicleConfig.ui, which I hadn't done properly last night. Things are now in a usable state again.
```
  a50358e9
- Merge branch 'integration_merge' of https://github.com/mavlink/qgroundcontrol into connStatus · 76cea4e1
  Bryant authored Jun 10, 2013
```
Conflicts:
	src/uas/ArduPilotMegaMAV.h
	src/ui/uas/UASListWidget.cc
```
  76cea4e1
- Merge branch 'integration_merge' of https://github.com/mavlink/qgroundcontrol into restyling · 5dd17698
  Bryant authored Jun 10, 2013
```
Conflicts:
	src/uas/ArduPilotMegaMAV.h
	src/ui/uas/UASListWidget.cc
```
  5dd17698
- Fixed include hack · 33c8f8c8
  Lorenz Meier authored Jun 10, 2013
  
  33c8f8c8
- Default to APM message set if no user config is provided · d7b4db7d
  Lorenz Meier authored Jun 10, 2013
  
  d7b4db7d
- Placed connect button better, added simple message console · b76b7282
  Lorenz Meier authored Jun 10, 2013
  
  b76b7282
- Merged the wrong file in for the QGCVehicleConfig.ui file. Fixed. · 0e58853b
  Bryant authored Jun 10, 2013
  
  0e58853b
- Merge branch 'connStatus' of github.com:Susurrus/qgroundcontrol into connStatus · d4425e06
  Bryant authored Jun 10, 2013
```
Conflicts:
	src/ui/QGCVehicleConfig.cc
	src/ui/QGCVehicleConfig.h
	src/ui/QGCVehicleConfig.ui
	src/ui/uas/UASControlWidget.cc
	src/ui/uas/UASListWidget.h
	src/ui/uas/UASQuickView.cc
```
  d4425e06
- Missed compilation error during rebase · 7aef7fcf
  Bryant authored Jun 10, 2013
  
  7aef7fcf
- Forgot to remove dead file LinkInterface.cpp from the qgroundcontrol.pro file. · 0a1c6784
  Bryant authored Jun 09, 2013
  
  0a1c6784
- Forgot to set some members of XbeeLinkInterface to const as well · ae682956
  Bryant authored Jun 09, 2013
  
  ae682956
- Changed many functions in the abstract *Link classes to be const. This... · d0af5b03
  Bryant authored Jun 09, 2013
```
Changed many functions in the abstract *Link classes to be const. This facilitates setting other functions as const. The metadata for specific links are reset when the links are added.
```
  d0af5b03