Brad Hefta-Gaub
5245b6f7be
Merge pull request #7323 from howard-stearns/zone-visibility
...
Zone visibility
2016-03-15 13:44:40 -07:00
Anthony Thibault
addde84bee
Merge pull request #7363 from markej/master
...
Fill in the Downloads: line of the stats window
2016-03-15 10:42:09 -07:00
Howard Stearns
010aaa55c0
const ref
2016-03-14 22:13:26 -07:00
Howard Stearns
28f5ee16b8
Merge branch 'master' of https://github.com/highfidelity/hifi into zone-visibility
2016-03-14 22:05:41 -07:00
Ryan Huffman
e54d5aa162
Merge pull request #7354 from birarda/udt-slow-start
...
fix for UDT slow start phase with handshake changes
2016-03-14 21:07:49 -07:00
Stephen Birarda
8cb602173a
remove the unused member variable
2016-03-14 20:54:41 -07:00
Brad Hefta-Gaub
cf6a975a2b
Merge pull request #7336 from ctrlaltdavid/text3d-tuning
...
Improve text3d rendering
2016-03-14 18:59:06 -07:00
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
Howard Stearns
d7e3699bc8
Merge branch 'master' of https://github.com/highfidelity/hifi into zone-visibility
2016-03-14 17:45:52 -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
Stephen Birarda
7858b6b0cd
fix for slow start initial value with new randomization
2016-03-14 15:06:05 -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
Mark Johnson
b7a47d7bf2
Tabs -> Spaces
2016-03-12 17:35:57 -08:00
Mark Johnson
47d3f418e3
Merge remote-tracking branch 'highfidelity/master'
2016-03-12 17:30:22 -08:00
Mark Johnson
d868b541c4
Separate the request limit value from the active request value
...
Use _requestLimit as the download limit, and track active downloads using
_requestsActive. If the limit is changes below the active count, it will
continue downloading all active requests, but not allow new requests until
the active count gets below the limit. If the limit increases, the pending
request queue will be checked immediately to fill the available download slots.
2016-03-12 17:19:29 -08:00
Brad Davis
27ecdffeb3
Fix iDate uniform in procedurals to be continuous
2016-03-12 16:46:15 -08:00
David Rowe
f7c6725f63
Improve text3d rendering
2016-03-12 23:24:52 +13:00
Brad Hefta-Gaub
c93ed7c6f7
Merge pull request #7321 from ctrlaltdavid/20829
...
Restyle HMD menus
2016-03-11 20:43:27 -08:00
howard-stearns
8799bf2d55
Alternative implementation, which only selects visible bestZone.
2016-03-11 16:36:13 -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
