Atlante45
1f07ba46d0
Fix in-class initialization for windows build
2015-10-02 14:18:18 -07:00
Atlante45
48ff912dd2
Use one channel per packet list
2015-10-02 14:18:18 -07:00
Atlante45
3db99f50e5
Change takeFront name
2015-10-02 14:18:18 -07:00
Atlante45
7007d9f223
Use message part to check recieved packet list
2015-10-02 14:18:17 -07:00
Atlante45
c3fc6f4f79
Add message part to Packet
2015-10-02 14:18:17 -07:00
Atlante45
8cecb95bf2
Use array for stats
2015-10-02 14:16:47 -07:00
Atlante45
f1a9aba704
Magic number
2015-10-02 14:16:46 -07:00
Atlante45
91c779ddd8
Templatized DoubleLock
2015-10-02 14:16:46 -07:00
Atlante45
732ad41080
Introduce PacketQueue
2015-10-02 14:16:46 -07:00
Atlante45
709dab6beb
Release send queue before cleanup
2015-10-02 14:16:45 -07:00
Atlante45
290a0e573d
House cleaning
2015-10-02 14:16:45 -07:00
Atlante45
b0fe8535fd
Release _sendQueue before cleanup
2015-10-02 14:16:45 -07:00
Atlante45
eb8b37309d
Use lock_guard when possible
2015-10-02 14:16:44 -07:00
Atlante45
a4d383b384
Check handshake separately
2015-10-02 14:16:44 -07:00
Atlante45
3a61e6b6a3
Coding standart for locks
2015-10-02 14:16:44 -07:00
Atlante45
a34e1d85a5
Close current packet fix
2015-10-02 14:16:44 -07:00
Howard Stearns
f6665a4ac6
Merge pull request #5839 from sethalves/transmit-joint-translation
...
WARNING protocol change: Transmit joint translation
2015-10-02 13:37:56 -07:00
Brad Hefta-Gaub
dce4d94f30
Merge pull request #5941 from ctrlaltdavid/particles-fix
...
Fix particle radius, color, and alpha starts/finishes
2015-10-02 11:40:47 -07:00
Anthony J. Thibault
c0be32d359
Fix for model offset when using Rig Animations.
2015-10-02 11:40:46 -07:00
Anthony J. Thibault
fc7b6dee84
Merge branch 'master' into transmit-joint-translation
2015-10-02 11:40:33 -07:00
Brad Hefta-Gaub
4c556dd43a
Merge pull request #5962 from samcake/calvin
...
Rendering the background elements after opaque and only work on the far pixels
2015-10-02 11:38:45 -07:00
Brad Hefta-Gaub
c6c430ca76
Merge pull request #5977 from jherico/marge
...
Fixing 2D overlay mouse interaction
2015-10-02 11:11:04 -07:00
Anthony J. Thibault
a1b54945d6
Compute the model offset in the rig, using the bind pose of the hips.
2015-10-02 10:34:34 -07:00
Andrew Meadows
e9c71f3867
cleanup comments
2015-10-02 10:02:12 -07:00
Andrew Meadows
50b2c8ae37
remove warnings in linux
2015-10-02 09:39:34 -07:00
Andrew Meadows
940b8eb529
improve some variable names
2015-10-02 09:39:13 -07:00
Andrew Meadows
98fe06be57
cleanup sixense/hydra calibration
2015-10-02 09:30:18 -07:00
Brad Davis
aa8979570c
Working on 2D overlay mouse interaction
2015-10-02 00:35:37 -07:00
samcake
71ad6195f2
Merge branch 'master' of https://github.com/highfidelity/hifi into calvin
2015-10-01 19:25:25 -07:00
samcake
690620d74d
Cleaning code
2015-10-01 19:23:32 -07:00
samcake
3490e08521
Little improvments on the performance side to get the Stencil pass and the masking of the background under reasonable performances
2015-10-01 18:42:09 -07:00
Anthony J. Thibault
fa864d29f9
Merge branch 'master' into transmit-joint-translation
2015-10-01 16:55:24 -07:00
Howard Stearns
53e7d5fd7c
Merge pull request #5975 from AndrewMeadows/cleanup-legacy-constraints
...
remove cruft relating to old verlet avatar skeleton simulation
2015-10-01 16:48:33 -07:00
Andrew Meadows
8bde78a4e8
Merge pull request #5954 from ctrlaltdavid/particle-interpolation
...
Improve particle property interpolation
2015-10-01 16:13:18 -07:00
Anthony J. Thibault
fe5ea471a1
AnimClip: read in translations from fbx file and pre-process them
...
Do the following things to the translations
1. scale by the model offset, this should move the translations into the correct units (meters).
2. compute the ratio between the bone length in the animation and the skeleton.
3. subtract the anim translation from the first translation frame in the animation
effectively turning it into a bind pose delta translation.
4. apply bone length ratio to the resulting delta.
5. set the final translation to be the skeleton rel bind pose + this scaled delta translation
2015-10-01 16:10:33 -07:00
David Rowe
e56d2d9b43
Add asserts
2015-10-01 15:48:37 -07:00
Seth Alves
44e4f4dc63
merge from upstraem
2015-10-01 14:55:56 -07:00
Brad Hefta-Gaub
afe5075e10
Merge pull request #5971 from howard-stearns/AnimVariant-warning-squash
...
Squash compiler warning in AnimVariant.
2015-10-01 14:41:40 -07:00
Brad Hefta-Gaub
f2e65f5a98
Merge pull request #5936 from birarda/tv-es-lockup
...
fix a timer leak, line width in PacketList
2015-10-01 14:39:40 -07:00
Howard Stearns
739545794f
Merge pull request #5944 from AndrewMeadows/ik-repairs-007
...
fix bug: IK attenuates fast underpose animations
2015-10-01 14:27:21 -07:00
Anthony J. Thibault
8bfd38ce7c
FBXReader: When the animation has no animation curve use the joint's default position.
2015-10-01 14:15:02 -07:00
Andrew Meadows
09ac01a5e7
remove cruft from old verlet avatar simulation
2015-10-01 13:44:50 -07:00
Seth Alves
25cbebb66c
Merge branch 'transmit-joint-translation' of github.com:sethalves/hifi into transmit-joint-translation
2015-10-01 13:24:04 -07:00
Seth Alves
8453043038
remove unused variable
2015-10-01 13:23:51 -07:00
Howard Stearns
335d87134b
Squash compiler warning in AnimVariant.
2015-10-01 10:58:31 -07:00
Stephen Birarda
5da5bd47af
add a missing rename for socket Q_ASSERT_X
2015-09-30 21:45:22 -04:00
samcake
0398f9429e
fix the coo/texel blender mode for the case when color is black and the stereo issue
2015-09-30 18:39:13 -07:00
samcake
69c4075439
Fix the behavior when skybox color is black and skymap is available
2015-09-30 18:08:01 -07:00
samcake
d3d4775232
THe dataBuffer contining the properties of the skybox is now per instace and not static and shared so it's static from frames to frames
2015-09-30 17:54:20 -07:00
samcake
be9b244779
Fix the skybox color issue with background rendering when no texture is there
2015-09-30 17:21:52 -07:00