Ryan Huffman
c02df56ceb
Fix uninitialized pointer in AssetResourceRequest
2015-10-09 13:15:13 -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
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
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
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
samcake
3897716ff5
Simplifying the DrawOpaqueStencil Pixel shader
2015-10-08 17:49:55 -07:00
samcake
d7dd90f87e
Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes
2015-10-08 16:47:59 -07:00
samcake
bad5ea7d53
grouping the depth and stencil buffer into a single buffer
2015-10-08 16:47:33 -07:00
James B. Pollack
62728aa507
alignments
2015-10-08 16:16:11 -07:00
Anthony Thibault
5692e3ba2d
Merge pull request #6030 from birarda/av-pl-assert
...
fix for segmented unordered packet writes in PacketList
2015-10-08 15:56:56 -07:00
Stephen Birarda
aa2a8edc6f
use _segmentStartIndex before changing its value
2015-10-08 15:44:18 -07:00
Stephen Birarda
0d9421a65e
constantize the PacketList write error
2015-10-08 15:40:49 -07:00
Stephen Birarda
519df1565a
fix comment format in PacketList
2015-10-08 15:38:41 -07:00
Stephen Birarda
dc4f987a2e
fix segmented write logic in PacketList
2015-10-08 15:38:41 -07:00
samcake
f105803958
Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes
2015-10-08 15:25:32 -07:00
James B. Pollack
d77abc2aba
Merge branch 'wall_targets' of https://github.com/imgntn/hifi into wall_targets
2015-10-08 14:08:09 -07:00
James B. Pollack
b1db1db6da
Merge remote-tracking branch 'upstream/master' into wall_targets
2015-10-08 14:06:23 -07:00
Stephen Birarda
8ce3ee0d60
have nodes be cleaned up on the NL thread
2015-10-08 13:22:43 -07:00
Ryan Huffman
26c40adecb
Merge pull request #6023 from ZappoMan/animationGroupSettings
...
Fixes to isEmitting for ParticleEffects
2015-10-08 12:24:36 -07:00
samcake
eacbcf2881
Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes
2015-10-08 12:06:34 -07:00
samcake
dff598ebd1
clening and getting ready for pr
2015-10-08 12:06:09 -07:00
James B. Pollack
a75f2f3c22
Merge pull request #2 from ericrius1/wall_targets
...
Aligned targets on wall in toybox
2015-10-08 12:04:17 -07:00
samcake
01d39bd614
Merge pull request #6025 from sethalves/fix-obj-model-meshes
2015-10-08 11:57:26 -07:00
Clément Brisset
8e2ce379e1
Merge pull request #6024 from ericrius1/entityResetTweaks
...
Moved entity reset switch, fixed some style issues
2015-10-08 11:56:01 -07:00
Brad Hefta-Gaub
f141026990
CR feedback
2015-10-08 11:48:48 -07:00
Brad Hefta-Gaub
a8d1622481
CR feedback
2015-10-08 11:47:54 -07:00
ericrius1
6921e0f022
Aligned targets on wall in toybox
2015-10-08 11:38:02 -07:00
Seth Alves
3db148f3dc
fix obj model meshes
2015-10-08 11:13:52 -07:00
ericrius1
b7f52ea542
Moved entity reset switch, fixed some style issues
2015-10-08 10:11:21 -07:00
Brad Hefta-Gaub
9f0721c08b
Merge pull request #6020 from ericrius1/grabFarNonColliding
...
Added grab far events for non physical objects
2015-10-08 09:56:22 -07:00
ericrius1
aac372cc8a
Fixed styling errors
2015-10-08 09:53:06 -07:00
Brad Hefta-Gaub
39f2241eac
fix coding standard issue
2015-10-08 09:46:43 -07:00
samcake
c7049bad39
Backing up on any changes regarding shading, focus on the rearr view mirror and stencil bug
2015-10-08 09:32:05 -07:00
