Stacey Sheldon
|
127ca1e7e1
|
Merge remote-tracking branch 'op-public/next' into revo-next
Conflicts:
ground/openpilotgcs/src/plugins/hitl/plugin.pro
ground/openpilotgcs/src/plugins/hitlnew/fgsimulator.cpp
ground/openpilotgcs/src/plugins/hitlnew/hitlconfiguration.cpp
ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.cpp
ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.ui
ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
ground/openpilotgcs/src/plugins/hitlnew/simulator.cpp
ground/openpilotgcs/src/plugins/hitlnew/simulator.h
ground/openpilotgcs/src/plugins/hitlnew/xplanesimulator.cpp
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
|
2012-10-20 13:56:18 -04:00 |
|
Sambas
|
06a814c8a9
|
Fixing most warnings from osd fw
|
2012-06-02 15:52:38 +03:00 |
|
Sambas
|
7eefe83335
|
Cleanup and fix
|
2012-05-26 13:38:01 +03:00 |
|
Sambas
|
a3b9451bcd
|
Merged some stuff to make original hardware work better
|
2012-05-24 20:14:15 +03:00 |
|
James Cotton
|
b3150500d5
|
Change the buffers to byte buffers and update most of the drawing code to use
it accordingly. Large fonts broken.
|
2012-05-24 18:25:09 +03:00 |
|
Sambas
|
ccf5c310c9
|
Updates
|
2012-03-11 09:27:38 +02:00 |
|
Sambas
|
91a9e45888
|
Updates, first UAVtalk client test
|
2012-03-05 19:53:52 +02:00 |
|
Sambas
|
0bc08a48d8
|
cleanup 'n' updates
|
2012-02-14 21:42:09 +02:00 |
|
Sambas
|
8cc876d02a
|
OSD branch
|
2012-02-12 22:29:42 +02:00 |
|