3 Commits

Author	SHA1	Message	Date
James Cotton	3110678321	Merge branch 'dynamic_uavo_next' into revo ... Conflicts: androidgcs/src/org/openpilot/uavtalk/uavobjects/ActuatorSettings.java androidgcs/src/org/openpilot/uavtalk/uavobjects/AltitudeHoldSettings.java androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatterySettings.java androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatteryState.java androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightStatus.java androidgcs/src/org/openpilot/uavtalk/uavobjects/HomeLocation.java androidgcs/src/org/openpilot/uavtalk/uavobjects/HwSettings.java androidgcs/src/org/openpilot/uavtalk/uavobjects/ManualControlSettings.java androidgcs/src/org/openpilot/uavtalk/uavobjects/OveroSyncStats.java androidgcs/src/org/openpilot/uavtalk/uavobjects/PipXSettings.java androidgcs/src/org/openpilot/uavtalk/uavobjects/PipXStatus.java androidgcs/src/org/openpilot/uavtalk/uavobjects/PositionActual.java androidgcs/src/org/openpilot/uavtalk/uavobjects/RelayTuning.java androidgcs/src/org/openpilot/uavtalk/uavobjects/RevoCalibration.java androidgcs/src/org/openpilot/uavtalk/uavobjects/SystemAlarms.java androidgcs/src/org/openpilot/uavtalk/uavobjects/TaskInfo.java androidgcs/src/org/openpilot/uavtalk/uavobjects/UAVObjectsInitialize.java androidgcs/src/org/openpilot/uavtalk/uavobjects/Waypoint.java ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp	2012-10-10 08:27:11 -05:00
James Cotton	4d0490dde9	Androidgcs: Symlink build/androidgcs/assets/uavo to the androidgcs directory to keep eclipse happy	2012-10-10 00:18:46 -05:00
James Cotton	f60a6baf3e	AndroidGCS OSG: Switch to hardcoded quad model instead of cow. The quad file was made from the 3DS models using ... osgconv --enable-object-cache -s 0.01,0.01,0.01 --simplify 0.1 --smooth ~/Programming/OpenPilot/artwork/3D\ Model/multi/joes_cnc/J14-QT_X.3DS quad.osg to get teh scaling normal for the screen too.	2012-08-21 15:24:07 -05:00