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
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
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
Andrzej Kapolka
a28952437a
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-10 10:00:42 -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
Andrzej Kapolka
d1549b00ab
Might as well include strings in the "simple" random script objects.
2014-06-09 17:22:44 -07:00
Andrzej Kapolka
3293ab788b
Fix for script object deltas.
2014-06-09 17:19:36 -07:00
Andrzej Kapolka
496b0f1673
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-09 16:52:03 -07:00
Andrzej Kapolka
590f045ed1
Script value streaming tests, fixes.
2014-06-09 16:51:41 -07:00
Andrzej Kapolka
78ad06f61c
Merge pull request #3005 from AndrewMeadows/bug-fix
...
Fix IK for hydra hands.
2014-06-09 16:29:11 -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
wangyix
8312e1642d
replaced takeFirst() with dequeue() for consistency
2014-06-09 15:15:43 -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
Andrzej Kapolka
7bf8fd155d
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-09 14:35:39 -07:00
Andrzej Kapolka
fd469c543c
More script streaming bits.
2014-06-09 14:35:20 -07:00
matsukaze
a8d504fc81
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-06-09 17:29:50 -04:00
Leonardo Murillo
adac661e9f
Merge pull request #3003 from birarda/master
...
add a crash guard for negative silent samples
2014-06-09 15:15:18 -06:00
Stephen Birarda
ee71d34f02
add a crash guard around negative silent samples
2014-06-09 14:03:47 -07:00
