Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 20:11:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
33362 commits 75 branches 59 tags 1.2 GiB
Commit graph

13328 commits

Author SHA1 Message Date
Andrew Meadows
0680be0422 save sixense settings and some UI cleanup 2015-10-07 14:19:15 -07:00
Andrew Meadows
76264ae704 fix formatting 2015-10-07 14:17:21 -07:00
Andrew Meadows
6c2a94fddb remove unused method declarations 2015-10-07 14:17:21 -07:00
Andrew Meadows
0061426ded Merge pull request #6006 from ZappoMan/animationGroupSettings 
Animation group settings
 2015-10-07 14:09:20 -07:00
Brad Hefta-Gaub
b09ae1755e fix formatting of macros 2015-10-07 13:59:00 -07:00
Brad Hefta-Gaub
6f9b5d8125 Merge pull request #5988 from thoys/js-hmd-position-orientation 
expose position and orientation of HMD to Javascript.
 2015-10-07 13:27:15 -07:00
Brad Hefta-Gaub
7a85e5b7a7 rename frameIndex to currentFrame 2015-10-07 13:02:58 -07:00
Brad Hefta-Gaub
57cc7adbfe standardize somethingChanged - CR feedback 2015-10-07 12:27:12 -07:00
samcake
6c75daa027 Merge branch 'master' of https://github.com/highfidelity/hifi into calvin 2015-10-07 11:39:07 -07:00
Brad Hefta-Gaub
ef054ffc6d Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 
Conflicts:
	libraries/networking/src/udt/PacketHeaders.cpp
	libraries/networking/src/udt/PacketHeaders.h
 2015-10-07 11:27:50 -07:00
Brad Hefta-Gaub
6eeb64b032 CR feedback 2015-10-07 11:23:24 -07:00
samcake
05da9d94cd fixing the depth stencil texture case 2015-10-07 11:20:11 -07:00
Stephen Birarda
022c4276b9 Merge pull request #5892 from Atlante45/protocol 
Add channels to UDT
 2015-10-07 11:06:22 -07:00
David Rowe
4624649b1b Sanitize particle properties, fix crashes 2015-10-07 08:57:55 -07:00
Thijs Wenker
4ab5e0af84 Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation 
Conflicts:
	interface/src/scripting/HMDScriptingInterface.h
 2015-10-07 14:48:06 +02:00
Brad Hefta-Gaub
05fd62ac51 Merge pull request #6009 from jherico/homer 
Enabling programmatic access to the IPD scale
 2015-10-07 01:43:10 -07:00
Brad Hefta-Gaub
b06d17d45a Merge pull request #6000 from samcake/hobbes 
Migrate FBXReader to use model::Mesh and clean Model Part rendering
 2015-10-07 01:31:21 -07:00
samcake
dd2aa36a11 FIx the shiny objects by actually using the specular map as it should be... 2015-10-06 23:10:03 -07:00
Brad Davis
eff5a4c395 Picking fixes in the HMD 2015-10-06 22:56:48 -07:00
samcake
83a0091e47 Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2015-10-06 22:03:07 -07:00
Anthony J. Thibault
2dabe69341 When HMD is at rest, re-center the body under the avatar. 
This should help the case when a user avatar is stuck in an
uncomfortable pose for a long period of time.  If they stop
moving their head, the body should recenter itself and
appear more natural.

Added an AtRestDetector class.  That tracks the average and variance
of both position and rotation (quaternion logarithms), then
detects when the variance falls under a threshold.

Also, renamed variables with the straighting prefix to straightening.
 2015-10-06 20:37:51 -07:00
Brad Davis
19fb4e92a6 Enabling programmatic access to the IPD scale 
Conflicts:
	interface/src/Application.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/scripting/HMDScriptingInterface.cpp
	interface/src/scripting/HMDScriptingInterface.h
 2015-10-06 19:08:17 -07:00
Thijs Wenker
6e52fcb857 Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation 
Conflicts:
	interface/src/scripting/HMDScriptingInterface.h
 2015-10-07 03:11:24 +02:00
samcake
c75c31ddc8 Fixing the index Offset issue with instanced shapes from Geometry cache 2015-10-06 18:04:08 -07:00
Brad Hefta-Gaub
02bb372c27 Merge pull request #6008 from AndrewMeadows/ik-targets-use-model-frame 
IK targets specified in the skeleton's model-frame
 2015-10-06 17:34:42 -07:00
