Commit graph

40906 commits

Author SHA1 Message Date
Andrew Meadows
48efbba335 use dynamic constraints for IK 2016-03-11 14:47:48 -08:00
Andrew Meadows
71a81331d1 unit tests for dynamic twist limit adjustment 2016-03-11 14:47:48 -08:00
Andrew Meadows
c9f988d340 dynamic adjustment for twist 2016-03-11 14:47:47 -08:00
Andrew Meadows
4b75144797 remove debug cruft 2016-03-11 14:47:47 -08:00
Andrew Meadows
749dcf2c1d dynamic adjustment for swing 2016-03-11 14:47:47 -08:00
Andrew Meadows
6ebb94b1f4 minor API cleanup of SwingLimitFunction API 2016-03-11 14:47:47 -08:00
Andrew Meadows
df9ccf76ab fix animation-tests 2016-03-11 14:47:47 -08:00
Stephen Birarda
66e572f226 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-11 14:44:49 -08:00
Seth Alves
2ad15f7568 try harder to get queryAABoxes to be correct 2016-03-11 14:38:31 -08:00
Zach Pomerantz
a89a76dc4b Require model fixup if tex is transparent 2016-03-11 14:33:19 -08:00
Zach Pomerantz
3b62e203f7 Cache NetworkGeometry::_hasTransparentTextures 2016-03-11 14:33:18 -08:00
Zach Pomerantz
22d41c833f Update loaded models with texture transparency 2016-03-11 14:27:36 -08:00
Zach Pomerantz
ee1fb698a4 Add texture transparency to material key 2016-03-11 14:27:35 -08:00
howard-stearns
fce8369708 Remove logging that implies a problem that isn't there. 2016-03-11 14:23:47 -08:00
Ryan Huffman
55817e6b5a Merge branch 'master' of https://github.com/highfidelity/hifi into bugsplat-username 2016-03-11 14:01:45 -08:00
Ryan Huffman
4bcd8323f9 Merge branch 'bugsplat-username' of github.com:huffman/hifi into bugsplat-username 2016-03-11 13:59:13 -08:00
Ryan Huffman
d7b800283b Adjust bugsplat to use qPrintable 2016-03-11 13:57:05 -08:00
James B. Pollack
e82fa70bb4 Merge branch 'master' into consoleversion 2016-03-11 13:49:08 -08:00
Anthony J. Thibault
0ce004c8a7 Removed passive-aggressive comment, (it was a late night) 2016-03-11 13:36:48 -08:00
Clément Brisset
ac7cbbd960 Merge pull request #106 from birarda/atp-mappings
add overwriting of files during upload if hash doesn't match
2016-03-11 13:27:07 -08:00
Stephen Birarda
1502348731 Merge pull request #105 from Atlante45/feat/atp
Disable asset browser if user can't rez
2016-03-11 13:25:28 -08:00
Stephen Birarda
630f5303b2 overwrite existing asset during upload if hash doesn't match 2016-03-11 13:23:57 -08:00
Seth Alves
7a4dad8e51 allow entity-server to patch up broken queryAACubes 2016-03-11 13:20:52 -08:00
Clément Brisset
e5376b1229 Merge pull request #104 from birarda/atp-mappings
handle failed file write errors in AssetServer
2016-03-11 13:20:46 -08:00
Brad Hefta-Gaub
082bb8c4b8 auto-show reticle on mouse click 2016-03-11 12:49:42 -08:00
Seth Alves
f611d8f747 if needed, set querryAACube when dimensions are updated 2016-03-11 12:41:18 -08:00
Brad Hefta-Gaub
e341419090 enter away mode when you remove the Vive HMD 2016-03-11 11:56:39 -08:00
Atlante45
7efe26e854 Disable asset browser if user can't rez 2016-03-11 11:53:14 -08:00
Brad Hefta-Gaub
820e185c9d Merge branch 'master' of https://github.com/highfidelity/hifi into toggleOverlay 2016-03-11 11:49:43 -08:00
Chris Collins
ae596d79f1 Merge pull request #7317 from jherico/hmd_worn
Expose a property in display plugins to determine if the device is visible to the user
2016-03-11 11:46:06 -08:00
Brad Hefta-Gaub
d32611a7f9 make away show overlays if they are hidden when you enter away 2016-03-11 11:45:52 -08:00
Brad Hefta-Gaub
18f5b14e7a make all toggle menu items work properly through Menu scripting interface 2016-03-11 11:45:29 -08:00
Stephen Birarda
85e203e2cb return an empty string for no error 2016-03-11 11:44:46 -08:00
Stephen Birarda
e51aedeb35 fix error handling for diff request types 2016-03-11 11:36:52 -08:00
Stephen Birarda
9522c2d17c add file open and write error handling 2016-03-11 11:04:34 -08:00
Brad Davis
75c3fd18c9 Expose HMD worn to scripting 2016-03-11 11:00:58 -08:00
howard-stearns
e538edba0a Merge branch 'master' of https://github.com/highfidelity/hifi into zone-visibility 2016-03-11 10:22:01 -08:00
howard-stearns
9cdd0ac6d0 Respect zone visibility property. 2016-03-11 10:19:44 -08:00
Anthony Thibault
ab390f7d2e Merge branch 'master' into tony/smooth-hands 2016-03-11 10:06:31 -08:00
Ryan Huffman
631aad80f9 Add Q_DECLARE_METATYPE(AssetMappingModel*) and fix indentation 2016-03-11 09:53:08 -08:00
Anthony J. Thibault
5eeb4ca594 Fix one frame lag controller lag/jitter
Move userInputMapper->update() after inputPlugin->pluginUpdate().
2016-03-11 09:28:25 -08:00
Brad Hefta-Gaub
d1c024fb39 Merge pull request #7286 from zzmp/fix/skybox-tex
Clean up skybox rendering
2016-03-11 08:50:23 -08:00
Brad Hefta-Gaub
d8d500c318 Merge pull request #7291 from ericrius1/uniformBugRepro
Rapid uniform change test
2016-03-11 08:45:52 -08:00
Brad Hefta-Gaub
9b89654d6a Merge pull request #7312 from jherico/crashes
Better threaded handling of QML overlays
2016-03-11 08:45:08 -08:00
Brad Hefta-Gaub
d5c8e69c48 Merge pull request #7319 from samcake/red
Supporting RenderItems being added Outside the RenderSpatialTree volume
2016-03-11 08:34:50 -08:00
Seth Alves
510d96af0e Merge pull request #7316 from ZappoMan/toggleOverlay
Repair Toggle Overlays
2016-03-11 06:45:06 -08:00
Seth Alves
0d15706f34 Merge pull request #7315 from hyperlogic/tony/avatar-speed-stat-fix
Stats: fix for avatar velocity stat being stuck at 0.1
2016-03-11 06:37:23 -08:00
samcake
8281e1bc8f Obvioously, Austin was right, too many application.h... 2016-03-11 00:32:29 -08:00
samcake
729890342e Fixing the linux warning for unused variable 2016-03-11 00:27:56 -08:00
Zach Pomerantz
755efd1840 Update test shaders 2016-03-10 23:03:03 -08:00