3749 Commits

Author	SHA1	Message	Date
Fredrik Larson	c4e049f1ed	Merge remote-tracking branch 'origin/hayvosh/OP-1489_ILimits' into next	2014-09-18 02:37:53 +10:00
Fredrik Larson	db94453bdf	comment typeo	2014-09-18 00:35:07 +10:00
Fredrik Larson	e95689b0fc	Old bug, buttongroup clash	2014-09-17 22:33:32 +10:00
Fredrik Larson	1de454a4cf	Merge remote-tracking branch 'origin/next' into hayvosh/OP-1489_ILimits	2014-09-17 21:47:54 +10:00
Fredrik Larson	f5fa57c7da	Merge remote-tracking branch 'origin/laurent/OP-1134_Populate_new_custom_tab' into next	2014-09-17 08:15:31 +10:00
Fredrik Larson	e4e1e0ed24	Uncrusty	2014-09-17 07:23:58 +10:00
Fredrik Larson	d7ffa008b1	Make alt hold default buttons disabled, they were missing from the constructor	2014-09-17 06:15:07 +10:00
Fredrik Larson	6fe00a773c	Some buttons missing from UI setup	2014-09-17 05:47:27 +10:00
Fredrik Larson	cb38cfb118	New UI layout, remove a tab	2014-09-17 05:30:28 +10:00
Fredrik Larson	20b635fa07	Merge branch 'next' into hayvosh/OP-1489_ILimits	2014-09-17 02:25:53 +10:00
Alessio Morale	c49497f2e0	Merge branch 'amorale/OP-1434_GPSV9_fc_support' into next	2014-09-15 23:49:54 +02:00
Fredrik Larson	bc0e8521e0	Prefer this wording, technically might be wrong, but it's what it acts ... like it does	2014-09-16 01:28:07 +10:00
Fredrik Larson	5c7fbebb1c	More usability bits, less scary knobs to tweek.	2014-09-16 01:14:17 +10:00
Fredrik Larson	599112e50e	Some Minor language changes	2014-09-16 01:03:11 +10:00
Fredrik Larson	98cf9d7063	ILimits are so not touched by usrs, even the tinkers, lets clean this up a ... bit.	2014-09-16 00:54:43 +10: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	5cc91467ef	OP-1478 fix_win_qtc_variables: added MESAWIN_DIR variable	2014-09-14 12:50:30 +12:00
James Duley	18ad22a177	OP-1478: allow alternate SDL_DIR or OPENSSL_DIR	2014-09-14 12:01:14 +12:00
James Duley	684180ef87	OP-1478: added a qmake variable OPENSSL_DIR	2014-09-13 17:48:30 +12:00
James Duley	17bb1d2fc0	OP-1478 fix win qtc vairables: fixed TOOLS_DIR check	2014-09-13 16:37:30 +12:00
James Duley	ea64284d7d	OP-1478: added a qmake variable SDL_DIR	2014-09-13 15:24:52 +12:00
Alessio Morale	c777f9e194	OP-1406 - Fixes from review comments	2014-09-08 23:24:18 +02:00
James Duley	67e7801949	OP-1478: move TOOLS_DIR out of linux scope	2014-09-08 21:29:44 +12:00
Fredrik Larsson	65e0124a74	Remove QtCreator user file from git	2014-09-08 18:19:03 +10:00
Fredrik Larrson	353e3ec0a8	Merge remote-tracking branch 'origin/parched/OP-1463_allow_for_alternative_OPENPILOT_TOOLS_DIR' into next	2014-09-08 15:53:03 +10:00
Fredrik Larrson	849bbfd481	Merge remote-tracking branch 'origin/skarlsso/OP-1455_no_output_from_test_outputs' into next	2014-09-08 04:25:02 +10:00
Fredrik Larrson	b9a2cac03f	Merge remote-tracking branch 'origin/skarlsso/OP-1077_gcs_corrupts_flight_log_files' into next	2014-09-08 04:24:07 +10:00
Fredrik Larrson	11a4a249b8	Merge remote-tracking branch 'origin/skarlsso/OP-1459_workaround_white-box_issue' into next	2014-09-08 02:33:39 +10:00
Fredrik Larrson	d91db0af6f	Revert "Merge remote-tracking branch 'origin/proff/OP-1373_DSMFixes' into next" ... This reverts commit a39e393274, reversing changes made to ebfdaf28b5.	2014-09-08 02:31:02 +10:00
Fredrik Larrson	a39e393274	Merge remote-tracking branch 'origin/proff/OP-1373_DSMFixes' into next ... Conflicts: shared/uavobjectdefinition/hwsettings.xml	2014-09-08 01:54:59 +10:00
Fredrik Larrson	32773c0245	Merge remote-tracking branch 'origin/laurent/OP-1349_GCS_Neutral_Spinboxes_in_Input_and_Output' into next	2014-09-08 01:27:23 +10:00
Stefan Karlsson	9bfd648879	OP-1077 Prevent GCS flight log corruption when no flight log is chosen	2014-09-03 21:19:15 +02:00
Fredrik Larson	650cbd3b52	Uncrustify	2014-09-03 02:46:26 +10:00
Fredrik Larson	6243cad768	Change mouse pointr type to show this is a link	2014-09-02 23:18:45 +10:00
Alessio Morale	f69e476ed3	Merge branch 'amorale/OP-1452_comusbbridge_improvements' into next	2014-08-29 20:25:29 +02:00
Laurent Lalanne	5f346d81e9	OP-1349_GCS Neutral_Spinboxes_in_Input_and_Output Disable keyboard tracking on inputform spinboxes (min, max, neutral).	2014-08-29 19:45:29 +02:00
Fredrik Larson	d4d1c9c482	Merge remote-tracking branch 'origin/dwillis/OP-1453_VersionCheck' into next	2014-08-29 09:51:18 +10:00
James Duley	e5d1676d44	OP-1463 allow for alternative_OPENPILOT_TOOLS_DIR:added check to see if it is set and use it if possible	2014-08-29 09:01:30 +12:00
Fredrik Larson	41ecbc3eba	Merge remote-tracking branch 'origin/laurent/OP-1438_VSI_Arc_PFD+Status' into next	2014-08-29 07:00:58 +10:00
Fredrik Larson	8d691f0f48	Merge remote-tracking branch 'origin/laurent/OP-1422_Tricopter_mixers_settings' into next	2014-08-29 06:54:22 +10:00
Fredrik Larson	ed85e026b1	Merge remote-tracking branch 'origin/laurent/OP-1362_make_ts_errors' into next	2014-08-29 06:53:43 +10:00
Fredrik Larson	82c38a0b90	Merge remote-tracking branch 'origin/laurent/OP-868_Text_in_Barographs' into next	2014-08-29 06:52:49 +10:00
Laurent Lalanne	d5c8e9a51e	OP-1134 Populate_new_custom_tab Lock Custom mixer table until frameType is saved on board, next edit.	2014-08-28 22:30:30 +02:00
Laurent Lalanne	485600ab5d	OP-1134 Populate_new_custom_tab : Fix comment	2014-08-28 20:25:22 +02:00
Laurent Lalanne	944e6882c5	OP-1134 Populate_new_custom_tab : Removed question mark	2014-08-28 20:18:54 +02:00
Laurent Lalanne	465f6dc701	OP-1134 Populate_new_custom_tab Protect current mixer table : Changes on Custom tab can't be saved until frameType is set to Custom.	2014-08-28 15:59:32 +02:00
Laurent Lalanne	b8913209dc	OP-1134_Populate_new_custom_tab : Typo, bad cleannup	2014-08-28 14:47:37 +02:00
Laurent Lalanne	c00aef04f8	OP-1134 Populate_new_custom_tab : Always update custom tab from airframe's mixer currently used	2014-08-28 14:43:52 +02:00
Laurent Lalanne	eda53adf9e	OP-1134 Populate_new_custom_tab Sub task OP-790 : Added custom labels in output, up to 8 Motors, revMotors or Servos	2014-08-28 13:40:02 +02:00