Clément Brisset
8a24d1eb9c Merge pull request #6007 from ZappoMan/fixWarning 
clean up warnings and coding standard issues
 2015-10-06 17:02:11 -07:00
Ryan Huffman
74c89ad099 Merge pull request #5984 from Atlante45/cleanup_app 
Application cleanup
 2015-10-06 16:58:05 -07:00
Andrew Meadows
224fc55033 put IK targets in skeleton's model-frame 2015-10-06 16:49:29 -07:00
Atlante45
3a8deff53e Return if innactive 2015-10-06 16:38:16 -07:00
Brad Hefta-Gaub
867d34b617 clean up warnings and coding standard issues 2015-10-06 16:33:24 -07:00
Atlante45
ca575bee89 Remove unecessary move 2015-10-06 16:15:51 -07:00
Atlante45
5ee966261d Start thread right away 2015-10-06 16:12:50 -07:00
Atlante45
81b88cb096 Renamed MessagePart > MessagePartNumber 2015-10-06 16:12:04 -07:00
Brad Hefta-Gaub
016bf4011d cleanup 2015-10-06 16:07:36 -07:00
Brad Hefta-Gaub
1319642a59 fix frame jumping behavior on restart 2015-10-06 15:59:35 -07:00
Howard Stearns
e66f6b79cc Merge pull request #6004 from birarda/av-mixer-stats 
add receive rate and inbound kbps to avatar-mixer stats
 2015-10-06 15:24:30 -07:00
Brad Hefta-Gaub
be79101a93 Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 2015-10-06 15:20:37 -07:00
Stephen Birarda
fbf6d166b7 add wire size to BasePacket 2015-10-06 14:48:28 -07:00
Stephen Birarda
9079f891e9 repair broken node bandwidth stats 2015-10-06 14:09:21 -07:00
Atlante45
9c7a480fda Remove shadowMatrices/Distances 2015-10-06 13:56:23 -07:00
Atlante45
765608d0ff More unused 2015-10-06 13:56:21 -07:00
Atlante45
77a7814854 Move sendPingPackets 2015-10-06 13:56:20 -07:00
Atlante45
0f18db886c Remove 4 Application static methods 
- Replace by lambda
- Cleaned up global scope
 2015-10-06 13:56:19 -07:00
Thijs Wenker
3c6e9378c3 fixes merge issues 2015-10-06 20:20:37 +02:00
samcake
2b5742b277 Some code got overwritten when merging to my office mahcine this morning, that i know got back... 2015-10-06 11:13:35 -07:00
Thijs Wenker
953ff6caa7 Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation 
Conflicts:
	interface/src/Application.cpp
	interface/src/scripting/HMDScriptingInterface.h
	libraries/display-plugins/src/display-plugins/oculus/OculusHelpers.h
 2015-10-06 20:06:29 +02:00
samcake
cf3828629e Fix build on mac and linux 2015-10-06 11:00:21 -07:00
Thijs Wenker
f6afb4cb02 Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation 
Conflicts:
	interface/src/scripting/HMDScriptingInterface.h
 2015-10-06 19:56:22 +02:00
samcake
1788b7b019 Fix the bug created by the previous fix 2015-10-06 10:53:38 -07:00
Andrew Meadows
2c276bb13e Merge pull request #5986 from sethalves/kinematic-grab 
Kinematic grab
 2015-10-06 10:30:06 -07:00
Brad Davis
8090bc8e8d Revert "Enabling programmatic access to the IPD scale" 2015-10-06 10:16:42 -07:00
samcake
429d82e650 Fixing review comments 2015-10-06 09:54:37 -07:00
samcake
c92a6d58ab Dispatch classes in their properly named files to appease the coding standard gods 2015-10-06 09:46:32 -07:00
Seth Alves
febdb52b26 Merge branch 'master' of github.com:highfidelity/hifi into kinematic-grab 2015-10-06 09:20:13 -07:00
Seth Alves
91f5a6fec6 make setting of rigid-body velocity controlled by an action argument 2015-10-06 08:08:33 -07:00
samcake
59afbf1a04 Remove the renderPart call from model.cpp and put the code path in the MeshPartPayload::render() 2015-10-06 01:15:53 -07:00
samcake
fc7f0c77a5 Rename ModelRenderPayload files to ModelRenderItem 2015-10-06 00:20:51 -07:00
samcake
4270b83c0f Uniform buffer for skeleton joint bind pose 2015-10-05 23:33:58 -07:00
samcake
894c8c0a93 Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2015-10-05 19:23:30 -07:00
samcake
12fedb6ff0 Move skinning shader features in its own slh and get ready for moving cluster matrices to uniform buffer 2015-10-05 18:31:05 -07:00
Brad Hefta-Gaub
d95fe3ddb7 Merge pull request #5989 from jherico/homer 
Enabling programmatic access to the IPD scale
 2015-10-05 17:22:19 -07:00
