barnold1953
2eda35ff1d
Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay
...
Conflicts:
interface/src/ui/ApplicationOverlay.cpp
2014-06-17 12:25:09 -07:00
barnold1953
e775d645a7
Fixed NAN error with magnification windows
2014-06-17 12:19:15 -07:00
Andrew Meadows
b37b9fb097
remove warnings about unused variables
2014-06-17 11:59:26 -07:00
barnold1953
7bb8e4d571
Animated magnification opening and closing
2014-06-17 11:20:02 -07:00
barnold1953
dc663dedf8
Fixed compiler warnings
2014-06-17 10:45:59 -07:00
barnold1953
3052996a9e
Pressing trigger and bumper at same time toggles UI
2014-06-17 10:37:15 -07:00
Brad Hefta-Gaub
5b62733a36
Merge pull request #3025 from talentraspel/19753
...
replaced usleep for windows
2014-06-16 17:40:01 -07:00
barnold1953
b0e89c5810
Made magnification use only button 3
2014-06-16 17:34:18 -07:00
Philip Rosedale
0084c36cd0
Merge pull request #3024 from Barnold1953/OculusOverlay
...
Exposed sixense mouse options and oculus UI angle to prefs
2014-06-16 16:42:33 -07:00
barnold1953
2b374470b0
Allow clicking on magnified controls
2014-06-16 15:24:53 -07:00
barnold1953
84d183b2bc
Switched Oculus magnify method to a manual mode
2014-06-16 14:46:40 -07:00
Ryan Huffman
9faf9d7749
Remove extra connect and disconnect for multipleDestinationsDecision
2014-06-16 11:43:04 -07:00
Ryan Huffman
a13810bd72
Merge branch 'master' of git://github.com/highfidelity/hifi into 19779
...
Conflicts:
interface/src/location/LocationManager.cpp
2014-06-16 11:35:55 -07:00
Ryan Huffman
978b7521db
Move connect call for multiple destinations to constructor
2014-06-16 11:30:47 -07:00
Ryan Huffman
af3b2a9d0f
Update LocationManager::goTo to use new addresses API
...
The new API address is now used for goTo when # or @ isn't present
Fixed the multiple locations popup to show when multiple locations are
found
2014-06-16 10:43:13 -07:00
barnold1953
031fe323ea
Got rid of some verbosity
2014-06-16 10:12:09 -07:00
barnold1953
94e58e9559
Fixed coding standard and made getCursorPixelRangeMultiplier more clear
2014-06-16 10:04:56 -07:00
Kai Ludwig
8c700d43f3
Modified CALLBACK_ACCELERATOR_RATIO for windows because some systems need larger input buffer to work fine.
2014-06-15 21:08:14 +02:00
Kai Ludwig
05900420a5
Replaced windows usleep version with a non busy waiting high accuracy version. This fixes the high CPU load for the windows servers too!
2014-06-15 21:07:03 +02:00
barnold1953
bef625d237
Removed pointless Code
2014-06-13 16:14:03 -07:00
barnold1953
53d4cc795a
Removed unused UI types that clutter code
2014-06-13 16:09:45 -07:00
barnold1953
587c0e5a9d
Render Oculus pointers separate from texture for better quality
2014-06-13 16:01:59 -07:00
barnold1953
7e4317d5d2
Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay
2014-06-13 15:06:11 -07:00
barnold1953
cb1669653d
Mouse reticle bigger in oculus
2014-06-13 15:05:23 -07:00
barnold1953
c593117ac5
New reticle for sixense and oculus mouse movement
2014-06-13 15:03:09 -07:00
barnold1953
230af7f5a7
Stopped clamping the magnification
2014-06-13 13:49:35 -07:00
barnold1953
3747a5eeae
update hemisphere VBO on ui size change
2014-06-13 13:38:28 -07:00
barnold1953
422db14812
Fixed some improper logic and used better defaults
2014-06-13 11:34:57 -07:00
barnold1953
4a1307fa38
Killed two warnings
2014-06-13 10:54:50 -07:00
barnold1953
e4a0275f57
Exposed sixense and mouse options and oculus UI angle to preferences
2014-06-13 10:53:11 -07:00
John Grosen
14f56310f6
Changed AccountManager to only rely on a proper OAuth response.
...
This involved making another request after the initial OAuth authorization.
Because of this now-two-step process, some methods and signals were renamed
to make their purpose more clear. Additionally, a _hasProfile member variable
was added to DataServerAccountInfo in order to allow for knowledge of whether
the profile elements had been fetched when being deserialized from disk.
Error handling for the whole process is still nonexistant.
2014-06-12 23:28:43 -07:00
Brad Hefta-Gaub
e8ba3c8bb1
Merge pull request #3019 from ctrlaltdavid/19769
...
Code Review for Job #19769
2014-06-12 17:31:53 -07:00
Brad Hefta-Gaub
de40c3b7a3
Merge pull request #3020 from birarda/master
...
fix bug in lookup for places with spaces
2014-06-12 17:30:55 -07:00
Stephen Birarda
3e50443ea1
let QUrl do its automatic percent encoding for address lookup
2014-06-12 16:03:18 -07:00
barnold1953
16f9b8c3ed
Removed some unused variables.
2014-06-12 15:49:00 -07:00
barnold1953
12eb9114e8
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-06-12 15:40:56 -07:00
barnold1953
91f23fcf2d
Fix for click and drag with sixense
2014-06-12 15:39:40 -07:00
barnold1953
a13ef5c3bf
Made applicationoverlay more readable
2014-06-12 13:19:02 -07:00
barnold1953
bc293071d6
Removed left handed menu option
2014-06-12 12:25:22 -07:00
barnold1953
18543ff313
Support for multiple oculus overlay magnifiers
2014-06-12 12:07:25 -07:00
Andrzej Kapolka
5c7e0cfd4c
Merge pull request #3015 from ctrlaltdavid/build_warning_fix
...
Fix build warning in Audio.cpp
2014-06-12 11:23:52 -07:00
barnold1953
762751ef6a
Store the last mouse move input type for application overlay
2014-06-12 10:47:11 -07:00
barnold1953
d0b1880ee4
Experimenting with ambidextrous sixense mouse input
2014-06-12 10:20:35 -07:00
David Rowe
1503946b7c
Fix build warning in Audio.cpp
...
\interface\src\Audio.cpp(309): warning C4018: '<' : signed/unsigned mismatch
2014-06-11 21:11:49 -07:00
barnold1953
32a9eed88d
Fixed build failure
2014-06-11 18:05:10 -07:00
barnold1953
14a591c5d8
Move to previous line
2014-06-11 17:35:50 -07:00
barnold1953
d993fd52f2
Cleaned up a small bit of code
2014-06-11 17:27:00 -07:00
barnold1953
84e01e6b25
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-06-11 17:22:30 -07:00
barnold1953
2fec7400e2
Added menu options for sixense mouse input
2014-06-11 17:21:59 -07:00
barnold1953
eff097638c
Implementd sixense mouse emulation
2014-06-11 17:02:08 -07:00
