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
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
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
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
Stephen Birarda
82bf6002e2
only display the OAuthWebViewHandler when we need to ask user for authorization
2014-06-11 14:57:05 -07:00
wangyix
a8c9780004
updated connect() to qt5 format
2014-06-11 12:13:27 -07:00
Brad Hefta-Gaub
62f85d0794
Merge pull request #3004 from matsukaze/master
...
Job #19766 BUG: Stop or reload all scripts crashes interface
2014-06-11 11:51:03 -07:00
wangyix
fc07ceb412
added killNode() slot for _packetCounts garbage collection
2014-06-11 10:54:44 -07:00
wangyix
01005dc792
Merge remote-tracking branch 'upstream/master'
2014-06-11 10:09:49 -07:00
matsukaze
679846267e
Job #19766 BUG: Stop or reload all scripts crashes interface fixed, part 3
...
Same comments as before, but without the local files changes mistakenly
checked in.
2014-06-10 22:42:01 -04:00
matsukaze
1e1cc69287
Revert "Job #19766 BUG: Stop or reload all scripts crashes interface fixed, part 3"
...
This reverts commit 46f2ab73bc
2014-06-10 22:37:34 -04:00
matsukaze
46f2ab73bc
Job #19766 BUG: Stop or reload all scripts crashes interface fixed, part 3
...
Move the conversion of scriptName to QUrl to the beginning of
Application::loadScript. Use the scriptURLString to query the
_scriptEngineHash map.
2014-06-10 22:29:58 -04:00
matsukaze
a48f38b1d2
Revert "Job #19766 BUG: Stop or reload all scripts crashes interface fix, part 2."
...
This reverts commit b4e9840865
2014-06-10 21:32:23 -04:00
Andrzej Kapolka
f677858891
Merge pull request #3009 from ZappoMan/bugFix
...
fix some bugs in models
2014-06-10 16:56:56 -07:00
David Rowe
39e3deb9b9
Add menu item that toggles VR display mode
...
Toggles the display mode if a Rift is found connected at program start.
2014-06-10 15:03:07 -07:00
ZappoMan
0ae7411bf0
fix some bugs in models
2014-06-10 13:37:53 -07:00
wangyix
b96b6c9857
added default constructor for NetworkPacket
...
updated param comments in ReceivedPacketProcessor
2014-06-10 12:24:47 -07:00
wangyix
d84beee3e4
VoxelPacketProcessor -> OctreePacketProcessor
...
added nodes bookkeeping in ReceivedPacketProcessor; added check in
sendNack() to not send NACKs to nodes that have sent packets that are
waiting in the message queue.
2014-06-10 11:05:51 -07:00
Andrew Meadows
c9ba71aa01
fix for broken neck on some body models
2014-06-10 09:38:38 -07:00
matsukaze
b4e9840865
Job #19766 BUG: Stop or reload all scripts crashes interface fix, part 2.
...
Keep the scriptUrl internal to the ScriptEngine class and refer to it
externally by the file name string.
Change the ScriptEngine constructor to accept a filename QString,
instead of a QUrl. Resolve constructor ambiguity in Particle, which
creates anonymous ScriptEngine.
2014-06-09 23:15:45 -04:00
Brad Hefta-Gaub
f3fb39574f
Merge pull request #3007 from wangyix/master
...
Added Developer menu option to disable nack packets.
2014-06-09 18:11:01 -07:00
wangyix
ffda98fe0b
var name change again
2014-06-09 17:50:29 -07:00
wangyix
4665df4d1f
nackdisable to disablenack
2014-06-09 17:41:20 -07:00
wangyix
de61029f05
Added dev menu option to disable nack packets
2014-06-09 17:30:09 -07:00
Andrew Meadows
589b2e8fb7
recover some code for one less magic vec3
2014-06-09 16:12:54 -07:00
Andrew Meadows
e8b6338de9
Fix IK for hydra hands.
2014-06-09 15:40:29 -07:00
matsukaze
c8c8bccbf3
Job #19766 BUG: Stop or reload all scripts crashes interface fixed.
...
QUrl(name).toString() does not equal name, therefore removing name from
ScriptEngineHash was failing, and a dangling pointer was left in the
script engine hash map.
2014-06-09 17:52:50 -04:00
Brad Hefta-Gaub
6cf30cf9d1
Merge pull request #3002 from wangyix/master
...
added code to nack and re-send dropped octree data packets
2014-06-09 13:52:21 -07:00
wangyix
e45f2fed4b
changed writelock to readlock
...
plus a coding standard fix
2014-06-09 13:42:45 -07:00
Brad Hefta-Gaub
2a4e6a1311
Merge pull request #3001 from Barnold1953/OculusOverlay
...
Simple raypicking for scripts with oculus rift.
2014-06-09 13:21:24 -07:00
wangyix
aa694d6967
removed debug code
2014-06-09 12:35:26 -07:00