Brad Hefta-Gaub
d5663ed773 Merge pull request #5946 from jherico/nelson 
Improved procedural surfaces, textures and additional standard uniforms
 2015-10-05 17:12:32 -07:00
Clément Brisset
5eda3095bb Merge pull request #5998 from birarda/qt-5.5 
suppress warnings for overriden methods in Xcode 7
 2015-10-05 17:00:43 -07:00
Stephen Birarda
d48f17e0e1 Merge pull request #5995 from Atlante45/log 
Make log more readable
 2015-10-05 16:04:47 -07:00
Stephen Birarda
5989cad054 add override qualifier to suppress warnings in entities-renderer 2015-10-05 15:55:05 -07:00
Brad Hefta-Gaub
f30a94064f make animation start/stop work 2015-10-05 15:50:55 -07:00
Stephen Birarda
3ddfcc10c2 override additions to input-plugins 2015-10-05 15:50:35 -07:00
Anthony Thibault
2a406481d4 Merge pull request #5992 from howard-stearns/reset-on-calibration 
Reset (as though by apostrophe key) whenever we calibrate the hydra.
 2015-10-05 15:19:16 -07:00
Stephen Birarda
9bc95a0fc1 fix override warnings in assignment-client 2015-10-05 15:17:10 -07:00
Clément Brisset
70b9b1eb77 Merge pull request #5985 from hyperlogic/tony/anim-warning-fix 
animation lib warning fixes
 2015-10-05 15:03:47 -07:00
Atlante45
598aab884e Make log more readable 2015-10-05 14:59:28 -07:00
Brad Hefta-Gaub
8c8e83dc8e more debugging on animation.running 2015-10-05 14:17:12 -07:00
Eric Levin
c72c87b59c Revert "QA for 20699 - Sanitize particle property values when set" 2015-10-05 13:35:58 -07:00
Eric Levin
d0f0aae885 Merge pull request #5987 from ctrlaltdavid/20699 
QA for 20699 - Sanitize particle property values when set
 2015-10-05 13:13:16 -07:00
Seth Alves
8f924f0be4 merge from upstream 2015-10-05 13:05:37 -07:00
Howard Stearns
844270e306 Reset (as though by apostrophe key) whenever we calibrate the hydra. 2015-10-05 12:44:22 -07:00
Andrew Meadows
1ead20683c Merge pull request #5976 from sethalves/fix-action-deletes 
Fix action deletion/addition when more than one interface are involved
 2015-10-05 12:31:01 -07:00
Anthony J. Thibault
75849db867 Changed (float)fabs() to fabsf() 2015-10-05 12:00:02 -07:00
Seth Alves
993111d22f code review 2015-10-05 11:28:59 -07:00
samcake
9e393ced46 MOving rednering code of Model into ModelRenderPayload.h/cpp 2015-10-05 09:17:16 -07:00
Seth Alves
8c25f2e16c Merge branch 'master' of github.com:highfidelity/hifi into kinematic-grab 2015-10-05 09:09:01 -07:00
samcake
fd232b7d32 ONe more file to deal with the Model rendering 2015-10-04 22:27:48 -07:00
samcake
1799322c67 Fix typos introduce in previous commit about the Quad to triangle indexing and remove dead code in model.cpp 2015-10-04 18:46:35 -07:00
samcake
55f5ab3732 Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2015-10-04 18:31:56 -07:00
samcake
48416262a1 Migrated the FBXReader mesh code to use excusively the Model::mesh and use them directly for rendering in the ModelPartPayload, fixed a bug in the indexBUffer offset value used in drawIndexed and drawIndexedInstanced 2015-10-04 18:31:19 -07:00
Brad Davis
725ed26ac2 Enabling programmatic access to the IPD scale 2015-10-04 16:55:49 -07:00
ZappoMan
6f86b0f550 particle fixes 2015-10-04 15:23:17 -07:00
David Rowe
53e85e8566 Tidying 2015-10-03 09:59:33 -07:00
David Rowe
510065fe5c Fix particle property maxParticles not being able to be set properly 2015-10-03 09:16:07 -07:00
Brad Hefta-Gaub
2720e6ddf4 debug running property 2015-10-03 08:00:33 -07:00
Brad Davis
c8aea67505 Working on texture compatibility with Shadertoy 2015-10-02 19:09:43 -07:00
David Rowe
88937318d8 Merge branch 'master' into 20699 
Conflicts:
	libraries/entities/src/ParticleEffectEntityItem.h
 2015-10-02 18:39:50 -07:00
