Commit graph

16328 commits

Author SHA1 Message Date
Brad Hefta-Gaub
447918d148 Merge pull request #7348 from hyperlogic/tony/cppcheck-fixes
Avatar & Animation cppcheck static analysis fixes
2016-03-14 18:58:25 -07:00
Zach Pomerantz
ff0862b594 Emplace render engine jobs 2016-03-14 17:51:43 -07:00
Anthony J. Thibault
16a57bda81 SwingTwistConstriant: fix for bad index. 2016-03-14 17:30:53 -07:00
Anthony Thibault
5623fc1b89 Merge pull request #7328 from AndrewMeadows/dynamic-constraints
reduce clamping of animation underpose by IK system
2016-03-14 16:47:00 -07:00
ZappoMan
1a17de6dbb reduce log spam 2016-03-14 14:02:25 -07:00
Seth Alves
e8a03b725f try again on queryAACube 2016-03-14 13:03:27 -07:00
Seth Alves
5292e537ea further unmangle merge 2016-03-14 11:22:01 -07:00
Seth Alves
908481d5d4 merge from upstream 2016-03-14 11:15:16 -07:00
Brad Hefta-Gaub
830f53cc46 Merge pull request #7345 from sethalves/delete-parentless-entities-redux
Delete parentless entities redux
2016-03-14 10:04:22 -07:00
Brad Hefta-Gaub
7f4cbeda00 Merge pull request #7343 from jherico/procedural_time
Fix iDate uniform in procedurals to be continuous
2016-03-13 22:08:54 -07:00
Anthony Thibault
54cc49283c libraries/avatars: cppcheck warning fixes 2016-03-13 18:19:42 -07:00
Anthony Thibault
9f30556084 libraries/animation: cppcheck fixes
* Fix for potential bug in AnimLoop due to _maxFrameIndexHint being uninitialized.
* made more single argument constructors explicit.
2016-03-13 17:17:34 -07:00
Anthony Thibault
11fcf00b2a AnimSkeleton.h: made single argument ctors explicit 2016-03-13 16:55:34 -07:00
Anthony Thibault
02b2281def AnimVarient.h: cppcheck fixes
* make all constructors explicit.
* remove static string comparison in assert.
2016-03-13 16:51:57 -07:00
Brad Davis
798d2a73db Merge pull request #7326 from ZappoMan/toggleOverlay
Various Overlay, Menu, and Away Mode bug fixes
2016-03-13 11:44:19 -07:00
Seth Alves
dbd548a8c7 fix a crash 2016-03-13 11:01:11 -07:00
Seth Alves
7641b1e99d remove debug print 2016-03-13 08:45:23 -07:00
Seth Alves
415f21c189 be more aggressive about putting entities into the missing-its-parent list 2016-03-13 08:35:21 -07:00
Seth Alves
0a2fb77698 delete child entities when parent is deleted 2016-03-13 07:04:50 -07:00
Brad Davis
27ecdffeb3 Fix iDate uniform in procedurals to be continuous 2016-03-12 16:46:15 -08:00
Brad Hefta-Gaub
c93ed7c6f7 Merge pull request #7321 from ctrlaltdavid/20829
Restyle HMD menus
2016-03-11 20:43:27 -08:00
Brad Hefta-Gaub
f9fca99b42 Merge pull request #7329 from howard-stearns/suppress-misleading-thread-warning
Remove logging that implies a problem that isn't there.
2016-03-11 16:34:46 -08:00
Seth Alves
01659cf93b try, try again 2016-03-11 16:21:20 -08:00
David Rowe
8b9319b29e Merge branch 'master' into 20829 2016-03-12 13:09:59 +13:00
Seth Alves
5f05d576cc move checkAndAdjustQueryAACube into SpatiallyNestable 2016-03-11 15:55:42 -08:00
David Rowe
9da64e540d Add shortcut keys to HMD menu 2016-03-12 12:53:16 +13:00
David Rowe
ecf67282d5 Add separators to HMD menus 2016-03-12 12:29:52 +13:00
Philip Rosedale
7e581cc831 Merge pull request #7325 from hyperlogic/tony/smooth-hands
Smoother hand motion when using hand controllers
2016-03-11 15:08:59 -08:00
Seth Alves
1e8706b1da remove debug print 2016-03-11 14:47:53 -08:00
Andrew Meadows
48efbba335 use dynamic constraints for IK 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
Seth Alves
2ad15f7568 try harder to get queryAABoxes to be correct 2016-03-11 14:38:31 -08:00
howard-stearns
fce8369708 Remove logging that implies a problem that isn't there. 2016-03-11 14:23:47 -08:00
Anthony J. Thibault
0ce004c8a7 Removed passive-aggressive comment, (it was a late night) 2016-03-11 13:36:48 -08:00
Seth Alves
7a4dad8e51 allow entity-server to patch up broken queryAACubes 2016-03-11 13:20:52 -08:00
Seth Alves
f611d8f747 if needed, set querryAACube when dimensions are updated 2016-03-11 12:41:18 -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
18f5b14e7a make all toggle menu items work properly through Menu scripting interface 2016-03-11 11:45:29 -08:00
Anthony Thibault
ab390f7d2e Merge branch 'master' into tony/smooth-hands 2016-03-11 10:06:31 -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
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
samcake
729890342e Fixing the linux warning for unused variable 2016-03-11 00:27:56 -08:00
Zach Pomerantz
2508b14126 Workaround for scribe not scrubbing #else 2016-03-10 22:53:21 -08:00