Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-13 13:18:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
32492 commits 74 branches 59 tags 1.2 GiB
Commit graph

12944 commits

Author SHA1 Message Date
Stephen Birarda
973fd80c1d fail asset request if hash does not match 2015-09-10 15:24:37 -07:00
Seth Alves
a6a61d7e2f Merge pull request #5770 from birarda/master 
repair to packing of octree query from headless viewer
 2015-09-10 14:53:27 -07:00
Stephen Birarda
f58804a30e repair to packing of query data from headless viewer 2015-09-10 14:35:44 -07:00
Brad Hefta-Gaub
8eacdbf1c4 first cut at making sure entity scripts are called on the entities script engine thread 2015-09-10 13:02:02 -07:00
Brad Hefta-Gaub
5a4a75f4cc Merge pull request #5767 from jherico/lisa 
Eliminate excessive debug logging from procedural setup
 2015-09-10 12:25:41 -07:00
Anthony J. Thibault
9a9838fd0d Clean up of AnimNodeLoader after merge from master. 2015-09-10 11:47:41 -07:00
Anthony J. Thibault
663e37da66 Merge branch 'master' into tony/ik-and-controllers 2015-09-10 11:37:47 -07:00
Anthony Thibault
e8ede3ad00 Merge pull request #5731 from ChristophHaag/master 
build fixes
 2015-09-10 11:36:45 -07:00
Anthony J. Thibault
3149baeefc Merge branch 'master' into tony/ik-and-controllers 2015-09-10 11:04:31 -07:00
Brad Davis
48bd54f81b Eliminate excessive debug logging from procedural setup 2015-09-10 10:57:37 -07:00
David Rowe
016f3964ed Fix typo 2015-09-10 10:03:27 -07:00
David Rowe
4d4b35ba5e Fix #include 2015-09-10 09:47:49 -07:00
Brad Hefta-Gaub
f45e182d33 fix CR feedback, add examples 2015-09-10 09:06:56 -07:00
David Rowe
fa959c4554 Move cubic interpolation method to shared library 2015-09-10 08:53:16 -07:00
Anthony J. Thibault
09b2d8e4a4 Seed AnimGraph with hand controller position and orientation. 2015-09-09 18:16:57 -07:00
Brad Hefta-Gaub
ede0a39b5b prevent Script.include() from including the same file multiple times 2015-09-09 17:54:09 -07:00
Brad Hefta-Gaub
626fcb867b CR feedback 2015-09-09 17:27:39 -07:00
Brad Hefta-Gaub
f710afbfd1 CR feedback 2015-09-09 17:26:01 -07:00
Brad Hefta-Gaub
d62945c6bf fix degenerative url scheme case 2015-09-09 17:13:16 -07:00
Ryan Huffman
08ce09a89b Merge pull request #5758 from birarda/master 
fix for supression of packet from unknown nodes
 2015-09-09 16:16:39 -07:00
Anthony J. Thibault
ad49d0dd59 AnimInverseKinematics: update _maxTargetIndex correctly. 2015-09-09 16:09:38 -07:00
Andrew Meadows
155d9e422a Merge pull request #5587 from howard-stearns/decouple-avatar-updates 
Decouple Avatar Update
 2015-09-09 15:36:19 -07:00
Anthony J. Thibault
756eb54a0a AnimNodeLoader support for InverseKinematics node. 2015-09-09 15:28:21 -07:00
Stephen Birarda
f06e4eaae9 fix suppression of packet from unknown node 2015-09-09 15:20:35 -07:00
Ryan Huffman
da5bdd5641 Merge pull request #5752 from birarda/master 
make all AssetClient packets reliable
 2015-09-09 12:50:47 -07:00
Anthony J. Thibault
c1d7287652 AnimController node now takes absolute rotation vars, instead of relative. 2015-09-09 12:24:32 -07:00
Howard Stearns
83d14d3380 Protect avatarLock. 2015-09-09 11:11:06 -07:00
Howard Stearns
3f5744712f Remove optional "parent" argument. 
GenericThread used to accept an optional "parent" argument, defaulting to nullptr.
This was odd, because the moveToThread() in GenericThread::initialize() would
become a no-op if the instance ever inits QObject(someNonNullParentQObject).
(The only clue would be a log message "QObject::moveToThread: Cannot move objects with a parent",
 and things would end up in the same thread that created the instance.)
As it turns out, all the subclasses of GenericThread do not init
GenericThread(parent), so things worked as expected.
 2015-09-09 11:04:17 -07:00
Stephen Birarda
2849d80274 use the exact payload size where possible 2015-09-09 10:39:53 -07:00
Howard Stearns
73a5714d66 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-09 10:37:11 -07:00
Stephen Birarda
e7e1f5fe5c make all of AssetClient packets reliable 2015-09-09 10:35:31 -07:00
Howard Stearns
24f1387579 Consistently use brace initialization in class headers. 2015-09-09 10:34:08 -07:00
Howard Stearns
f818ac2b74 Merge pull request #5744 from hyperlogic/tony/enable-lean-flag 
Added a flag to enable and disable lean.
 2015-09-09 10:18:12 -07:00
Anthony J. Thibault
146836452f Merge remote-tracking branch 'andrew/europium' into tony/ik-and-controllers 2015-09-09 09:40:55 -07:00
Howard Stearns
74c92af8e0 Merge pull request #5741 from AndrewMeadows/brokenCapsules 
fix for bad bounding capsules for avatars
 2015-09-09 09:33:57 -07:00
Anthony J. Thibault
39aef6edc9 AnimController fix for crash if underPoses vector was empty. 2015-09-08 21:42:42 -07:00
Anthony J. Thibault
75ecf0020d WIP commit, added AnimController node. 2015-09-08 20:34:21 -07:00
Seth Alves
babe6179c3 Merge branch 'octree-shared-pointers' of github.com:sethalves/hifi into octree-shared-pointers 2015-09-08 19:19:59 -07:00
Seth Alves
4fa1818807 remove a line that leaked over from other branch 2015-09-08 19:19:49 -07:00
Andrew Meadows
e86e760118 remove debug stuff and nerfed constriants 2015-09-08 19:14:31 -07:00
Andrew Meadows
381828dac3 remove hackery for bad length units in AnimSkeleton 2015-09-08 19:02:16 -07:00
Andrew Meadows
ee265aba4a add AnimInverseKinematics class 2015-09-08 18:20:22 -07:00
Andrew Meadows
3d661095dc fix some bugs in RotationConstraints 2015-09-08 18:20:03 -07:00
Andrew Meadows
b6cef3d1a9 fix Qt includes 2015-09-08 18:19:33 -07:00
Andrew Meadows
00c446d1b0 sort includes 2015-09-08 18:19:18 -07:00
Andrew Meadows
c3e16d33c1 add InverseKinematics type 2015-09-08 18:18:50 -07:00
Seth Alves
9c4fdfd653 merge from upstream 2015-09-08 18:01:07 -07:00
Seth Alves
e06461ea15 Merge pull request #5724 from hyperlogic/tony/anim-debug-draw-improvements 
AnimDebugDraw Improvements
 2015-09-08 17:07:51 -07:00
Howard Stearns
eb67254e54 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-08 16:54:14 -07:00
Anthony J. Thibault
387d50c217 Added a flag to enable and disable lean. 
This should help improve our idle and walk animations, because
animation on the "lean" joint was being lost, even when we did
not require procedural leaning.
 2015-09-08 16:35:06 -07:00
