James B. Pollack
dcb5f2369d
Merge remote-tracking branch 'upstream/master'
2015-10-09 14:54:13 -07:00
Anthony J. Thibault
0c489e3afd
MyAvatar: Rename new instance variable after merge.
2015-10-09 14:46:05 -07:00
Anthony J. Thibault
b5ba621f78
Merge branch 'master' into tony/hmd-rest-detection
2015-10-09 14:36:18 -07:00
Anthony Thibault
4862e78fce
Merge pull request #6012 from howard-stearns/align-body-to-head-on-reset
...
Align body to head on reset
2015-10-09 14:34:16 -07:00
Clément Brisset
a5f0b75e25
Merge pull request #6043 from huffman/fix-uninitialized-arr
...
Fix uninitialized pointer in AssetResourceRequest
2015-10-09 13:36:58 -07:00
Clément Brisset
aa221741e5
Merge pull request #6041 from birarda/packet-corruption
...
fix for re-send timeout in SendQueue
2015-10-09 13:33:34 -07:00
Atlante45
cba8b0962d
Fix warnings
2015-10-09 13:29:59 -07:00
Atlante45
3e71c4cc4e
CR
2015-10-09 13:18:05 -07:00
Brad Hefta-Gaub
1fb9d44ae0
Merge pull request #6042 from ctrlaltdavid/fix-particle-emitting
...
Fix not stopping emitting particles when set isEmitting false
2015-10-09 13:16:15 -07:00
Ryan Huffman
c02df56ceb
Fix uninitialized pointer in AssetResourceRequest
2015-10-09 13:15:13 -07:00
Howard Stearns
700835a6d1
Merge branch 'master' of https://github.com/highfidelity/hifi into align-body-to-head-on-reset
2015-10-09 13:13:22 -07:00
Atlante45
ae83dfe041
Move auto-resize to update
2015-10-09 12:23:19 -07:00
Atlante45
bcd148cb87
Construct entity properties at definition
2015-10-09 12:23:19 -07:00
Atlante45
e056743621
Check for upload rights
2015-10-09 12:23:19 -07:00
Atlante45
2229f942df
Spawn fbx dropped in front of avatar
2015-10-09 12:23:19 -07:00
Atlante45
75f0a6442f
ModelEntities spawned with no dimension autoresize
2015-10-09 12:23:19 -07:00
Atlante45
a1c154e7be
Fix compile error
2015-10-09 12:23:19 -07:00
Atlante45
b666acdb26
Add fbx upload on drop
2015-10-09 12:23:19 -07:00
Atlante45
2d12b2ba9a
Spacing
2015-10-09 12:23:19 -07:00
Atlante45
327154b0c0
Make _acceptedExtensions static const
2015-10-09 12:23:19 -07:00
David Rowe
09e5b30c16
Only emit particles if isEmitting is true
2015-10-09 11:21:59 -07:00
James B. Pollack
9141ba9335
Merge remote-tracking branch 'upstream/master'
2015-10-09 10:56:06 -07:00
James B. Pollack
51fc43ea4c
Merge pull request #6035 from ericrius1/targetIntoEntitySwitch
...
Added targets to entity switch reset
2015-10-09 10:49:42 -07:00
James B. Pollack
3e2b32530a
Update pingPongGun.js
...
Gun force shouldn't be so low.
2015-10-09 10:47:20 -07:00
James B. Pollack
987f8ad8ad
Merge remote-tracking branch 'upstream/master'
2015-10-09 10:40:56 -07:00
James B. Pollack
f2283ab9f2
Update masterReset.js
...
The gate shouldn't be grabbable
2015-10-09 10:39:03 -07:00
James B. Pollack
b41398be30
Update hiddenEntityReset.js
...
Basketball rack should be grabbable;We are removing back gate.
2015-10-09 10:36:04 -07:00
James B. Pollack
b06fd3876b
Update masterReset.js
...
The basketball rack should not be grabbable; this got changed in the last commit. Also we're removing the back gate.
2015-10-09 10:33:47 -07:00
Stephen Birarda
58f9830a94
fix for re-send timeout in SendQueue
2015-10-09 10:04:35 -07:00
Ryan Huffman
36aaffce43
Revert "Fix _packets not being cleaned up in ReceivedPacketProcessor"
...
This reverts commit 4dddb508a8
2015-10-09 10:01:53 -07:00
Ryan Huffman
21e9d30bbe
Move qdeclare/qregister calls to their respective class header
2015-10-09 09:58:32 -07:00
Ryan Huffman
4dddb508a8
Fix _packets not being cleaned up in ReceivedPacketProcessor
2015-10-09 09:21:36 -07:00
Ryan Huffman
f1babb7fa0
Fix bug in OctreeInboundPacketProcessor where node can be null
2015-10-09 09:21:36 -07:00
Brad Hefta-Gaub
e2e086ef55
Merge pull request #6033 from samcake/hobbes
...
FIxing the backgroung leaking in the rear view mirror and moving from Float32 to 24 bits Depth buffer
2015-10-09 08:36:52 -07:00
Eric Levin
2b34c5a917
got rid of wasteful network calls
2015-10-09 08:26:00 -07:00
Howard Stearns
652376db8a
Kill the stuff we can't do yet.
2015-10-08 21:44:45 -07:00
Brad Hefta-Gaub
26b83d0f36
Merge pull request #6037 from sethalves/dont-send-righthandthumb3
...
fix bug in AvatarData::toByteArray related code
2015-10-08 20:26:22 -07:00
Clément Brisset
7caf8755d1
Merge pull request #6039 from birarda/packet-corruption
...
hold the sent packets lock while re-sending a packet
2015-10-08 19:57:08 -07:00
Stephen Birarda
8985427516
maintain sent packets lock while re-sending packet
2015-10-08 19:47:15 -07:00
Seth Alves
14ad1ed6be
fix bug in AvatarData::toByteArray related code. this was causing a few joint translations that hadn't changed to be sent
2015-10-08 18:37:09 -07:00
Clément Brisset
6d694b877d
Merge pull request #6036 from birarda/packet-corruption
...
fix for registration of meta types in Socket
2015-10-08 18:29:03 -07:00
Clément Brisset
a2b5748f54
Merge pull request #6027 from birarda/net-crashes
...
clean up Nodes via deleteLater on the network thread
2015-10-08 18:22:40 -07:00
Stephen Birarda
1cd76bb937
fix for registration of meta types in Socket
2015-10-08 18:17:24 -07:00
Seth Alves
46740b7d6a
Merge pull request #6034 from hyperlogic/tony/translation-tx-fix
...
Fix for sending translation for non-animated joints.
2015-10-08 18:15:02 -07:00
ericrius1
948b37d681
Added targets to entity switch reset
2015-10-08 18:07:40 -07:00
Eric Levin
9d949da19c
Merge pull request #6032 from imgntn/wall_targets
...
[Scripts] Add Wall Targets to Toybox
2015-10-08 17:59:41 -07:00
James B. Pollack
1332b8bef6
remove logging
2015-10-08 17:58:58 -07:00
James B. Pollack
772ea16c71
cleanup
2015-10-08 17:52:33 -07:00
James B. Pollack
ad6fdc813f
alignment, targets, sounds, master script
2015-10-08 17:50:41 -07:00
Anthony J. Thibault
1c2f86f8b7
Fix for sending translation for non-animated joints.
...
Only the JointState._defaultTranslation needs to be multiplied
by the unitScale in JointState::translationIsDefault(). This
was incorrectly flagging some non-animated joints as animated.
2015-10-08 17:50:22 -07:00