samcake
edaa8f998a Migrating to the new mesh for rendering and having problems with multi part mesh 2015-10-02 18:12:16 -07:00
David Rowe
67a497cda3 Sanitize particle properties and their use 
Excluding animationSetings because it's unused and will be removed.
 2015-10-02 17:37:59 -07:00
Brad Hefta-Gaub
abdd9a6da4 Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 2015-10-02 17:28:06 -07:00
Brad Hefta-Gaub
eb9078bda5 cleanup 2015-10-02 17:27:45 -07:00
Seth Alves
89c848d8c8 fix up kinematic hold 2015-10-02 17:14:53 -07:00
Brad Hefta-Gaub
68dc303603 remove debug 2015-10-02 17:12:03 -07:00
Brad Hefta-Gaub
f618a2adfa gak - get streaming working again 2015-10-02 17:06:32 -07:00
Anthony J. Thibault
b6b57de1c6 animation lib warning fixes 2015-10-02 16:42:50 -07:00
Howard Stearns
8153ad7f44 Merge pull request #5967 from AndrewMeadows/collision-group-hack 
allow physical objects to be set collisionless
 2015-10-02 16:08:52 -07:00
Seth Alves
cf8955a8c5 kinematic grab 2015-10-02 15:27:01 -07:00
Brad Hefta-Gaub
627578826b Merge branch 'master' of https://github.com/highfidelity/hifi 2015-10-02 15:12:02 -07:00
Brad Hefta-Gaub
255689e24f add GLEW_STATIC to fix link warnings 2015-10-02 15:08:04 -07:00
Andrew Meadows
607cb9652e Merge pull request #5969 from kencooke/audio-src-sse2 
SSE2 optimization of new resampler.
 2015-10-02 15:07:03 -07:00
Brad Hefta-Gaub
86a3825a5a tweak 2015-10-02 14:50:59 -07:00
Atlante45
f5f349e13a Bumped packet version numbers 2015-10-02 14:20:20 -07:00
Brad Hefta-Gaub
57bf69cc48 Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 
Conflicts:
	libraries/entities/src/ModelEntityItem.cpp
	libraries/networking/src/udt/PacketHeaders.cpp
 2015-10-02 14:19:15 -07:00
