5895 Commits

Author	SHA1	Message	Date
samguns	b37429c89d	2015-02-16	2015-02-16 16:09:33 +08:00
Laurent Lalanne	8e5dfff555	Updated Ts file from source	2015-02-15 10:17:53 +01:00
Laurent Lalanne	9344351665	Merge remote-tracking branch 'origin/next' into samguns/zh_CN_GCS	2015-02-15 10:16:28 +01:00
samguns	9f65db5e0b	Initial commit of Chinese translation for GCS.	2015-02-15 15:27:56 +08:00
James Duley	4cc4ef1537	OP-1722 libusb include incorrect: make ophid.pro use pkg-config ... correctly	2015-02-14 18:37:26 +13:00
James Duley	fb59e5aef4	OP-1722 libusb include incorrect: tidy ophid.pro	2015-02-14 18:37:26 +13:00
James Duley	88d8e3d215	OP-1722 libusb include incorrect: removed rogue <usb.h> inlcude	2015-02-14 18:36:26 +13:00
Fredrik Larsson	b0a0582e85	update default model to BO	2015-02-12 10:47:12 +11:00
Nuno Guedes	e4c431da49	New 3D model: Blackout Mini H Quad ... New 3D model for the Modelview Blackout Mini H Quad with lighter texture	2015-02-11 20:44:22 +00:00
Alessio Morale	544b0357c7	uncrustify	2015-02-10 23:51:19 +01:00
Alessio Morale	6ed06362a7	Merge branch 'master' into next	2015-02-10 23:50:19 +01:00
Alessio Morale	46521f1c2d	Merge remote-tracking branch 'origin/amorale/OP-1683_syncupdate_oneshot' into next	2015-02-08 17:59:59 +01:00
abeck70	4f0ab4ae85	rel-15.01 Corrected whatsnew and new cloud configs	2015-02-08 14:56:44 +11:00
Laurent Lalanne	105b01680d	Merge branch 'laurent/OP-1644_Wrong_wizard_neutral' into next	2015-02-07 19:03:36 +01:00
Laurent Lalanne	21fe64eec0	Merge branch 'laurent/OP-1698_Easy_setup_channel_passtrough' into next	2015-02-07 19:02:19 +01:00
m_thread	aa891801f4	OP-1628 Removed obsolete slot declaration.	2015-02-05 11:35:22 +01:00
m_thread	f42afa61cd	OP-1628 Fixed a bug introduced in refactoring.	2015-02-05 10:05:47 +01:00
m_thread	87bd6243b4	OP-1628 Uncrustify	2015-02-05 09:55:31 +01:00
m_thread	9a5dc36826	Merge remote-tracking branch 'origin/rel-15.01' into thread/OP-1628_AutoUpgrade_OPLM_Issues	2015-02-05 09:51:02 +01:00
m_thread	a24fd253b4	OP-1628 Fixed review comments.	2015-02-03 22:24:57 +01:00
Laurent Lalanne	2454ac6d6c	OP-1644 Reuse the same function for special neutrals	2015-02-03 22:13:30 +01:00
Laurent Lalanne	23865ed0b0	OP-1644 Really set FlightMode neutral centered + some minor fixes in code	2015-02-03 21:50:45 +01:00
James Duley	3d797914a3	OP-1701 Fix Linux Qt config: added a resource with qt.conf which has correct prefix set	2015-02-03 15:51:59 +13:00
Karl Knutsson	137c183ec2	OP-1522 Remove unused channel set cfg ... Remove unused channel set configuration option. With the new channel allocation the old channel set configuration isn't needed.	2015-02-02 21:25:38 +01:00
m_thread	d72504d20f	OP-1576 Removed TxResent from GUI. Renamed some files.	2015-02-02 21:25:38 +01:00
Alessio Morale	09319c3805	OP-1683 - fix casing and cleanup of gcs code	2015-02-02 20:35:39 +01:00
m_thread	31a6a32fce	OP-1628 Added special handling for OPLink boards and Upgrade/Reboot functionality.	2015-02-02 00:14:02 +01:00
Laurent Lalanne	d567d88216	OP-1698 Changes from review	2015-02-01 23:19:04 +01:00
Alessio Morale	a7caee7bc4	OP-1683 - update tooltips, small UI changes	2015-02-01 21:27:25 +01:00
Laurent Lalanne	4ca715bddf	OP-1698 Removed empty lines	2015-02-01 18:30:39 +01:00
Laurent Lalanne	4423fa9d0c	OP-1698 Added channel allocation checking - Little HexaH bug - Uncrustify	2015-02-01 18:02:19 +01:00
Laurent Lalanne	f18aa3d2cb	OP-1698 Add curve choice for all accessory outputs	2015-02-01 14:59:18 +01:00
Laurent Lalanne	8c0a33cd6f	OP-1698 First commit : Add Accessory0,1,2 to Output	2015-02-01 06:22:38 +01:00
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
Alessio Morale	6f3f7b9972	OP-1683 - fix limits handling and definitions	2015-01-30 21:43:59 +01:00
Laurent Lalanne	be342b7ad3	OP-1337 French updates : Autoupdate firmware	2015-01-30 20:29:14 +01:00
m_thread	f61a013e0b	Merge branch 'thread/OP-1628_Reboot_Board_In_Wizard' into next	2015-01-30 16:43:21 +01:00
m_thread	e88aa12d78	OP-1628 Adjusting some form labels.	2015-01-30 16:40:36 +01:00
m_thread	5027875655	OP-1628 Forms cleanup.	2015-01-29 22:28:05 +01:00
m_thread	292bfccd29	OP-1628 Changed text on some buttons.	2015-01-29 21:25:28 +01:00
Philippe Renon	faacd3e34b	OP-1651 uncrustified	2015-01-29 21:18:35 +01:00
Philippe Renon	c69d8841f4	Merge branch 'origin/filnet/OP-1651_add_gcs_command_line_option_to_log_to_file' into next	2015-01-29 21:15:20 +01:00
m_thread	d378ecb3b6	OP-1668 Adjusting layout.	2015-01-28 00:41:11 +01:00
Alessio Morale	26fcec09e3	OP-1683 - Show bank number and color beside output number	2015-01-27 19:39:45 +01:00
m_thread	73954dadea	OP-1668 Fixed widget updates.	2015-01-27 15:05:59 +01:00
m_thread	4f7344121e	Merge remote-tracking branch 'origin/next' into thread/OP-1668_Mixer_Curve_2_Source	2015-01-27 13:31:09 +01:00
m_thread	8ffc77f537	OP-1628 Fixed some review issues. Updated some text.	2015-01-27 08:43:06 +01:00
m_thread	205a2d7b7a	OP-1628 Uncrustify	2015-01-26 23:03:39 +01:00