Philippe Renon
|
0d317d1435
|
OP-1071 fixed merge issue
|
2015-01-31 15:49:22 +01:00 |
|
Philippe Renon
|
44f3821dc6
|
OP-1071 uncrustified
|
2015-01-31 15:36:59 +01:00 |
|
Philippe Renon
|
5bc17d7b87
|
Merge remote-tracking branch 'origin/thread/OP-1071_Map_Emergency_Line' into next
Conflicts:
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointcircle.cpp
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointline.cpp
|
2015-01-31 15:35:07 +01:00 |
|
Richard von Lehe
|
4ac6aea23e
|
OP-1681 Fix Qwt library debug build naming
+review OPReview
|
2015-01-18 22:12:44 -06:00 |
|
Christian Gudrian
|
5caee931f5
|
fixed method signature to match the one in the superclass
|
2014-12-30 17:48:56 +13:00 |
|
James Duley
|
cc5786c989
|
OP-1557 Update Qwt: Updated to 6.1.2
|
2014-12-19 13:48:09 +13:00 |
|
m_thread
|
da541b356b
|
OP-1580 Upgraded to Qwt 6.1.1
|
2014-10-30 01:12:43 +01:00 |
|
a*morale
|
7127629031
|
OP-1549 - Fix Map version retrieval url. switch to http tiles as they works again and are way faster
|
2014-10-20 05:05:07 +11:00 |
|
m_thread
|
05d1f95dfd
|
Fixed Google Satellite version strings.
Credits to Craig Nuttall who found the issue.
|
2014-10-19 15:53:41 +02:00 |
|
m_thread
|
26eff1bb4e
|
OP-1538 Added Mustache template renderer by Robert Knight.
Added #include "utils_global.h"
Added QTCREATOR_UTILS_EXPORT to all public classes in header file.
See file header comments for Original Authors Copyright information.
See https://github.com/robertknight/qt-mustache
See http://mustache.github.io/
|
2014-10-15 00:40:09 +02:00 |
|
Philippe Renon
|
4ed8fb0188
|
OP-1488 fixed typo in uavobject.java.template
|
2014-09-15 09:00:44 +02:00 |
|
Fredrik Larsson
|
aebf41aad7
|
Merge remote-tracking branch 'origin/parched/OP-1478_fix_win_qtc_variables' into next
|
2014-09-14 22:50:43 +10:00 |
|
James Duley
|
ea64284d7d
|
OP-1478: added a qmake variable SDL_DIR
|
2014-09-13 15:24:52 +12:00 |
|
Fredrik Larsson
|
65e0124a74
|
Remove QtCreator user file from git
|
2014-09-08 18:19:03 +10:00 |
|
Laurent Lalanne
|
c6fc46403c
|
OP-1362 make_ts_errors Better fix, replace 0 with NULL and no more 'make ts' error. Tks Filnet
|
2014-08-28 00:11:46 +02:00 |
|
Laurent Lalanne
|
2202bbc7aa
|
OP-1362_make_ts_errors : Fix the last real error (filesearch.cpp)
|
2014-08-27 23:48:51 +02:00 |
|
Laurent Lalanne
|
2e5a28c5c3
|
OP-1362 make_ts_errors : Revert filesearch.cpp changes (compile error). Added Q_OBJECT for xmlconfig.cpp error
|
2014-08-27 01:35:09 +02:00 |
|
Laurent Lalanne
|
5f3699fbaa
|
OP-1362 make_ts_errors Fix for 'make ts' errors. Still two errors, with one to fix (xmlconfig.cpp:61: Class 'XmlConfig' lacks Q_OBJECT macro)
|
2014-08-26 23:30:57 +02:00 |
|
Alessio Morale
|
4581481852
|
Fix a bug making version checker not working for satellite.
|
2014-05-20 15:13:39 +02:00 |
|
Corvus Corax
|
718a35c376
|
OP-1353 Fix Position and Velocity in Flightgear HITL bridge
|
2014-05-19 00:18:57 +02:00 |
|
Philippe Renon
|
fe60509ffa
|
OP-1331 uncrustified
|
2014-05-16 23:53:04 +02:00 |
|
Philippe Renon
|
940074e6f6
|
OP-1348 Congig gadget would briefly flash next widget when replacing the currently selected widget (missing change)
|
2014-05-13 22:06:10 +02:00 |
|
Philippe Renon
|
513ba37746
|
OP-1348 Congig gadget would briefly flash next widget when replacing the currently selected widget
|
2014-05-13 22:04:01 +02:00 |
|
Corvus Corax
|
4b50708db6
|
uncrustify
|
2014-04-08 16:26:55 +02:00 |
|
Alessio Morale
|
c83284b21e
|
Merge remote-tracking branch 'origin/next' into shared/OP-1252_update_to_qt521
|
2014-04-08 11:31:23 +02:00 |
|
Philippe Renon
|
2d52720a87
|
OP-1263 fixed minor memory leak introduced during SDL refactoring
|
2014-03-23 16:53:17 +01:00 |
|
Philippe Renon
|
9e9673cde4
|
OP-1263 moved SDLGamepad members to new private class SDLGamepadPrivate so as to not expose SDL.h to users of this lib
|
2014-03-19 23:38:37 +01:00 |
|
Philippe Renon
|
2ee3780d08
|
OP-1263 SDL is now downloaded and installed independently and is not added to Qt anymore
|
2014-03-17 20:43:38 +01:00 |
|
Alessio Morale
|
0b30b79c98
|
Merge remote-tracking branch 'origin/amorale/OP-1149_gyro_accel_thermal_calibration' into next
Conflicts:
ground/openpilotgcs/src/libs/eigen/Eigen/src/Core/util/Memory.h
ground/openpilotgcs/src/plugins/config/revosensors.ui
ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
|
2014-03-09 14:38:08 +01:00 |
|
m_thread
|
076e690337
|
OP-1170 Got rid of more compiler warnings.
Uncrustified the code.
|
2014-03-04 23:45:01 +01:00 |
|
m_thread
|
a5e10d2034
|
OP-1170 Suppressing specific warnings not fixable.
|
2014-02-27 09:50:17 +01:00 |
|
m_thread
|
43bd1f3c69
|
OP-1170 Got rid of all compiler warnings in utils library.
|
2014-02-27 09:16:33 +01:00 |
|
m_thread
|
ae72735a50
|
OP-1170 Removed all compiler warnings from opmapcontrol library.
|
2014-02-27 09:08:38 +01:00 |
|
m_thread
|
a632b4ad06
|
OP-1170 Got rid of all compiler warning in Config Plugin
|
2014-02-26 17:17:37 +01:00 |
|
Alessio Morale
|
02c7084196
|
Merge remote-tracking branch 'origin/next' into amorale/OP-1149_gyro_accel_thermal_calibration
Conflicts:
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
|
2014-01-23 01:02:13 +01:00 |
|
Laurent Lalanne
|
8c4e45a893
|
Merge remote-tracking branch 'origin/next' into translations_next
|
2014-01-16 19:18:44 +01:00 |
|
Corvus Corax
|
41202a0227
|
Merge branch 'corvuscorax/OP-1022_AH_improvements_amorale' into next
|
2014-01-15 22:47:42 +01:00 |
|
Philippe Renon
|
694747cd27
|
Merge remote-tracking branch 'origin/next' into filnet/OP-1122_gcs_waypoint_editor_stabilization
Conflicts:
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
|
2014-01-15 20:12:08 +01:00 |
|
Corvus Corax
|
eb8d57cf31
|
uncrustification
|
2014-01-15 18:47:47 +01:00 |
|
Philippe Renon
|
d43b220dc0
|
OP-1122 uncrustified gcs and flight
|
2014-01-14 22:46:01 +01:00 |
|
Fredrik Arvidsson
|
38a709a0da
|
OP-984 Fixed false dirty indication. Added some constant.
|
2014-01-11 15:44:07 +01:00 |
|
Fredrik Arvidsson
|
b14c8bd4d2
|
OP-984 Gui fixes
|
2014-01-11 15:23:11 +01:00 |
|
m_thread
|
41506803e6
|
OP-984 Some gui fiddling.
|
2014-01-09 19:00:24 +01:00 |
|
Philippe Renon
|
e716d97803
|
OP-1122 OP-1120 moved CRC8 utility from uavtalk.cpp to new utils/crc.cpp
|
2014-01-09 01:10:18 +01:00 |
|
Alessio Morale
|
82691a9348
|
OP-1150 Update Eigen
|
2014-01-06 11:09:22 +01:00 |
|
Laurent Lalanne
|
bdbbaa4f93
|
Merge branch 'next' into translations_next
Conflicts:
ground/openpilotgcs/src/libs/utils/logfile.cpp
ground/openpilotgcs/src/libs/utils/logfile.h
ground/openpilotgcs/src/plugins/coreplugin/aboutdialog.cpp
ground/openpilotgcs/src/plugins/coreplugin/aboutdialog.h
ground/openpilotgcs/src/plugins/telemetry/monitorwidget.h
ground/openpilotgcs/src/plugins/telemetry/telemetry_global.h
|
2013-12-23 13:02:27 +01:00 |
|
Laurent Lalanne
|
5112d465ad
|
git merge next
|
2013-12-18 20:14:26 +01:00 |
|
Philippe Renon
|
617924e64d
|
Merge remote-tracking branch 'origin/next' into filnet/OP-1122_gcs_waypoint_editor_stabilization
Conflicts:
flight/uavobjects/uavobjectmanager.c
ground/openpilotgcs/src/plugins/uavtalk/telemetrymanager.cpp
ground/openpilotgcs/src/plugins/uavtalk/uavtalk.pro
shared/uavobjectdefinition/pathaction.xml
shared/uavobjectdefinition/waypoint.xml
|
2013-12-08 14:58:01 +01:00 |
|
Fredrik Arvidsson
|
517cf53b76
|
Merge remote-tracking branch 'origin/next' into thread/OP-1119_Flight_Side_Logs_Plugin
Conflicts:
ground/uavobjgenerator/generators/gcs/uavobjectgeneratorgcs.cpp
|
2013-12-07 17:06:09 +01:00 |
|
Corvus Corax
|
e8150399f6
|
Merge branch 'corvuscorax/onboardlogging' into next OP-56 OPReview-586 OPReview-587 OPReview-585
|
2013-12-07 15:21:10 +01:00 |
|