Oleg Semyonov
e62cc8914c
Merge remote branch 'origin/next' into os/features/pid-tuning-from-transmitter-next
...
Conflicts:
flight/CopterControl/Makefile
ground/openpilotgcs/src/plugins/config/config.pro
ground/openpilotgcs/src/plugins/config/configtaskwidget.cpp
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
shared/uavobjectdefinition/hwsettings.xml
2012-02-22 23:03:17 +02:00
James Cotton
dc340596f5
Merge branch 'next' into GCS_ChangesToUI-RuntimeCFG
...
Conflicts:
flight/CopterControl/Makefile
flight/OpenPilot/System/pios_board.c
flight/OpenPilot/UAVObjects.inc
flight/PiOS/STM32F10x/pios_spektrum.c
ground/openpilotgcs/src/plugins/config/config.pro
ground/openpilotgcs/src/plugins/config/configgadget.qrc
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
shared/uavobjectdefinition/hwsettings.xml
2011-08-27 15:26:05 -05:00
Dmytro Poplavskiy
ed51756191
Compilation fix on mac
...
It's safer to define GL_CLAMP_TO_EDGE if not available than
to include GL/glext.h.
2011-08-22 09:10:25 +10:00
Dmytro Poplavskiy
6e506161e0
Compilation fix
...
It's necessary to include GL/glext.h on windows for
GL_CLAMP_TO_EDGE define.
2011-08-22 07:34:59 +10:00
Dmytro Poplavskiy
69d5e7fe7e
Added missing Q_DECL_EXPORT to CachedSvgItem
2011-08-21 23:40:11 +10:00
Dmytro Poplavskiy
bbc137eabe
Added initial CachedSvgItem implementation
...
Texture is regenerated each time item is scaled
but it's reused during rotation, unlike the default
DeviceCoordinateCache mode.
2011-08-21 21:36:41 +10:00
zedamota
98f84e472b
Trying to get out of merge hell
2011-08-15 14:12:54 +01:00
James Cotton
224e75bfe5
Merge remote-tracking branch 'origin/PeterG/OP-290_GCS_workspaces' into next
2011-08-08 21:29:07 -05:00
Peter Gunnarsson
76ee2c060c
OP-520 Change $$qtLibraryTarget to $$qtLibraryName
2011-08-04 15:17:08 +02:00
Peter Gunnarsson
fc2e1c7fd7
Add new widgets with simpler code than what is used currently (FancyTabWidget).
2011-08-03 10:02:51 +02:00
James Cotton
8f808df113
Fix for Utils trying to not include the debug library on OSX and Mac
2011-06-01 13:59:10 -05:00
David Buzz Carlson
2691b80576
Fix segfault on close. Fix _terrible_ variable naming. Fix excessive qDebug messages.
2011-05-31 23:31:40 -07:00
PeterG
d18a229a76
Change default settings format from ini to xml
2011-05-29 14:02:10 +02:00
zedamota
ccd383c999
Fixes compile issues on windows with latest Qt
2011-05-25 16:15:01 +01:00
Oleg Semyonov
1cae0cd167
OP-179: final fix (builds on Linux and Windows)
2011-05-09 20:09:00 +03:00
Oleg Semyonov
75c5761506
Revert "Revert change for opmaplib, causes linking problems on Windows."
...
This reverts commit 822017953e
and fixes it to work on Windows too.
2011-05-09 19:36:17 +03:00
elafargue
a97efad8f9
Modify "StoragePath" to use the settings storage directory and not the home directory. Works on Linux.
2011-05-09 15:19:10 +02:00
peabody124
4120937391
OP-364 OP-191: Convert the OPMap setting of HomeLocation to mGau to match the
...
changes in flight code
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3083 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-03-28 10:40:26 +00:00
corvus
9859829fcc
HITL/IL2: Fixed calculation of AttitudeRaw.accel[XYZ]
...
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3025 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-03-11 20:16:31 +00:00
pip
4a1842f3be
Added code to check for invalid parameters.
...
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2827 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-02-21 11:15:39 +00:00
pip
7a34e25956
Added a home location utility
...
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2825 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-02-21 11:08:56 +00:00
corvus
a91a35685a
IL2 add quaternion attitude and accels
...
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2802 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-02-17 01:51:45 +00:00
pip
0a2a59baa4
Changed the main function parameter format.
...
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2542 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-01-23 18:03:59 +00:00
stac
7195862d77
build: Move openpilotgcs into its own subdirectory
...
This will allow us to build a parent project for
qt-creator that sits above both openpilotgcs and
uavobjgenerator so that we can build both projects
at the same time.
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2528 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-01-22 17:40:26 +00:00