Andrzej Kapolka
9fc84d6358
Generics up and running.
2014-06-13 12:00:42 -07:00
barnold1953
422db14812
Fixed some improper logic and used better defaults
2014-06-13 11:34:57 -07:00
John Grosen
3af4e32c81
Now determines hasProfile from presence of username
2014-06-13 11:08:38 -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
Andrzej Kapolka
9e151001e0
More object streaming refactory.
2014-06-12 18:47:18 -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
60e1138a40
Merge pull request #3021 from jmgrosen/19778
...
Code Review for Job #19778
2014-06-12 17:28:32 -07:00
John Grosen
f0cb49ef5c
added space between expressions in ternary operator
2014-06-12 17:24:56 -07:00
John Grosen
becbd343c3
Merge branch 'master' of git://github.com/highfidelity/hifi
2014-06-12 17:09:50 -07:00
John Grosen
47a88a2713
Updated AssignmentClient to use HifiConfigVariantMap...
...
...and also updated DomainServer to appropriately use boolean options
2014-06-12 17:08:23 -07:00
John Grosen
8e74398ed7
Fixed command line args parsing bug
2014-06-12 17:06:59 -07:00
Andrzej Kapolka
b4bd774789
Midpoint on generic object streaming.
2014-06-12 16:22:32 -07:00
Philip Rosedale
7ad6850327
Merge pull request #3018 from Barnold1953/master
...
Ambidextrous sixense mouse usage
2014-06-12 16:22:22 -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
Stephen Birarda
7cb8f744c2
Merge pull request #3017 from birarda/master
...
fix offset to attribute in STUN packet
2014-06-12 13:16:24 -07:00
Stephen Birarda
d689c6b39f
fix reference to attribute in STUN packet
2014-06-12 13:15:54 -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
056db4ba7d
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-12 11:45:51 -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
b05aa3405c
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-06-12 10:41:57 -07:00
barnold1953
db94ae7449
Invert hydra move view and thrust controllers to match consoles
2014-06-12 10:27:54 -07:00
barnold1953
d0b1880ee4
Experimenting with ambidextrous sixense mouse input
2014-06-12 10:20:35 -07:00
Brad Hefta-Gaub
09dd2dfbb6
Merge pull request #3014 from Barnold1953/master
...
Sixense Mouse Input
2014-06-12 09:43:30 -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
Andrzej Kapolka
6c98248e50
More progress on generics.
2014-06-11 18:30:01 -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
Andrzej Kapolka
6260d661f3
More work on generic containers.
2014-06-11 16:54:35 -07:00
Brad Hefta-Gaub
107fbf8c29
Merge pull request #3012 from wangyix/master
...
added OctreePacketProcessor::nodeKilled to Application::nodeKilled instead of connecting it to NodeList::nodeKilled
2014-06-11 16:00:59 -07:00
wangyix
7aef5edb8f
removed debug var
2014-06-11 15:27:24 -07:00
wangyix
0601c24b24
removed debug prints
2014-06-11 15:26:22 -07:00
wangyix
ac0b037f0f
removed connect(); put call into Application::nodeKilled
...
OctreePacketReceiver::nodeKilled() doesn't get called when
NodeList::nodeKilled() is emitted for some unknown reason
2014-06-11 15:25:00 -07:00
Philip Rosedale
2bb6c3d023
Merge pull request #3013 from birarda/master
...
only display the OAuth window when authorization required
2014-06-11 15:23:50 -07:00
Stephen Birarda
82bf6002e2
only display the OAuthWebViewHandler when we need to ask user for authorization
2014-06-11 14:57:05 -07:00
Andrzej Kapolka
c045595ccb
More progress on refactoring.
2014-06-11 14:25:45 -07:00
Andrzej Kapolka
a529bc7e28
Refactoring.
2014-06-11 13:40:12 -07:00
wangyix
a8c9780004
updated connect() to qt5 format
2014-06-11 12:13:27 -07:00
