Commit graph

54602 commits

Author SHA1 Message Date
Anthony J. Thibault
d7f195bc42 warning fix 2017-05-09 13:17:06 -07:00
Anthony J. Thibault
0bcc3c023e warning fixes 2017-05-09 13:07:06 -07:00
Anthony J. Thibault
7b35e8c7fd Bug fix for hands, reduced elbow angle to 60 degrees from horizontal. 2017-05-09 11:57:41 -07:00
Anthony J. Thibault
fe69f58174 Bug fix centerLimit rot for LeftArm, also, lower arms in centerLimit pose
Lowering the arms in centerLimit poses will help keep the elbows relaxed on the side of the body.
2017-05-09 09:47:26 -07:00
Anthony J. Thibault
5a4b21c0a9 Removed debug code 2017-05-08 18:10:56 -07:00
Anthony J. Thibault
84aa86b464 Added animVar support for IK solutionSource. 2017-05-08 18:07:45 -07:00
Anthony J. Thibault
2166d8c159 Added setSolutionSource to AnimInverseKinematics node. 2017-05-08 15:06:31 -07:00
Anthony J. Thibault
712fcbe27a Removed cruft/debug code & comments 2017-05-08 15:06:30 -07:00
Anthony J. Thibault
7af93f9fea Hooked up IK constraint rendering 2017-05-08 15:06:29 -07:00
Anthony J. Thibault
e992d6703a WIP: debug render joint constraints. 2017-05-08 15:06:28 -07:00
Anthony J. Thibault
a260163aee WIP commit, first pass at generating limit center joints + debug draw 2017-05-08 15:06:27 -07:00
Thijs Wenker
5aed960c4c Merge pull request #10389 from AndrewMeadows/render-collision-shapes-002
fix render of debug collision shapes
2017-05-08 20:35:59 +02:00
Brad Hefta-Gaub
d52daf3445 Merge pull request #10378 from samcake/orange
Adding a test to protect Uniform Buffer binding at wrong slot
2017-05-08 11:16:56 -07:00
Clément Brisset
8df8ed568f Merge pull request #10342 from huffman/feat/tutorial-update
DNM Tutorial update
2017-05-08 10:54:19 -07:00
Chris Collins
4bfb23b5d2 Merge pull request #10388 from humbletim/21308
CR #21308 Fix Script.print
2017-05-08 10:46:49 -07:00
Chris Collins
1264c34f6c Merge pull request #10349 from birarda/machine-guid-fingerprint
use MachineGuid for slightly safer windows machine fingerprint
2017-05-08 10:42:14 -07:00
Chris Collins
d88d52cd2e Merge pull request #9735 from humbletim/21190-fix-unit-tests
CR 21190 unit_tests: add support for jasmine.done() and pending
2017-05-08 09:19:01 -07:00
Chris Collins
0351ac1575 Merge pull request #10401 from jherico/fix_benny_hill_animations
Fix sped up animations
2017-05-08 09:11:23 -07:00
Chris Collins
b4118e5619 Merge pull request #10394 from zzmp/fix/local-audio-prep
Guard against local audio crashes
2017-05-08 09:04:41 -07:00
Brad Davis
b63015eaea Fix sped up animations 2017-05-06 14:34:28 -07:00
Seth Alves
9e0845f17e Merge pull request #10387 from vladest/tablet-performance
Decrease CPU usage in tabletUI periodical updates
2017-05-06 07:07:29 -07:00
Vladyslav Stelmakhovskyi
b2be22f0e0 Maerge broke the logic. Fixed now 2017-05-06 10:28:57 +02:00
Clément Brisset
37f339858e Merge pull request #10397 from huffman/feat/baked-tutorial
Update content set URL
2017-05-05 17:34:41 -07:00
Chris Collins
0a16831395 Merge pull request #10396 from Atlante45/master
Stable -> Master
2017-05-05 16:47:51 -07:00
Ryan Huffman
4895f51dc1 Update content set URL 2017-05-05 16:41:32 -07:00
Chris Collins
820ed5049b Merge pull request #10365 from sethalves/fix-dont-send-non-entity-edits-over-wire
Fix -- dont send non-entity edits to entity-server
2017-05-05 16:37:27 -07:00
Atlante45
d4bd145786 Merge branch 'stable' of https://github.com/highfidelity/hifi 2017-05-05 16:36:21 -07:00
Zach Pomerantz
7db404eba0 recast avoid overwriting buffer logic 2017-05-05 18:16:48 -04:00
Zach Pomerantz
ed3fc004a6 avoid assignment-as-test 2017-05-05 18:15:56 -04:00
Clément Brisset
479e810173 Merge pull request #10364 from huffman/fix/ktx-skybox-loading
Fix progressive loading of KTX skybox textures
2017-05-05 14:11:03 -07:00
Zach Pomerantz
48af83a960 guard against audio injector and local buffer datarace 2017-05-05 17:05:40 -04:00
Zach Fox
6b00688289 Merge pull request #10392 from zfox23/AvailabilityLanguageChanges
"Set Availability" UI changes
2017-05-05 14:03:39 -07:00
Zach Pomerantz
cdf6c332a6 prevent overflow of local injectors buffer 2017-05-05 16:29:52 -04:00
Zach Pomerantz
e882e7b648 rm extra lock in audio read 2017-05-05 15:37:01 -04:00
Zach Fox
a10606b994 OMG language changed again 2017-05-05 11:44:59 -07:00
Zach Fox
905f36976f New language 2017-05-05 11:28:49 -07:00
Howard Stearns
f676c84477 Merge pull request #10393 from howard-stearns/announcement-card-tweak
Announcement Card visual tweaks.
2017-05-05 11:22:10 -07:00
howard-stearns
2ecc71a990 Annoncement Card visual tweeks. 2017-05-05 10:49:09 -07:00
Zach Fox
b41fb952ae UI changes - Thanks Alan! 2017-05-05 10:29:46 -07:00
Chris Collins
fd836dcd68 Merge pull request #10366 from Atlante45/feat/normal-map-compression
Feat/normal map compression
2017-05-05 10:03:01 -07:00
Chris Collins
8d49540f3a Merge pull request #10380 from vladest/rightclick-fix
Rightclick fix
2017-05-05 10:01:11 -07:00
Andrew Meadows
f809afae2f Merge pull request #10363 from jherico/qmlspam
Removing logspam on toggling scripts window
2017-05-05 08:29:12 -07:00
humbletim
25807a5258 fix warning color 2017-05-05 09:48:24 -04:00
Vladyslav Stelmakhovskyi
e395a51c60 Merge with master 2017-05-05 07:05:16 +02:00
Seth Alves
7f4399b0a3 fix name in entity-edit-an-overlay warning 2017-05-04 19:16:15 -07:00
Seth Alves
9ee6badc86 Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire 2017-05-04 19:06:13 -07:00
Seth Alves
92966377fb Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire 2017-05-04 19:05:57 -07:00
Seth Alves
900fae30fd avoid calling editEntity on overlays 2017-05-04 19:05:52 -07:00
Seth Alves
a7c684e007 entity scripting call to get the nestable-type of an object, by id 2017-05-04 19:05:29 -07:00
Seth Alves
51cb579773 function to turn nestable-type into a string 2017-05-04 19:05:01 -07:00