Stephen Birarda
a3feff1bd4 put DomainServerConnectionToken back in NON_SOURCED 2015-09-08 16:19:15 -07:00
Stephen Birarda
c670c9a0d5 fix for AnimNodeLoader use of Resource loaded 2015-09-08 15:31:37 -07:00
Howard Stearns
26f63a44fc Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-08 15:30:22 -07:00
Seth Alves
8a60bba4eb Merge branch 'master' of github.com:highfidelity/hifi into octree-shared-pointers 2015-09-08 15:28:46 -07:00
Stephen Birarda
e1a31f4dbe put back TextureCache headers 2015-09-08 15:23:26 -07:00
Stephen Birarda
a3959109f1 resolve conflicts on merge with upstream/master 2015-09-08 15:18:39 -07:00
Brad Hefta-Gaub
152a86b0e9 Merge pull request #5735 from hyperlogic/tony/no-particle-fix 
Fix for RenderableParticleffectEntityItem assert.
 2015-09-08 15:13:38 -07:00
Brad Hefta-Gaub
8185a8da7f Merge pull request #5732 from jherico/selma 
Procedural skyboxes
 2015-09-08 15:12:59 -07:00
Andrew Meadows
4a40781e2f remove some commented out cruft 2015-09-08 15:11:19 -07:00
Andrew Meadows
281e4f21fc fix avatar bounding capsule calculations 2015-09-08 15:03:12 -07:00
Andrew Meadows
90fe54e6d6 remove cruft and minor cleanup 2015-09-08 15:03:12 -07:00
Stephen Birarda
e1c395f5ea resolve conflicts on merge with upstream/master 2015-09-08 14:56:23 -07:00
Stephen Birarda
b8bf9a1104 fix OBJReader loading with URL 2015-09-08 14:51:51 -07:00
Howard Stearns
27f4bca0a4 Cleanup: This appears to be complete and working -- EXCEPT for loading animations on the update thread! 
Until I figure that out, the answer is to turn off Developer->Avatar->"Enable Avatar Update Threading", run through forward/back/left/right/strafeLeft/strafeRight, and then turn "Enable Avatar Update Threading" back on.
 2015-09-08 14:49:58 -07:00
Brad Davis
5f1affaff9 Procedural skybox work 2015-09-08 14:31:16 -07:00
Stephen Birarda
e0a8469354 fix for sequence point warning 2015-09-08 13:42:52 -07:00
David Rowe
2325cb8ee0 Merge branch 'master' into 20669 2015-09-08 13:26:20 -07:00
David Rowe
99c1e06201 Code tidying 2015-09-08 13:25:15 -07:00
Anthony J. Thibault
c728cd4c4c Fix for RenderableParticleffectEntityItem assert. 
When a particle system had no living particles, PendingChanges::updateItem
would assert, due to the access to _vertices[0].  In release this might be
harmless as this memory is never accessed, but different implementations of
std::vector might do different things here.  So, let's be safe and early
return when the number of particles is 0.
 2015-09-08 12:03:41 -07:00
Seth Alves
31fcd55d47 octree uses shared pointers 2015-09-08 11:59:48 -07:00
Stephen Birarda
9a8bd607b5 Merge pull request #5729 from rudi-c/build_docs_and_fixes 
Build docs and dependency fixes
 2015-09-08 11:29:15 -07:00
David Rowe
cdd5e68815 Add colorStart and colorFinish entity particle properties 2015-09-08 11:28:53 -07:00
Anthony J. Thibault
6d5927c0c9 Now with less copies. 
* AnimSkeleton now returns AnimPoses by const ref.
* AnimDebugDraw: uses references to Poses on the stack instead of copies
  within inner loops.
* AnimDebugDraw: Removed unnecessary universal refs in range based for loops.
 2015-09-08 10:51:23 -07:00
Christoph Haag
ddcee763ca extend macros to take return value if necessary 2015-09-08 19:10:15 +02:00
Stephen Birarda
9878143661 repairs to ShaderCache for Resource changes 2015-09-08 08:58:35 -07:00
Stephen Birarda
25aeda2e18 Merge branch 'master' of https://github.com/highfidelity/hifi into protocol 2015-09-08 08:40:51 -07:00
Stephen Birarda
c49088846f add an alias for AvatarDataSequenceNumber 2015-09-08 08:26:14 -07:00
Christoph Haag
fa221fa7e3 In gcc5 nullptr can't be directly used as bool 
See https://gcc.gnu.org/gcc-5/porting_to.html
"Converting std::nullptr_t to bool"
 2015-09-08 10:07:06 +02:00
Brad Davis
743d79335d Procedural shaders V2 2015-09-07 17:37:45 -07:00
Howard Stearns
d472fd66ff Cleanup. 2015-09-07 17:26:22 -07:00
Howard Stearns
efeaf21305 Checkpoint smoother. 2015-09-07 16:32:51 -07:00
David Rowe
cb9468c311 Add colorSpread entity particle property 2015-09-07 16:27:42 -07:00
Howard Stearns
0065c64b31 Snapshot of no-judder, before cleanup. 2015-09-07 09:57:05 -07:00
James B. Pollack
670c5ee484 Merge pull request #5723 from jherico/lisa 
Toggle mute while holding the hydras
 2015-09-06 21:45:47 -07:00
