Brad Hefta-Gaub
37f530f97f
first cut at wiring up devices and inputs to JS
2015-10-09 16:15:29 -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
Ryan Huffman
c02df56ceb
Fix uninitialized pointer in AssetResourceRequest
2015-10-09 13:15:13 -07:00
David Rowe
09e5b30c16
Only emit particles if isEmitting is true
2015-10-09 11:21:59 -07:00
Stephen Birarda
58f9830a94
fix for re-send timeout in SendQueue
2015-10-09 10:04:35 -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
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
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
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
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
Seth Alves
3db148f3dc
fix obj model meshes
2015-10-08 11:13:52 -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
Brad Hefta-Gaub
65473cadcb
Merge pull request #6021 from jherico/homer
...
Support reload-on-change for local scripts
2015-10-07 20:34:15 -07:00
Brad Hefta-Gaub
bb10d8a7d5
more work on rationalizing particle properties
2015-10-07 20:08:30 -07:00
Brad Hefta-Gaub
b479dd0a12
Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings
2015-10-07 19:55:01 -07:00
Brad Hefta-Gaub
02a24712ca
fix isEmitting property for particle effects, cleaned up some particle property editing in edit.js
2015-10-07 19:52:29 -07:00
Brad Davis
99d1e17ae8
Support reload-on-change for local scripts
2015-10-07 19:18:59 -07:00
samcake
a2ca1c033d
FIxing the rear view mirror issue with background and fooling around with Lighting equations
2015-10-07 19:04:03 -07:00
Eric Levin
a6e1fbd50f
Merge pull request #6014 from ctrlaltdavid/20699
...
Sanitize particle properties, fix crashes
2015-10-07 17:19:29 -07:00
Brad Hefta-Gaub
a86e34f9f9
Merge pull request #6018 from hyperlogic/tony/avatar-mixer-stats-improvements
...
Separated AvatarMixer inbound and outbound bandwidth on stats overlay
2015-10-07 16:04:13 -07:00
Anthony Thibault
a363493a99
Merge pull request #6016 from samcake/calvin
...
Fix the cauterized Cluster Matrices issue when rear view mirror is enabled
2015-10-07 15:52:11 -07:00
Andrew Meadows
ef58238c66
Merge pull request #6017 from ZappoMan/animationGroupSettings
...
fix a bunch of warnings
2015-10-07 15:50:20 -07:00
Brad Hefta-Gaub
e93326e43f
Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings
2015-10-07 15:49:46 -07:00
Anthony J. Thibault
00f3b7b1b5
Renamed delt to averageTimeBetweenPackets
2015-10-07 15:46:42 -07:00
Brad Hefta-Gaub
ae93c020be
Merge pull request #5994 from Atlante45/display_name
...
Display name in terms of arc size not pixels
2015-10-07 15:40:30 -07:00
Anthony J. Thibault
0cebeb7fe9
Separated AvatarMixer inbound and outbound bandwidth on stats overlay
...
Also, small bug fix to BandwidthRecorder. It would incorrectly
calculate outbound pps if the input pps was 0.
2015-10-07 15:32:10 -07:00
Andrew Meadows
7a918eb288
fix variable names in header
2015-10-07 15:25:07 -07:00
David Rowe
131b4ed004
Merge branch 'master' into 20699
...
Conflicts:
libraries/entities/src/EntityItemProperties.cpp
libraries/entities/src/ParticleEffectEntityItem.cpp
2015-10-07 15:08:07 -07:00
Atlante45
14a1860670
Do not change keyhole radius
2015-10-07 14:55:18 -07:00
Brad Hefta-Gaub
bfd014203e
fix a bunch of warnings
2015-10-07 14:48:42 -07:00
samcake
f0b7622ef0
Merge branch 'master' of https://github.com/highfidelity/hifi into calvin
2015-10-07 14:27:01 -07:00
samcake
0a351a8a0c
FIx the problem with cauterizedClusterMatrices in the case rear view mirror is used. Clean the way to define the depth stencil format for texture
2015-10-07 14:26:33 -07:00
Andrew Meadows
464ef2293d
more descriptive variable names
2015-10-07 14:19:15 -07:00
