Hugo Vincent
|
dc4e85a1ac
|
This commit and the previous merge attempts to align my tree with upstream changes. It works for me but apologies in advance if i break anything
|
15 years ago |
|
Hugo Vincent
|
fe4c2dca9c
|
Merge branch 'master' of pixhawk.ethz.ch:groundcontrol
Conflicts:
mavground.pri
src/AudioOutput.h
src/Core.cc
|
15 years ago |
|
Hugo Vincent
|
43b9545887
|
Tidy up .pri file slightly
|
15 years ago |
pixhawk
|
03f3b2113a
|
Fixes for audio on Linux
|
15 years ago |
|
pixhawk
|
90177facc2
|
Splashscreen fixes
|
15 years ago |
|
pixhawk
|
1b380af8f9
|
Merge branch 'master' of pixhawk.ethz.ch:groundcontrol
|
15 years ago |
|
pixhawk
|
60e0f0ff90
|
Added windows audio
|
15 years ago |
pixhawk
|
889f7af56e
|
Fixed audio issue on windows
|
15 years ago |
lm
|
3385b837e4
|
Merge branch 'master' of git@pixhawk.ethz.ch:groundcontrol
|
15 years ago |
|
lm
|
9c256d6ef8
|
Fixed some issues in HUD and Head down display
|
15 years ago |
|
pixhawk
|
cac6021888
|
Merge branch 'master' of pixhawk.ethz.ch:groundcontrol
|
15 years ago |
|
pixhawk
|
91bfe56b79
|
Fixed Linux compatibility of Linux Qt Phonon support
|
15 years ago |
|
lm
|
d0a07f19f0
|
Stability changes
|
15 years ago |
|
Hugo Vincent
|
bc39533214
|
Merge
|
15 years ago |
|
Hugo Vincent
|
78b9e3f554
|
More cleanups
|
15 years ago |
pixhawk
|
3079a42d62
|
Fixed windows compile error
|
15 years ago |
|
pixhawk
|
c522b4ed95
|
Included Hugos x64 MAC fixes, changed voice interface to Apple native for Mac computers
|
15 years ago |
|
pixhawk
|
85f384879f
|
Minor changes
|
15 years ago |
|
pixhawk
|
fc05048148
|
Minor cleanup in the build files
|
15 years ago |
|
pixhawk
|
97378dc05d
|
Fixed compile issues on non-64bit OS X systems
|
15 years ago |
|
pixhawk
|
a41997315a
|
Added patch from Hugo which fixes some OS X issues
|
15 years ago |
|
Hugo Vincent
|
2291af59fd
|
Switched from flite for speech on the Mac to built-in MacOSX speech synthesizer. Fixed build system for 64-bit builds (using official SDL.framework, and Qt frameworks).
|
15 years ago |
|
pixhawk
|
6e80dbbad4
|
Merge branch 'master' of github.com:pixhawk/groundcontrol
|
15 years ago |
|
pixhawk
|
8486386a07
|
Removed Vicon tarsus interface until it is finished
|
15 years ago |
|
pixhawk
|
bc33da5204
|
Added true audio output
|
15 years ago |
|
pixhawk
|
124997d0b5
|
Minor UI improvements, pushed implementation of some UI elements
|
15 years ago |
|
pixhawk
|
dfae554be4
|
Major stability improvements
|
15 years ago |
|
pixhawk
|
4fa6562e5c
|
Initial import
|
15 years ago |
