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
ZappoMan
1cb5521f01
Merge branch 'master' of https://github.com/worklist/hifi into octreeWireformatImprovements
2014-06-11 16:01:58 -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
ZappoMan
2db897a00e
Merge branch 'master' of https://github.com/worklist/hifi into octreeWireformatImprovements
2014-06-11 14:40:25 -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
ZappoMan
12d30e9d62
handle some models don't fit better
2014-06-11 13:25:16 -07:00
wangyix
a8c9780004
updated connect() to qt5 format
2014-06-11 12:13:27 -07:00
wangyix
2080cc3dee
removed debug variable
2014-06-11 11:59:15 -07:00
wangyix
decd6109fb
made nodeKilled signatures match
2014-06-11 11:57:54 -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
Brad Hefta-Gaub
1c6b2a3f33
Merge pull request #3011 from Barnold1953/OculusOverlay
...
growTrees.js
2014-06-11 11:32:20 -07:00
Andrzej Kapolka
6b48554fdd
Added explanatory comment.
2014-06-11 11:26:21 -07:00
Andrzej Kapolka
92b5d6037d
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-11 11:19:21 -07:00
wangyix
760627003f
killNode() to nodeKilled()
2014-06-11 11:11:04 -07:00
AndrewMeadows
d9b4032ca0
Merge pull request #3010 from wangyix/master
...
NACK packets are not sent to nodes with unprocessed packets; re-sent packets will be counted towards PPS
2014-06-11 11:10:47 -07:00
wangyix
fc07ceb412
added killNode() slot for _packetCounts garbage collection
2014-06-11 10:54:44 -07:00
Dev5
98bd7c02e9
Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay
2014-06-11 10:10:43 -07:00
wangyix
01005dc792
Merge remote-tracking branch 'upstream/master'
2014-06-11 10:09:49 -07:00
AndrewMeadows
49a33ff46a
Merge pull request #3006 from ey6es/metavoxels
...
Streaming/delta-streaming for script values.
2014-06-11 09:25:39 -07:00
Dev5
41b9c3b704
Removed empty update function
2014-06-11 09:06:00 -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
9aa152f43f
More TypeReader refactoring progress.
2014-06-10 18:29:21 -07:00
Dev5
a9a455ca1d
Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay
2014-06-10 17:19:22 -07:00
Dev5
faa5b1d2f2
Added simple tree placement script that has a UI similar to edit voxels. It grows big trees, dont grow near something important.
2014-06-10 17:18:32 -07:00
Andrzej Kapolka
f677858891
Merge pull request #3009 from ZappoMan/bugFix
...
fix some bugs in models
2014-06-10 16:56:56 -07:00
Andrzej Kapolka
bdbed066a8
Merge pull request #3008 from AndrewMeadows/bug-fix
...
fix for broken neck on some body models
2014-06-10 16:54:06 -07:00
Andrzej Kapolka
69899f4d37
Edging towards generic container types.
2014-06-10 16:53:00 -07:00
ZappoMan
6389fea320
first cut at really using partial appendElementData to make models span packets. still needs work
2014-06-10 16:51:49 -07:00
wangyix
c6a9a8924d
changed NetworkPacket::_sendingNode to ::_node
2014-06-10 16:43:53 -07:00
wangyix
5ab271330e
moved sendNack() into packetDistributor()
...
...for the purpose of enforcing packets sent per interval in
OctreeSendThread. Corrected mistake in keeping track of number of
special packets sent where sendSpecialPacket() was assumed to only send
one packet per call.
2014-06-10 15:35:48 -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
66b0333dc9
more work on element append tweaks
2014-06-10 14:49:52 -07:00
ZappoMan
bc9d9d61ba
fix some bugs in models
2014-06-10 13:43:43 -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