Rudi Chen
b703ce01fb Make sure libdl is linked after libcrypto. 
Fixes a `undefined reference to symbol 'dlclose@@GLIBC_2.2.5' error
I was running into on Linux Mint 17.2.
 2015-09-06 21:42:02 -04:00
David Rowe
16346dd717 Fix some build warnings 2015-09-06 16:20:46 -07:00
David Rowe
47b27a3280 Add alphaStart and alphaFinish entity particle properties 2015-09-05 16:30:01 -07:00
David Rowe
042384b5b0 Tidy and finish alpha and alphaSpread 2015-09-05 14:51:48 -07:00
David Rowe
1b3d125cb3 Add alphaSpread entity particle property 2015-09-05 14:39:10 -07:00
Brad Hefta-Gaub
1df3a8f814 Merge pull request #5727 from jherico/marge 
Procedural rendering for box & sphere entities
 2015-09-05 12:43:21 -07:00
Brad Davis
c4b1e6ecd3 Reducing debug spam 2015-09-05 12:22:25 -07:00
Brad Davis
9289a46112 Guarding against frequent userdata calls with no change. 2015-09-05 12:20:28 -07:00
Brad Davis
e8435b6218 Procedural rendering for box entities 2015-09-05 12:10:45 -07:00
David Rowe
8b296f53e6 Short-circuit radius values and interpolation when can 2015-09-05 11:13:48 -07:00
David Rowe
8d85309925 Use cubic interpolation instead of cosine 2015-09-05 10:50:05 -07:00
David Rowe
12b8a5a1d5 Add alpha property support to ParticleEffect entities 
Add at same "level" as color so that it's available for other entity
types to use in the future.
 2015-09-05 10:23:27 -07:00
Anthony Thibault
083c5b6738 Merge pull request #5721 from howard-stearns/default-avatar-for-animations 
avatar animation defaults
 2015-09-04 17:06:53 -07:00
Brad Davis
644e81e20b Toggle mute while holding the hydras 2015-09-04 16:19:58 -07:00
Anthony J. Thibault
bb5d061d78 linux and mac compile fixes. 
Removed "friend MyAvatar" from Rig and JointState.
This was only there for debugging, but I accidentally committed it.
 2015-09-04 16:17:35 -07:00
Anthony J. Thibault
69e463bbfd AnimDebugDraw Improvements 
* Now always works, regardless of whether or not Rig or AnimGraph animations
  are enabled.
* Changed joint radius to 1 cm.
* Changed xyz axis length to 4 cm.
 2015-09-04 16:01:05 -07:00
David Rowe
c9cf426dba Fix EntityPropertyList merge 2015-09-04 15:31:21 -07:00
Howard Stearns
d3106de7c1 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-04 14:32:58 -07:00
Howard Stearns
086afc47b1 Avatar animations on by default. (Using the now old animation machinery.) 
Default robot avatar consistent with the animations.
Don't require all the bones to be present.
 2015-09-04 14:24:37 -07:00
Brad Hefta-Gaub
21afafd4e6 fix hold action with zero offsetLength 2015-09-04 14:07:12 -07:00
David Rowe
18bc7befee Merge branch 'master' into 20669 
Conflicts:
	libraries/networking/src/udt/PacketHeaders.cpp
	libraries/networking/src/udt/PacketHeaders.h
 2015-09-04 13:49:46 -07:00
David Rowe
c910da7179 Add radiusStart and radiusFinish entity particle properties 2015-09-04 12:27:18 -07:00
Stephen Birarda
875d10575f add filename rename somehow missed in previous commit 2015-09-04 12:43:43 -06:00
Stephen Birarda
3875a7d881 fix bad copy on merge to FileResourceRequest 2015-09-04 12:39:35 -06:00
Stephen Birarda
ed19987b7d resolve conflicts on merge with upstream/master 2015-09-04 12:31:46 -06:00
Anthony J. Thibault
5882ec02d0 Merge branch 'master' into ajt/new-anim-system 2015-09-04 11:05:29 -07:00
Anthony J. Thibault
3f258c89b4 Fix transition from AG+Rig to AG only. 2015-09-04 11:03:59 -07:00
Andrew Meadows
5d40517edd Merge pull request #5706 from sethalves/polyvox-again 
Polyvox improvements
 2015-09-04 10:32:36 -07:00
Seth Alves
1b92ae95d7 put glm:: before vec3 2015-09-04 09:41:53 -07:00
Seth Alves
8c3bea6d0d Merge pull request #5713 from AndrewMeadows/flerovium 
fix collision shape of avatars
 2015-09-04 09:37:17 -07:00
Anthony J. Thibault
df28c7bf1a Merge branch 'master' into ajt/new-anim-system 2015-09-04 09:27:02 -07:00
Seth Alves
72322c0270 Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again 2015-09-04 09:12:32 -07:00
Brad Hefta-Gaub
762bed8223 Merge pull request #5715 from jherico/apu 
Fix mirror to display on Oculus
 2015-09-04 09:06:40 -07:00
Brad Hefta-Gaub
20bd14c8db Merge pull request #5684 from rabedik/fxaa 
Post-process anti-aliasing effect
 2015-09-04 09:01:39 -07:00
Brad Hefta-Gaub
127271110c Merge pull request #5714 from jherico/lisa 
Magballs polish
 2015-09-04 08:48:15 -07:00
Seth Alves
fff3da0cc3 Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again 2015-09-04 07:17:01 -07:00
Raffi Bedikian
6b2897ca8f Fix AA bugs with display plugins and mini-mirror 2015-09-03 23:11:53 -07:00
Brad Davis
4a28361e05 Fix mirror to display on Oculus 2015-09-03 22:12:21 -07:00
Brad Davis
0f70797ab4 Merge pull request #5711 from ZappoMan/fixEntityScriptIncludes 
fix a bug in entity script includes and file based includes on windows
 2015-09-03 21:21:42 -07:00
Brad Davis
c8069ba73c Working on magballs polish 2015-09-03 20:09:54 -07:00
Anthony J. Thibault
3716d5612b Merge branch 'master' into ajt/new-anim-system 2015-09-03 19:20:06 -07:00
Anthony J. Thibault
dcecd7b73a Added hysteresis to the state machine for turning and moving states. 
This should help a bit with the jerkiness, as state transitions
occur less often due to noise or the user straddling the boundary
between two states.
 2015-09-03 19:13:39 -07:00
Brad Hefta-Gaub
b0f239b89d also make sure local file includes work for non-entity scripts 2015-09-03 19:06:26 -07:00
Andrew Meadows
16dfc39f5f fix collision shape of avatars 2015-09-03 18:22:35 -07:00
Brad Hefta-Gaub
063320771c fix a bug in entity script includes and file based includes on windows 2015-09-03 16:37:24 -07:00
Seth Alves
e12b7807ad merge from upstream 2015-09-03 16:36:04 -07:00
Howard Stearns
41daea7d92 Merge pull request #5710 from sethalves/fix-stuck-avatars 
Fix stuck avatars
 2015-09-03 16:26:07 -07:00
Seth Alves
218521fc02 put AVATAR_MIN_ROTATION_DOT back to previous value 2015-09-03 16:08:46 -07:00
Seth Alves
0c8848a463 don't update _lastSendJointData if we didn't send 2015-09-03 15:41:40 -07:00
David Rowe
2bc2582797 Fix missing entity property gets for velocity and acceleration spread 2015-09-03 14:55:09 -07:00
David Rowe
45ff118249 Add new radiusSpread entity particle property 2015-09-03 14:55:08 -07:00
Brad Hefta-Gaub
3984dc9ecd Merge pull request #5682 from jherico/bart 
Add common vector constants to JS, add some missing Quat functionality
 2015-09-03 14:51:02 -07:00
Anthony J. Thibault
85cb503152 Made Enable Anim Graph menu option dynamic. 
It will load the anim graph when enabled and destroy
the anim graph when disabled.
 2015-09-03 14:46:44 -07:00
Seth Alves
1071b98260 fix differential avatar-joint sending to work if more than 2 avatars are in the domain 2015-09-03 14:38:46 -07:00
Seth Alves
36ca789d92 fix differential avatar-joint sending to work if more than 2 avatars are in the domain 2015-09-03 14:08:04 -07:00
Howard Stearns
32eb51d0fa Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-03 13:55:57 -07:00
Brad Davis
8dc3905767 Add common vector constants to JS, add some missing quaternion functionality 2015-09-03 11:51:35 -07:00
Seth Alves
07b241c778 code review 2015-09-03 11:05:44 -07:00
Andrew Meadows
cd1dac50ad Merge pull request #5687 from howard-stearns/delete-collision-sounds-after-use 
Delete collision sounds (and their threads) after use.
 2015-09-03 09:59:02 -07:00
Seth Alves
bb96ad1346 Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again 2015-09-03 09:38:58 -07:00
Anthony J. Thibault
30264e9c3d Added animation debug draw items to menu. 
* Debug Draw Bind Pose - used to display the current avatar's bind pose
* Debug Draw Animation - used to display the current avatar's AnimGraph animation.
  Currently does not work with old animation so it's only valid when Enable Anim Graph is true.
* Draw Mesh - used to hide or display the avatar mesh.
 2015-09-02 21:04:29 -07:00
Anthony J. Thibault
471400e595 Fix for jerky behavior when positionDelta is zero. 
This can occur with vsync disabled.  Possibly due to two avatar updates occurring
within a single physics time-step.
 2015-09-02 19:59:05 -07:00
Brad Davis
2901155a7b Fix Oculus mirroring to window 2015-09-02 18:28:44 -07:00
Brad Davis
1f83d04423 Fix oculus crash on switching display plugin to something else 2015-09-02 18:28:43 -07:00
Brad Hefta-Gaub
b199e9e593 Merge pull request #5703 from jherico/marge 
Support HTML colors in overlays
 2015-09-02 17:58:44 -07:00
Anthony J. Thibault
de31b92fd5 Merge branch 'master' into ajt/new-anim-system 2015-09-02 17:53:56 -07:00
Anthony J. Thibault
46b3a7fd23 Improved default avatar.json state machine. 
Now triggers 7 states.
Idle, WalkFwd, WalkBwd, StrafeLeft, StrafeRight, TurnLeft & TurnRight.
As well as variable speed walking to match current velocity.
 2015-09-02 17:28:06 -07:00
Seth Alves
f20ce12091 Merge branch 'test-5685' of github.com:sethalves/hifi into polyvox-again 2015-09-02 16:30:55 -07:00
Seth Alves
f1bb7fb67f Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again 2015-09-02 16:30:48 -07:00
Seth Alves
2fe6e9c317 use AABox's ray intersection code rather than the goofed-up version that was here 2015-09-02 16:30:11 -07:00
Eric Levin
d55c92780c Merge pull request #5704 from AndrewMeadows/erbium 
fix for Controller.getSpatialControlNormal()
 2015-09-02 16:30:01 -07:00
Howard Stearns
389e752b6e Merge pull request #5695 from AndrewMeadows/dysprosium 
avoid bad joints when computing avatar bounding capsule
 2015-09-02 15:58:42 -07:00
Brad Davis
54b7a063e2 Support HTML colors in overlays 2015-09-02 15:56:37 -07:00
Andrew Meadows
c61bc190de fix finger and palm-normal directions for JS 2015-09-02 14:16:02 -07:00
Raffi Bedikian
2d95d1c236 Fix various whitespace issues 2015-09-02 13:49:21 -07:00
Anthony J. Thibault
99586f259c Renamed bindTransformIsValid to bindTransformFoundInCluster 2015-09-02 13:44:34 -07:00
Anthony J. Thibault
91fbbf7d4e Updated copyright boiler plate. 2015-09-02 13:35:26 -07:00
Anthony J. Thibault
df26f18222 Fix for compilation errors on linux 2015-09-02 13:29:29 -07:00
Anthony J. Thibault
fea030b9a0 Compile and warning fixes for MacOSX. 2015-09-02 12:18:17 -07:00
Andrew Meadows
992bd5c9d2 fix sixense and vive rotation readings for palms 2015-09-02 11:37:36 -07:00
Anthony J. Thibault
1ae22268ac Added comment to AnimStateMachine header. 2015-09-02 11:04:52 -07:00
Seth Alves
3e11852845 Merge pull request #5685 from howard-stearns/standing-hmd-animations 
Standing hmd animations
 2015-09-02 10:57:45 -07:00
Seth Alves
849477ac12 Merge branch 'standing-hmd-animations' of github.com:howard-stearns/hifi into test-5685 2015-09-02 10:52:30 -07:00
Anthony J. Thibault
d151474446 Merge branch 'master' into ajt/new-anim-system 2015-09-02 10:00:36 -07:00
Seth Alves
16ee5199e8 change how polyvox neighbors are notified of updates 2015-09-02 09:30:32 -07:00
Raffi Bedikian
9318661bc3 Add algorithm comments to FXAA shader 2015-09-01 23:54:48 -07:00
Seth Alves
3963035599 Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again 2015-09-01 21:08:23 -07:00
Andrew Meadows
dd2f94bc88 Merge pull request #5696 from birarda/sixense-fix 
fix for sixense compile when not present
 2015-09-01 19:56:03 -07:00
Anthony J. Thibault
7b4cb8655c First pass integration of new anim system into rig. 2015-09-01 17:57:01 -07:00
Seth Alves
8608e4f2b0 small bug-fixes 2015-09-01 16:51:55 -07:00
Seth Alves
9256917f15 rebake mesh when a neighbor changes 2015-09-01 16:21:12 -07:00
Stephen Birarda
e5a10e3174 resolve conflicts on merge with upstream/master 2015-09-01 17:07:32 -06:00
Howard Stearns
8cf71f285d Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-01 16:03:40 -07:00
Seth Alves
264d39aa9b have knitted polyvoxes keep track of low-axis neighbors as well as high 2015-09-01 14:49:17 -07:00
Stephen Birarda
231ea3b240 fix namespacing for sequence number hasher 2015-09-01 15:35:50 -06:00
Stephen Birarda
9a4d666b0c no consts if HAVE_SIXENSE not set 2015-09-01 15:33:54 -06:00
Stephen Birarda
2ce225d76c fix for sixense not present on OS X 2015-09-01 15:33:46 -06:00
Stephen Birarda
d29449b43a no consts if HAVE_SIXENSE not set 2015-09-01 15:19:56 -06:00
Stephen Birarda
29285028c3 fix for sixense not present on OS X 2015-09-01 15:18:59 -06:00
Stephen Birarda
f24a267d83 fix hasher for HifiSockAddr on ubuntu 2015-09-01 15:16:02 -06:00
Andrew Meadows
4a7a384c65 avoid bad joints when computing bounding capsule 2015-09-01 14:12:14 -07:00
Seth Alves
7194700c0b pull from upstream 2015-09-01 13:39:33 -07:00
Stephen Birarda
33f6933544 Merge branch 'master' of https://github.com/highfidelity/hifi into protocol 2015-09-01 14:36:16 -06:00
Seth Alves
e32b9191f5 bump AvatarData protocol version 2015-09-01 13:35:58 -07:00
Stephen Birarda
6e7db4e816 Merge pull request #51 from huffman/tiemstamp-on-receive-packet-from-packetlist 
Move lastHeardMicroStamp to be updated when filtering packets
 2015-09-01 14:35:07 -06:00
Clément Brisset
a1db4c37a7 Merge pull request #42 from birarda/control-pair-probe 
send a control packet as bandwidth probe
 2015-09-01 22:33:51 +02:00
Seth Alves
6f80c484b4 cleanups 2015-09-01 13:33:19 -07:00
Ryan Huffman
639dbea25b Move lastHeardMicroStamp to be updated when filtering packets 2015-09-01 13:32:24 -07:00
Seth Alves
76923583ee Interface only sends joint data to avatar-mixer if they have changed enough since the last send 2015-09-01 13:31:34 -07:00
Clément Brisset
5a8a95f367 Merge pull request #48 from huffman/win-fixes 
More Windows build fixes
 2015-09-01 21:41:56 +02:00
Ryan Huffman
70c937d37f Replace NO_ERROR with NoError 2015-09-01 12:31:30 -07:00
Ryan Huffman
b73d307210 Move std::placeholders::_1 to where they are used 2015-09-01 12:24:38 -07:00
Ryan Huffman
fb8e822fa8 Fix lines longer than 120 columns 2015-09-01 12:14:58 -07:00
Ryan Huffman
d166e6d8c3 Move UUID.cpp/h to libraries/shared 2015-09-01 12:00:43 -07:00
Ryan Huffman
cb5a49e6e4 Add missing headers needed to build on Windows 2015-09-01 11:59:45 -07:00
Ryan Huffman
019d234ffd Replace std::bind for methods that use std::unique_ptr with a lambda 2015-09-01 11:58:33 -07:00
Seth Alves
3d7aa6f4d6 Merge pull request #5676 from AndrewMeadows/dubnium 
remove a few warnings from linux build
 2015-09-01 11:45:06 -07:00
Andrew Meadows
fe2d03fd37 merge 
Conflicts:
	libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
	libraries/display-plugins/src/display-plugins/stereo/StereoDisplayPlugin.cpp
	libraries/shared/src/GLMHelpers.cpp
 2015-09-01 11:17:08 -07:00
Seth Alves
930c5cefc9 fix setSphere to create a world-space sphere rather than a voxel-space one 2015-09-01 11:10:21 -07:00
Stephen Birarda
56d6d95df9 only process cp tail if in the right spot 2015-09-01 12:09:58 -06:00
Andrew Meadows
7410baedf0 merge highfidelity/master into andrew/copernicium 
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
	libraries/animation/src/Rig.cpp
	libraries/animation/src/Rig.h
 2015-09-01 11:08:01 -07:00
Anthony J. Thibault
2401e6cc4b Merge branch 'master' into ajt/new-anim-system 2015-09-01 10:58:38 -07:00
Clément Brisset
0733ba54c7 Win build fixes 2015-09-01 18:23:44 +01:00
Stephen Birarda
6c9021c288 only send second packet of pair when required 2015-09-01 11:10:19 -06:00
Stephen Birarda
2a8250ced5 Merge branch 'protocol' of github.com:birarda/hifi into control-pair-probe 2015-09-01 11:10:06 -06:00
Seth Alves
7b6d267c06 Merge pull request #5675 from AndrewMeadows/darmstadtium 
remove PhysicsEntity class
 2015-09-01 10:06:01 -07:00
Clément Brisset
1e8ab09cd4 Merge pull request #46 from huffman/win-fixes 
Windows build fixes
 2015-09-01 18:52:55 +02:00
Andrew Meadows
47c18fa18a reduced gravity effect in IK 2015-09-01 09:51:14 -07:00
Andrew Meadows
0e5b357362 revert unintended change to "gravity" term in IK 2015-09-01 09:51:14 -07:00
Andrew Meadows
bdcc68ce36 fix bug: allow IK to iterate more than once 
also changed name of parentTransform to be rootTransform
for more correctness
 2015-09-01 09:51:14 -07:00
Andrew Meadows
617e210fc6 fix for vive controller to place hand for IK 2015-09-01 09:51:14 -07:00
Andrew Meadows
bb63267e30 fix hand IK rotations or all models 2015-09-01 09:45:14 -07:00
Ryan Huffman
899b94eab3 Add cstdint include to Asset* files 2015-09-01 09:41:19 -07:00
Ryan Huffman
db92e3155c Update AssetServerError enum to be camelcase 2015-09-01 09:39:30 -07:00
Seth Alves
05957cdb6b Merge branch 'darmstadtium' of github.com:AndrewMeadows/hifi into polyvox-again 2015-09-01 09:23:27 -07:00
Stephen Birarda
be78d7f3aa fix headers for move of UUID to shared 2015-09-01 10:20:06 -06:00
Stephen Birarda
4824b38465 move UUID back to shared 2015-09-01 10:17:07 -06:00
Seth Alves
7369ca19e9 allow setting cuboid voxel spaces. clean up some locking 2015-08-31 18:01:15 -07:00
Ryan Huffman
791652557e Fix friend declaration in Socket from udt::UDTTest to UDTTest 2015-08-31 17:32:00 -07:00
Anthony J. Thibault
0d98ab3365 Normalize scale on AnimSkeleton bind pose. 2015-08-31 17:27:23 -07:00
Ryan Huffman
e36c2b8567 Remove extra curly brace 2015-08-31 16:55:35 -07:00
Stephen Birarda
8d3788c2b6 Merge branch 'protocol' of github.com:birarda/hifi into control-pair-probe 2015-08-31 17:33:53 -06:00
Howard Stearns
d003ec9c58 Delete collision sounds (and their threads) after use. 
This has been broken ever since I added avatar collision sounds around https://github.com/highfidelity/hifi/pull/5159 or so.
 2015-08-31 15:49:17 -07:00
Seth Alves
54ddcf2841 fix normals in shader 2015-08-31 15:24:30 -07:00
Seth Alves
4d06890d90 lock/unlock less 2015-08-31 15:24:15 -07:00
Stephen Birarda
adad752860 Merge branch 'protocol' of github.com:birarda/hifi into control-pair-probe 2015-08-31 16:07:27 -06:00
Stephen Birarda
33f1302d1f Merge branch 'atp' of github.com:birarda/hifi into atp 2015-08-31 16:04:58 -06:00
Stephen Birarda
4255220a69 Merge branch 'protocol' of github.com:birarda/hifi into atp 2015-08-31 16:04:44 -06:00
Ryan Huffman
423370dccb Merge pull request #37 from birarda/upload-task 
add a task for upload in asset-server
 2015-08-31 14:55:37 -07:00
Clément Brisset
745f8dfa1b Merge pull request #39 from huffman/ordered-insertion 
Update message handling to use insertion sort
 2015-08-31 23:46:06 +02:00
Atlante45
0de4c02e8d Add time unit in debug 2015-08-31 23:24:14 +02:00
Atlante45
3f5394281b Fix HTTPS timeout issue 2015-08-31 23:20:07 +02:00
Atlante45
8f74935e96 Don't reload on error 2015-08-31 22:34:16 +02:00
Atlante45
9a9c703a78 Some code cleanup 2015-08-31 22:31:24 +02:00
Atlante45
15e9797827 CR 2015-08-31 22:12:42 +02:00
Ryan Huffman
e8fba991fa Update raw loop to use find_if for message packet sorting 2015-08-31 12:35:41 -07:00
Anthony J. Thibault
9786954585 Added support for onDone and onLoop triggers. 2015-08-31 12:13:05 -07:00
Stephen Birarda
04d23f6cc2 Merge branch 'timers-from-thread' into atp 2015-08-31 11:50:35 -07:00
Seth Alves
376a6bbb21 don't reload textures if the url didn't change 2015-08-31 11:48:08 -07:00
Stephen Birarda
46d90b4f31 make sure syn timer is moved to Socket thread 2015-08-31 11:40:06 -07:00
Stephen Birarda
de2bfd0d0d some QThread cleanup and fix in Socket 2015-08-31 11:30:31 -07:00
Howard Stearns
2dbfa5ce9f Be more uniform in deciding animation movement, and incorporate HMD standing mode (which sets position, but not velocity). 2015-08-31 11:10:05 -07:00
Howard Stearns
a907c5757b Do not reset animation frame when restarting while we're fading out. 
Keeps it smooth if we're oscillating on some theshold between running and not.)
 2015-08-31 11:09:28 -07:00
Anthony J. Thibault
77b857031b Take timeScale into account during interps & setCurrentFrame() 2015-08-31 11:01:15 -07:00
Atlante45
6657cecb7a Merge branch 'protocol' of https://github.com/birarda/hifi into popup 2015-08-31 19:52:46 +02:00
Stephen Birarda
fa0abe2972 resolve conflicts on merge with upstream/master 2015-08-31 10:51:12 -07:00
Stephen Birarda
181c8a8b65 handle packet probe when no data available 2015-08-31 10:48:45 -07:00
Anthony J. Thibault
54aa0677f6 Merge branch 'master' into ajt/new-anim-system 2015-08-31 10:47:50 -07:00
Raffi Bedikian
ff2a58b3eb Add FXAA effect class, modeled after AO effect 2015-08-30 20:49:03 -07:00
Raffi Bedikian
1001cf9000 Add shader files for FXAA 2015-08-30 20:48:06 -07:00
Raffi Bedikian
59a758b5ec Add AA state to RenderContext and Menu 2015-08-30 20:38:05 -07:00
Ryan Huffman
fc80745c08 Update message handling to use insertion sort 2015-08-30 20:03:15 -07:00
Seth Alves
41a2ff2fff working on stitching marching-cube polyvoxs together 2015-08-30 18:42:15 -07:00
Seth Alves
64d0ce47f3 attempting to stitch polyvox entites together 2015-08-30 09:59:33 -07:00
Stephen Birarda
7937101a58 fix define for UDT_CONNECTION_DEBUG 2015-08-29 14:44:18 -07:00
Stephen Birarda
b81f996366 add network logging to SendQueue, fix ctor order 2015-08-29 14:38:07 -07:00
Stephen Birarda
e67a3e8541 use define to hide verbose connection debugging 2015-08-29 14:36:46 -07:00
Stephen Birarda
2b0b883db2 remove debug for writeReliablePacket invoke 2015-08-29 14:28:50 -07:00
Stephen Birarda
71ff855d86 add connection cleanup that respects send/receive 2015-08-29 14:28:24 -07:00
Anthony J. Thibault
9d983e0614 Bug fix to AnimNode::setSkeletonModel and AnimNodeLoader. 
Also updated avatar.json to test nested graphs under a SM.
 2015-08-28 17:16:32 -07:00
Sam Gateau
4e944645fe more cleaning for showing a cleaner pr 2015-08-28 16:58:36 -07:00
Stephen Birarda
d16894d2c5 Merge branch 'protocol' of github.com:birarda/hifi into atp 2015-08-28 16:41:49 -07:00
Sam Gateau
b845fcaff9 Cleanup 2015-08-28 16:38:07 -07:00
Stephen Birarda
441a5d34bf don't go inactive in sync 2015-08-28 16:36:07 -07:00
Stephen Birarda
42105dfc33 replace mutexes with invoked methods in Socket 2015-08-28 16:34:24 -07:00
Brad Davis
08e4fe2dc2 Revert "Add common vector constants to JS" 2015-08-28 16:26:56 -07:00
Stephen Birarda
20d1244db4 use a write lock for sync so it can be recursive 2015-08-28 15:17:44 -07:00
Stephen Birarda
abffc0317b expire the connection if it is 16 timeouts since data 2015-08-28 15:07:07 -07:00
Stephen Birarda
d6310da8c8 consider handshake ACK not received on send queue stop 2015-08-28 15:01:03 -07:00
Stephen Birarda
ee203dbe45 fix check after mutex creation 2015-08-28 14:57:22 -07:00
Stephen Birarda
a30bc79dd5 guard send queue creation with a mutex 2015-08-28 14:55:25 -07:00
Stephen Birarda
1e09321b1a avoid creating multiple send queues from connection 2015-08-28 14:49:27 -07:00
Stephen Birarda
d1386fcb14 Merge branch 'upload-task' into atp 2015-08-28 14:19:30 -07:00
Stephen Birarda
b7d0aa062a repairs to cleanup of send queue 2015-08-28 14:19:20 -07:00
Seth Alves
f6fbf4f324 fix whitespace 2015-08-28 14:08:30 -07:00
Brad Hefta-Gaub
1e2374da87 Merge pull request #5677 from jherico/bart 
Add common vector constants to JS
 2015-08-28 13:43:13 -07:00
Seth Alves
7614cababb adjust whitespace 2015-08-28 13:21:34 -07:00
Atlante45
bcf3fceadc Typo 2015-08-28 22:10:54 +02:00
Atlante45
729fd96539 Fix bug where _requestLimit is stuck at 0 2015-08-28 22:10:33 +02:00
Brad Davis
2aa1976b5d Add common vector constants to JS, add some missing quaternionin functionality 2015-08-28 13:05:39 -07:00
Seth Alves
752c787f0b Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-28 12:50:31 -07:00
Seth Alves
540af4afcb remove unneeded call to computeShapeInfoWorker 2015-08-28 12:47:04 -07:00
Stephen Birarda
b9d1f39c65 remove include in SendQueue that is unneeded 2015-08-28 12:36:48 -07:00
Atlante45
a448eb9109 Fix Asset Upload popup 2015-08-28 20:35:39 +02:00
Atlante45
993217491f Retry to load only on timeout 2015-08-28 20:35:39 +02:00
Stephen Birarda
058a3c422b re-remove the flow window full variable 2015-08-28 11:32:17 -07:00
Stephen Birarda
f2cb85ab09 add missing break to switch for LightACK 2015-08-28 11:16:05 -07:00
Stephen Birarda
3f85e8a2fe add an UploadAssetTask so uploading is on diff thread 2015-08-28 11:12:52 -07:00
Seth Alves
a5cd3ff046 release _threadRunning if decompressVolumeDataAsync exits early 2015-08-28 11:04:56 -07:00
Ryan Huffman
c6d98f3c67 Update ResourceCache to retry an asset request when the node is unavailable 2015-08-28 10:59:38 -07:00
Seth Alves
1ac5c19f44 if someone else changes a polyvox, we need to localy recompute the collision shape 2015-08-28 10:39:23 -07:00
Stephen Birarda
9575b47e4e don't unlock double lock outside conditional 2015-08-28 10:38:15 -07:00
Stephen Birarda
54cd430be9 unlock if double lock succeeds but queues not empty 2015-08-28 10:35:29 -07:00
Seth Alves
92b5fe3457 fix thinko -- if the changes didn't happen, put them back on the list and don't clear their dirty flags 2015-08-28 10:31:28 -07:00
Seth Alves
0bcd6b8ec5 remove no-longer-used #define 2015-08-28 10:30:56 -07:00
Stephen Birarda
ac3a1d54b1 don't lock in while for maybeResendPacket 2015-08-28 10:07:01 -07:00
Stephen Birarda
d66375bb09 fix queue timeout for empty queue 2015-08-28 09:54:51 -07:00
Stephen Birarda
577b6bf62f correct the check for flow window size 2015-08-28 09:52:33 -07:00
Sam Gateau
e2fce12713 Splitting the FBXREader.cpp file into sub files 2015-08-28 09:51:03 -07:00
Stephen Birarda
e662209754 use a QMutex instead of QReadWriteMutex 2015-08-28 09:48:55 -07:00
Stephen Birarda
dcd5a4aec2 address comments in code review 2015-08-28 09:47:25 -07:00
Stephen Birarda
21c80e45c2 guard connection addition by a mutex in Socket 2015-08-28 09:42:52 -07:00
Stephen Birarda
539108dd45 repairs for new timeout code 2015-08-28 09:26:32 -07:00
Stephen Birarda
0b712eef55 Merge branch 'protocol' of github.com:birarda/hifi into atp 2015-08-28 09:10:12 -07:00
Stephen Birarda
77aeae7dc0 change to timeout behaviour to re-send unACKed packets 2015-08-28 09:10:06 -07:00
Sam Gateau
8ea8eea08d Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-08-28 08:13:10 -07:00
Sam Gateau
85f230bf17 Getting rid of the NetworkMEshPart and simplifying the thinking around the MOdel regarding its RenderItems 2015-08-28 08:12:50 -07:00
Stephen Birarda
cf98d4a8f7 add a control packet type for LightACK 2015-08-28 07:31:44 -07:00
Atlante45
12fdec232b CR 2015-08-28 16:31:02 +02:00
Atlante45
ea05fcea0c Forward AssetResourceRequest loading errors 2015-08-28 16:03:31 +02:00
Stephen Birarda
d908cd4a53 use NotStarted instead of Unsent, return NotFound for Files 2015-08-28 06:35:02 -07:00
Brad Davis
b7dd47efcb Merge pull request #5674 from birarda/master 
cleanup of some warnings
 2015-08-27 23:34:43 -07:00
Ryan Huffman
a7294eb0e5 Add AccessDenied error for failure to open File in FileResourceRequest 2015-08-27 22:48:15 -07:00
Ryan Huffman
2a4b25dd76 Update names of ResourceRequest enums 2015-08-27 22:23:06 -07:00
Stephen Birarda
341e27fecc unlock mutexes before calling notify 2015-08-27 22:02:08 -07:00
Stephen Birarda
98888a36a3 use const ref where appropriate for asset classes 2015-08-27 21:33:37 -07:00
Anthony J. Thibault
19e91bb392 Added basic interpolation support to AnimStateMachine 2015-08-27 21:26:31 -07:00
Stephen Birarda
111abac0f1 Merge pull request #30 from huffman/cache-limit 
Update ResourceCache to only emit failure when not retrying
 2015-08-27 21:17:16 -07:00
Ryan Huffman
147fbd4b54 Update ResourceCache to only emit failure when not retrying 2015-08-27 21:11:12 -07:00
Anthony J. Thibault
3286a32afc Initial version of AnimStateMachine. 
No interpolation support, but basic avatar.json is working
with two states and two transitions between them.
 2015-08-27 20:41:53 -07:00
Andrew Meadows
614fad0811 remove warnings from linux build 2015-08-27 19:12:25 -07:00
Stephen Birarda
c5c73b7809 remove _ipd variable from OculusLegacyDisplayPlugin 2015-08-27 18:26:55 -07:00
Stephen Birarda
8ea20b5e5e fix warning on string literal call to qFatal 2015-08-27 18:26:55 -07:00
Stephen Birarda
f7d32add0c wrap OVR variables in ifdef for MAJOR_VERSION >= 6 2015-08-27 18:26:55 -07:00
Stephen Birarda
1d6f43e0d0 cleaned up some warnings 2015-08-27 18:26:55 -07:00
Andrew Meadows
d3f06af892 remove PhysicsEntity class 2015-08-27 18:22:12 -07:00
Stephen Birarda
5fc09a68a8 add an assert that enqueued packet is part of message 2015-08-27 17:24:57 -07:00
Stephen Birarda
33dc65a00a fix for return of processable packets 2015-08-27 17:09:47 -07:00
Stephen Birarda
8ebcb03b2b don't process duplicate or pre-handshake packets 2015-08-27 16:55:13 -07:00
Ryan Huffman
4bbbd892bd Fix atp scheme checking in ResourceCache 2015-08-27 16:46:33 -07:00
Ryan Huffman
31bdeed396 Remove cache limit for atp urls 2015-08-27 16:43:40 -07:00
Stephen Birarda
8ee27bca2b remove urlAsString from Model 2015-08-27 16:00:21 -07:00
Stephen Birarda
413ec718de fix max pairs for timeout NAK 2015-08-27 15:22:53 -07:00
Stephen Birarda
8eeb808572 Merge branch 'protocol' of github.com:birarda/hifi into asset-hash 2015-08-27 15:16:41 -07:00
Stephen Birarda
549c514400 fix upload leak, return error for failed load 2015-08-27 15:12:08 -07:00
Stephen Birarda
e3e529c4e5 resolve conflicts on merge with origin/protocol 2015-08-27 14:52:29 -07:00
Stephen Birarda
80cf7b6c76 resolve conflicts on merge with upstream/master 2015-08-27 14:50:04 -07:00
Stephen Birarda
eae90cbe8a resolve conflicts on merge with origin/protocol 2015-08-27 14:47:35 -07:00
Stephen Birarda
c80c4a9b45 resolve conflicts on merge with origin/protocol 2015-08-27 14:45:22 -07:00
Stephen Birarda
183a2ab996 Merge pull request #18 from Atlante45/protocol 
Cleanup connections
 2015-08-27 14:41:00 -07:00
Ryan Huffman
dabea21d66 Remove unused variable 2015-08-27 14:30:48 -07:00
Ryan Huffman
5aa5bca8f7 Add path to headers 2015-08-27 14:29:54 -07:00
Stephen Birarda
f238c1b167 include the extension in upload confirmation 2015-08-27 14:29:42 -07:00
Stephen Birarda
1da9eeab1f handle double handshake in Connection 2015-08-27 14:27:29 -07:00
Stephen Birarda
86a7a42d24 use compact hash representation for asset-server 2015-08-27 14:22:21 -07:00
Ryan Huffman
755c33e551 Remove unused variable 2015-08-27 14:11:40 -07:00
Ryan Huffman
24eef654e0 Remove unnecessary debug 2015-08-27 14:11:29 -07:00
Ryan Huffman
4fcfd5b8f8 Fix indentation 2015-08-27 13:58:28 -07:00
Ryan Huffman
b401a62d7f Disable request limiting for ATP requests in ResourceCache 2015-08-27 13:58:17 -07:00
Philip Rosedale
d0db56a4a6 Merge pull request #5667 from howard-stearns/rig-menu-toggle 
Rig Menu Toggle and new animations
 2015-08-27 13:52:12 -07:00
Howard Stearns
b3a919a5ca Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-08-27 13:46:12 -07:00
Seth Alves
e97e7de19c Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-27 13:19:15 -07:00
Ryan Huffman
12d3cf557a Remove assert in ScriptCache 2015-08-27 12:58:57 -07:00
Ryan Huffman
33d6f561eb Reintroduce request limit in ResourceCache 2015-08-27 12:52:11 -07:00
Ryan Huffman
750080fe66 Remove early return in Model::restoreJointPosition 2015-08-27 12:52:01 -07:00
Ryan Huffman
b30a008162 Fix bug with NetworkTexture occasionally breaking on assert 2015-08-27 12:48:55 -07:00
Leonardo Murillo
dd5d58a5e1 Merge pull request #5663 from birarda/master 
don't request a cert from peer in HTTPSManager
 2015-08-27 12:46:24 -07:00
Stephen Birarda
783bc4dafb Merge branch 'master' of https://github.com/highfidelity/hifi 2015-08-27 12:44:42 -07:00
Howard Stearns
96c74ebbd5 Enable Rig Animations is now a developer menu item (rather than requiring javascript to set). Also turning it off resets you to bind pose and deliberately throws away old animations. 
Default animations are the new ones for our standard T-pose. (Had been for the double-A pose fightbot.)
Rig state machine now does "backup", and doesn't apply strafe while turning.
 2015-08-27 12:25:40 -07:00
Stephen Birarda
f3797964e2 resolve conflicts on merge with huffman/atp-server 2015-08-27 12:21:15 -07:00
Stephen Birarda
16eee10cab repairs to permission error for asset-server upload 2015-08-27 12:13:20 -07:00
Stephen Birarda
c212ef5734 fix PacketReceiver cleanup, return permission error for upload 2015-08-27 12:01:24 -07:00
Ryan Huffman
a49a1eb0d6 Add extension to atp requests 2015-08-27 11:51:45 -07:00
Stephen Birarda
f92ee597e5 fix width of asset upload dialog to fit ATP url 2015-08-27 11:32:03 -07:00
Brad Hefta-Gaub
79a9694d4a Merge pull request #5648 from ctrlaltdavid/20663 
Clean Interface.ini after a crash
 2015-08-27 10:52:25 -07:00
Brad Hefta-Gaub
7b2f944f48 Merge pull request #5561 from ericrius1/particleExtensions 
Extended Particle entity to allow for more varied effects
 2015-08-27 10:45:03 -07:00
Anthony J. Thibault
637e3b0a15 Added triggers to AnimVariantMap. 2015-08-27 10:41:01 -07:00
Stephen Birarda
0f4a4b5cc1 resolve conflicts on merge with huffman/atp-server 2015-08-27 10:30:56 -07:00
Ryan Huffman
c6493b1720 Remove extension from hash in AssetResourceRequest 2015-08-27 10:27:12 -07:00
Stephen Birarda
513cae0d40 thread the AssetUpload so it doesn't take over main 2015-08-27 10:23:02 -07:00
Anthony J. Thibault
778521f664 Improvement to bone link rendering when bones are large. 2015-08-27 10:21:23 -07:00
Sam Gateau
4f7b857130 Merge 2015-08-27 10:01:39 -07:00
Ryan Huffman
1d45293184 Fix lambda callback affinity in BatchLoader 2015-08-27 09:56:26 -07:00
Sam Gateau
f6953f8e02 REfining th eTextureMap design but still with the issue of the lightmapped model 2015-08-27 09:52:07 -07:00
Ryan Huffman
667db200c0 Cleanup BatchLoader 2015-08-27 09:39:12 -07:00
Anthony J. Thibault
a04f356857 Merge branch 'master' into ajt/new-anim-system 2015-08-27 09:32:53 -07:00
Ryan Huffman
8765329a46 Add ASSET_TOO_LARGE to AssetUtils 2015-08-27 09:32:39 -07:00
Ryan Huffman
92dbe9997c Clean up AssetRequest 2015-08-27 09:31:50 -07:00
Ryan Huffman
15854c6715 Make AssetClient methods private 2015-08-27 09:31:34 -07:00
Ryan Huffman
b72e7e356d Clean up AssertClient 2015-08-27 09:31:17 -07:00
Stephen Birarda
c277584f2e Merge branch 'atp-server' of https://github.com/huffman/hifi into asset-upload 2015-08-27 09:17:25 -07:00
Seth Alves
b09de4ff65 fix worldCoordsToVoxelCoords for non-edged voxels. voxel.js now adds/delete where you click rather than near to there. 2015-08-26 21:51:28 -07:00
Seth Alves
435863d1f0 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-26 17:33:59 -07:00
Anthony J. Thibault
b7a9b54628 Better AnimDebugDraw rendering 2015-08-26 16:42:08 -07:00
Howard Stearns
8e3d8cd31c Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-08-26 16:08:42 -07:00
Howard Stearns
475331a97d Sprinkle locks everywhere. 2015-08-26 16:08:07 -07:00
Ryan Huffman
c2fcf5865a Update log message for uploading assets 2015-08-26 16:02:47 -07:00
Brad Davis
270f2f7a3b Fixing framerate limit, moving vsync to 2d plugin 2015-08-26 15:47:45 -07:00
Brad Davis
8cd13cad00 Merge pull request #5661 from sethalves/linux-memory-debugger 
call setup_memory_debugger from common macros rather than from everywhere
 2015-08-26 15:43:08 -07:00
Andrew Meadows
0835b79e33 Merge pull request #5646 from birarda/ds-cleanup 
de-bloat the domain-server by adding a gatekeeper
 2015-08-26 15:42:43 -07:00
Ryan Huffman
d66c521200 Move SendAssetTask to separate file 2015-08-26 15:37:23 -07:00
Stephen Birarda
0450e84008 Merge branch 'atp-server' of https://github.com/huffman/hifi into asset-upload 2015-08-26 15:30:25 -07:00
Seth Alves
f53704051f ifdef out debug prints in OBJ reader 2015-08-26 15:09:58 -07:00
Stephen Birarda
9e286666b5 add UDT to comment for Connection cleanup 2015-08-26 14:55:59 -07:00
Stephen Birarda
c340c34b38 add comments for PacketReceiver TODOs 2015-08-26 14:53:05 -07:00
Stephen Birarda
d3b19f36fd don't use remove_if since it can't be used on associative 2015-08-26 14:43:09 -07:00
Stephen Birarda
4039c2e3e0 fix for asset-server naming, deadlock in timeout/wait 2015-08-26 14:27:12 -07:00
Ryan Huffman
2e585256ff Update asset hash to Sha256 2015-08-26 14:20:24 -07:00
Ryan Huffman
269d5bb6da Resolve bugs with *Cache changes 2015-08-26 14:04:55 -07:00
Stephen Birarda
352f3543c3 resolve conflicts on merge with ds-cleanup 2015-08-26 13:33:50 -07:00
Stephen Birarda
f16e0a63ee add a string for asset-server node type 2015-08-26 13:29:40 -07:00
Seth Alves
8646900dda Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-26 13:08:41 -07:00
Stephen Birarda
d039930ca3 resolve conflicts on merge with clement/protocol 2015-08-26 12:50:13 -07:00
Stephen Birarda
413c3a4fd7 Merge branch 'handshake' into asset-upload 2015-08-26 12:45:00 -07:00
Stephen Birarda
0fc2713be1 don't request a cert from peer in HTTPSManager 2015-08-26 12:40:09 -07:00
Stephen Birarda
dc1f726283 don't assign the asset-server in domain by default 2015-08-26 12:36:48 -07:00
Ryan Huffman
aa7d8678e1 Merge branch 'protocol' of github.com:birarda/hifi into atp-server 2015-08-26 12:26:11 -07:00
Anthony J. Thibault
c1333e16ed Merge branch 'master' into ajt/new-anim-system 2015-08-26 11:59:03 -07:00
Andrew Meadows
f857ccfe16 fix Vectors::MIN 2015-08-26 11:46:50 -07:00
ericrius1
5586c2ff17 fixed ordering of bitsream reading for old svo files with particle entities 2015-08-26 11:45:19 -07:00
Seth Alves
696e34b996 Merge branch 'linux-memory-debugger' of github.com:sethalves/hifi into polyvox 2015-08-26 11:11:41 -07:00
Seth Alves
695ffa29c7 call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00
Atlante45
5b5dc94335 Make DoubleLock thread-safe but not self-unlocked 2015-08-26 20:03:04 +02:00
Atlante45
b1fa12cc43 Better debug message 2015-08-26 19:38:24 +02:00
Anthony J. Thibault
46c1e008bc Merge branch 'master' into ajt/new-anim-system 2015-08-26 10:37:39 -07:00
Atlante45
cd8d6df287 Use high_resolution_clock instead of clock 2015-08-26 19:36:18 +02:00
Atlante45
7a5ed24485 typo (I can't spell inactive correctly) 2015-08-26 19:31:33 +02:00
Stephen Birarda
3a918eedca resolve conflicts on merge with upstream master 2015-08-26 10:01:24 -07:00
ericrius1
f25b75093c cleaned up conditional bitstream parsing 2015-08-26 09:44:29 -07:00
Seth Alves
23dbbcc7bb Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-26 09:42:20 -07:00
Ryan Huffman
c878eb0cd9 Fix atomics not being initialized in SendQueue 2015-08-26 09:31:03 -07:00
Ryan Huffman
868558b4f0 Add registration of QSharedPointer<NLPacketList> meta type 2015-08-26 09:29:46 -07:00
Ryan Huffman
24faab2089 Add sendPacketList that take Node 2015-08-26 09:29:15 -07:00
Brad Hefta-Gaub
aa80fc9127 Merge pull request #5653 from jherico/homer 
Remove items from the VR menu properly
 2015-08-26 09:14:48 -07:00
Atlante45
3184dee10a Emit queueInnactive when flow window is full for too long 2015-08-26 17:49:17 +02:00
Andrew Meadows
45c846572e Merge pull request #5645 from jherico/maggie 
Fixing problems reported by static analysis tool
 2015-08-26 08:31:05 -07:00
Atlante45
8049819beb Tweak DoubleLock 2015-08-26 17:11:32 +02:00
Atlante45
179ee73e26 Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol 2015-08-26 16:50:33 +02:00
Atlante45
6958a31efe Merge branch 'master' of https://github.com/highfidelity/hifi into protocol 2015-08-26 16:37:45 +02:00
Atlante45
c96632d4b6 Cleanup connection on node kills 2015-08-26 16:07:47 +02:00
Atlante45
373d4b8944 Remove connection from socket when innactive 
If innactive for more than 5 seconds, remove it from hash
 2015-08-26 15:53:49 +02:00
Atlante45
00b224e769 Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-08-26 14:57:31 +02:00
Clément Brisset
2745cc5d12 Merge pull request #15 from birarda/wait-condition 
add a wait condition in SendQueue if there's nothing to do
 2015-08-26 14:57:16 +02:00
Brad Hefta-Gaub
029c59fb77 Merge pull request #5654 from jherico/barney 
Fix stereo modes aspect ratio
 2015-08-25 22:16:30 -07:00
Brad Hefta-Gaub
5d5c1584c3 Merge pull request #5659 from jherico/nelson 
Fix UserInputMapper event generation
 2015-08-25 22:14:37 -07:00
Sam Gateau
84d0be134e Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-08-25 22:13:22 -07:00
Sam Gateau
1e9fce2a61 Drafting the materials for FBXReader 2015-08-25 22:12:51 -07:00
Seth Alves
6f46832069 clean up some commented code. attempt to fix ray-casting in non-edged polyvox -- still isn't correct 2015-08-25 21:30:38 -07:00
Anthony J. Thibault
0c02a338f2 Added support for setting Variants in the json file. 
For example: the avatar.json file was updated to use the "sine" Variant
to drive the Overlay alpha parameter.
 2015-08-25 20:57:01 -07:00
Anthony J. Thibault
4abf0cbd63 AnimVariantMap is used in eval, MyAvatar loads avatar.json via url 2015-08-25 20:28:17 -07:00
samcake
fda9827100 Merge pull request #5529 from SeijiEmery/gputest 
gputest
 2015-08-25 20:03:08 -07:00
Brad Davis
d311e4f2ea Fixing problems reported by static analysis tool 2015-08-25 19:18:55 -07:00
Brad Davis
073567558e Fix UserInputMapper event generation 2015-08-25 19:15:06 -07:00
Brad Davis
f176003dad Fixing aspect ratio on stereo plugins 2015-08-25 19:05:31 -07:00
Brad Davis
0aaa07a2de Remove items from the QML version of the menu when they are removed from the main menu 2015-08-25 19:05:29 -07:00
Stephen Birarda
d5e77ba907 clear the pending received messages on handshake receive 2015-08-25 18:26:30 -07:00