Atlante45
1e56d0c99b Add parenthesis to quiet gcc warning 2015-10-02 14:18:18 -07:00
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
Brad Hefta-Gaub
02536a5ab9 remove animationSettings from particles, add isEmitting 2015-10-02 14:17:01 -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
Seth Alves
a737b4024d Merge branch 'master' of github.com:highfidelity/hifi into fix-action-deletes 2015-10-02 13:57:24 -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
Seth Alves
67cc944afc fix double free problem 2015-10-02 13:27:45 -07:00
Brad Hefta-Gaub
e6fb587a8c Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 2015-10-02 13:04:14 -07:00
Brad Hefta-Gaub
98e8b3083d comment 2015-10-02 13:04:02 -07:00
Brad Hefta-Gaub
b27396606b fix first run 2015-10-02 12:34:46 -07:00
samcake
a22ee03732 Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2015-10-02 12:25:09 -07:00
samcake
edb485cb0f working on getting the Model payload to use model::Mesh 2015-10-02 12:24:41 -07:00
Brad Davis
83c9ebf06c Fixing Linux build failure 2015-10-02 11:57:14 -07:00
Brad Davis
7d4b680255 PR comments 2015-10-02 11:57:13 -07:00
Brad Davis
de5e95f7dc Improved procedural surfaces, textures and more standard uniforms 2015-10-02 11:57:13 -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
Seth Alves
bb5abeeabb Merge branch 'master' of github.com:highfidelity/hifi into fix-action-deletes 2015-10-02 10:57:56 -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 Hefta-Gaub
cf2693e712 working fistFrame lastFrame 2015-10-02 08:31:22 -07:00
Brad Davis
aa8979570c Working on 2D overlay mouse interaction 2015-10-02 00:35:37 -07:00
samcake
b8ea83099a Debuggging 2015-10-01 21:13:22 -07:00
Ken Cooke
3555e90cf6 Improved random generator for SIMD dither 2015-10-01 20:32:48 -07:00
Ken Cooke
e1e34b2ce5 Fix to allow arbitrary input/output buffers from caller. SIMD padding is no longer required. 2015-10-01 20:17:04 -07:00
samcake
4478ca79ca Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2015-10-01 19:55:14 -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
Seth Alves
9f27e5ff1f back out a couple other unneeded changes 2015-10-01 18:21:53 -07:00
Seth Alves
40c5103d2f back out change where actino data caches were split into in/out 2015-10-01 17:15:20 -07:00
Seth Alves
e90b156b7b avoid: add an action, immediately receive an update to that entities action, delete the just-added action because it wasn't in the packet 2015-10-01 17:02:02 -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
Seth Alves
f2ebba9863 separate out the inbound and outbound caches of serialized action data 2015-10-01 16:16:23 -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
815c4c69af support for legacy properties 2015-10-01 14:52:28 -07:00
Seth Alves
fa7a5f1a61 formatting, fix a bug 2015-10-01 14:51:33 -07:00
Seth Alves
56b50b5fb3 also add action to _previouslyDeletedActions if the local interface deletes the action 2015-10-01 14:45:10 -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
Seth Alves
d320f5b6f4 remember uuid of deleted actions for 20 seconds and don't re-add them 2015-10-01 14:40:12 -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
Brad Hefta-Gaub
91a27e3adf get animation to actually run again 2015-10-01 13:29:07 -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
Brad Hefta-Gaub
aca25bd76e connect up AnimationPropertyGroup to AnimationLoop 2015-10-01 11:05:16 -07:00
Howard Stearns
335d87134b Squash compiler warning in AnimVariant. 2015-10-01 10:58:31 -07:00
Andrew Meadows
381c98c4fa fix for ModelEntityItem::shouldBePhysical() 2015-10-01 08:56:05 -07:00
Andrew Meadows
22b6607760 add polyvox entities to physics engine 2015-10-01 08:56:05 -07:00
Andrew Meadows
ef7e908675 allow dynamic objects to be set collisionless 2015-10-01 08:56:04 -07:00
Ken Cooke
4e29d8382d SSE2 optimization of new resampler. 3.5x faster for all modes. Dither is always enabled. 2015-10-01 03:24:10 -07:00
Brad Hefta-Gaub
7c14f9ab93 Merge branch 'animationGroupSettings' of https://github.com/ZappoMan/hifi into animationGroupSettings 2015-09-30 21:46:28 -07:00
Brad Hefta-Gaub
06d77ecbea first cut at migrating animation settings into a property group 2015-09-30 21:35:43 -07:00
Brad Hefta-Gaub
d7ee41cc23 first cut at migrating animation settings into a property group 2015-09-30 21:25:03 -07:00
Brad Hefta-Gaub
9fc684edf0 first cut at migrating animation settings into a property group 2015-09-30 21:19:33 -07:00
Brad Hefta-Gaub
6aa9ef9910 first cut at migrating animation settings into a property group 2015-09-30 20:51:25 -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
Brad Hefta-Gaub
066e25bb4a Merge pull request #5965 from hyperlogic/tony/avatar-lean-bug-fixes 
Bug fix for deriveBodyFromHMDSensor calculations
 2015-09-30 16:54:59 -07:00
Anthony J. Thibault
d993d39718 Bug fix for deriveBodyFromHMDSensor calculations 
The calculation that determined where the body position relative to the HMD
was incorrect, one of the components was in the wrong coordinate frame.

Now use the skeleton's bind pose to compute the proper avatar offsets for the eyes, neck and hips.
Use these offsets to calculate where the hips should be given a specific hmd position and orientation.

Also, added a bug fix for Rig, which would cause a -1 index deference when an avatar was missing
certain named joints, such as, "LeftEye", "Neck" and "Head".
 2015-09-30 16:28:33 -07:00
samcake
6b86f21491 Merge branch 'master' of https://github.com/highfidelity/hifi into calvin 2015-09-30 15:54:39 -07:00
samcake
75e858cd13 Putting together the stencil buffer for opaque vs background and using it for the backgroud render items 2015-09-30 15:54:03 -07:00
Ryan Huffman
b7cfc07748 Merge pull request #5957 from ZappoMan/fixSentPacketHistoryCrash 
fix possible crash from null coming from _sentPackets
 2015-09-30 15:12:09 -07:00