Adam Smith
|
14ab53571f
|
Merge pull request #14564 from sabrina-shanman/hfm_prep
(case 20274) Create the HFM Preparation Step
|
2018-12-17 15:17:19 -08:00 |
|
Jeff Clinton
|
5a81d8c093
|
Merge pull request #14453 from danteruiz/keyboard-menus
Keyboard interaction menus
|
2018-12-12 17:53:59 -08:00 |
|
Dante Ruiz
|
f3fad52e1d
|
make CR changes
|
2018-12-12 13:29:32 -08:00 |
|
Dante Ruiz
|
51bdf1bf78
|
adding keyboards settings
|
2018-12-12 11:55:13 -08:00 |
|
sabrina-shanman
|
566d09dc9c
|
Add model preparation step to ModelCache using new library model-baker
|
2018-12-11 11:15:54 -08:00 |
|
Shannon Romano
|
a3c870ed90
|
Merge pull request #14479 from sabrina-shanman/hfm_mimetype
(case 20037) Add robust MIME type detection for loading models in ModelCache
|
2018-12-11 18:41:55 +00:00 |
|
Brad Hefta-Gaub
|
43bbba6635
|
Merge pull request #14554 from sethalves/break-parenting-loops
fix some parenting loops crashes
|
2018-12-11 10:02:17 -08:00 |
|
Shannon Romano
|
bb9a764855
|
Merge pull request #14517 from luiscuenca/getEntityJointParent
Add method to check entities joint hierarchy
|
2018-12-11 01:06:38 +00:00 |
|
Seth Alves
|
c1e2653526
|
check for and break parenting loops in hasAncestorOfType, findAncestorOfType, isParentPathComplete
|
2018-12-08 07:42:03 -08:00 |
|
sabrina-shanman
|
6ea4769173
|
Re-name MIMETypeLibrary to MediaTypeLibrary and update related references
|
2018-12-06 13:39:18 -08:00 |
|
sabrina-shanman
|
3c38b43a65
|
Fix compilation error due to static variable definition in MIMETypeLibrary header file
|
2018-12-04 09:30:04 -08:00 |
|
sabrina-shanman
|
19459c15a5
|
Split MIMETypeLibrary file type detection into three separate functions
|
2018-12-04 09:30:04 -08:00 |
|
sabrina-shanman
|
660d8c4e92
|
Remove unused mapping parameter from MIME type detection
|
2018-12-04 09:30:04 -08:00 |
|
sabrina-shanman
|
6ec0e42ded
|
Remove locks from MIMETypeLibrary
|
2018-12-04 09:30:04 -08:00 |
|
Clément Brisset
|
62f21822ce
|
Merge pull request #14494 from Atlante45/fix/agent-shutdown-crash
Fix Agent crash on shutdown
|
2018-12-03 14:17:35 -08:00 |
|
luiscuenca
|
ad42f6a590
|
Add method to check entities joint hierarchy
|
2018-12-01 12:32:29 -07:00 |
|
sabrina-shanman
|
142e787a9c
|
Create MIMETypeLibrary for general MIME type detection
|
2018-11-30 10:28:43 -08:00 |
|
Jeff Clinton
|
0bca290de2
|
Merge pull request #14485 from sethalves/crash-on-exits
suppress 'No instance available' messages during shutdown. try a dif…
|
2018-11-30 10:10:43 -08:00 |
|
Clement
|
181f2b4263
|
Fix Agent crash on shutdown
|
2018-11-28 18:40:52 -08:00 |
|
Shannon Romano
|
ff934a8f87
|
Merge pull request #14394 from sabrina-shanman/hfm_serializer
(case 20005) Create HFMSerializer interface for model loaders
|
2018-11-28 11:10:27 -08:00 |
|
Seth Alves
|
fac27553d7
|
suppress 'No instance available' messages during shutdown. try a different way of shutting down AudioClient.
|
2018-11-27 17:02:48 -08:00 |
|
Seth Alves
|
8f21ade0c7
|
make cmake -DDISABLE_QML=1 work again
|
2018-11-27 12:41:40 -08:00 |
|
sabrina-shanman
|
be511378cd
|
Merge branch 'master' into hfm_serializer
|
2018-11-20 13:42:24 -08:00 |
|
Olivier Prat
|
45e0f65972
|
Merge branch 'ao' of http://github.com/Zvork/hifi into ao
|
2018-11-14 09:48:24 +01:00 |
|
sabrina-shanman
|
e08bc7296f
|
Merge branch 'master' into hfm_serializer
|
2018-11-13 15:41:49 -08:00 |
|
sabrina-shanman
|
93c7578f54
|
Convert hfm::Serializer to use hifi-namespaced types
|
2018-11-12 16:12:21 -08:00 |
|
John Conklin II
|
0370c60398
|
Merge pull request #14358 from AndrewMeadows/fix-capsuleY
Case 18436: consistent handling of CapsuleShape dimensions
|
2018-11-12 15:25:42 -08:00 |
|
John Conklin II
|
dc4b967ff5
|
Merge pull request #14331 from SimonWalton-HiFi/large-avatars-bad-position
Clamp avatar-joint translations that hit the compressed-format limit
|
2018-11-11 16:27:56 -08:00 |
|
Dante Ruiz
|
358aa547b1
|
feedback changes
|
2018-11-08 09:58:53 -08:00 |
|
Dante Ruiz
|
f664421fe0
|
addressing code review feedback
|
2018-11-08 09:58:53 -08:00 |
|
Andrew Meadows
|
5bfb9c1f71
|
fix ShapeInfo::contains() logic for capsule shapes
|
2018-11-08 08:39:43 -08:00 |
|
Olivier Prat
|
9d5dcec0a0
|
Merge from master
|
2018-11-08 09:14:42 +01:00 |
|
Andrew Meadows
|
6ecf850159
|
clarify ShapeInfo::setCapsuleY() API and use it correctly
|
2018-11-06 12:37:55 -08:00 |
|
Simon Walton
|
26b9e2e162
|
Fix a URL while we're in the file
|
2018-11-02 14:47:40 -07:00 |
|
Simon Walton
|
e64557a46c
|
Clamp the fixed-point network values to their limits
|
2018-11-02 11:52:40 -07:00 |
|
SamGondelman
|
e64a4d0536
|
try to fix unnecessary queryAACube updates
|
2018-10-30 12:47:44 -07:00 |
|
John Conklin II
|
2eb801bdc6
|
Merge pull request #14035 from SimonWalton-HiFi/avatar-mixer-improvements
Further avatar-mixer improvements
|
2018-10-25 12:25:32 -07:00 |
|
Jeff Clinton
|
67fe43ebb1
|
Merge pull request #14243 from hyperlogic/bug-fix/small-jumping-avatars
Small avatars now have a minimum jump height of 0.25 meters
|
2018-10-24 17:08:28 -07:00 |
|
Simon Walton
|
e22e0ecb04
|
Merge branch 'master' into avatar-mixer-improvements
|
2018-10-24 10:39:23 -09:00 |
|
Olivier Prat
|
69ace03919
|
Merged with master
|
2018-10-24 08:27:39 +02:00 |
|
Simon Walton
|
0a78eeaf1a
|
Merge branch 'master' into avatar-mixer-improvements
|
2018-10-23 15:56:56 -07:00 |
|
Zach Fox
|
493262052c
|
Remove extraneous code changes; remove QUrlAncestry code; remove extra logging
|
2018-10-22 13:59:52 -07:00 |
|
Zach Fox
|
7be5d5674d
|
Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2
|
2018-10-22 13:59:35 -07:00 |
|
Olivier Prat
|
5f3a299fd9
|
Merge with master
|
2018-10-22 14:02:24 +02:00 |
|
Seth Alves
|
2ce8ed25f8
|
Merge pull request #14125 from Atlante45/fix/mac-warnings
Fix new Mac warnings
|
2018-10-20 13:40:53 -07:00 |
|
Anthony Thibault
|
6cc7c861d1
|
Merge pull request #14221 from hyperlogic/feature/disable-hands-if-too-far-or-at-rest
Disable user hand controllers if they are too far away or not moving.
|
2018-10-19 14:02:32 -07:00 |
|
Anthony Thibault
|
ef74014075
|
Small avatars now have a minimum jump height of 0.25 meters
This should improve the quality of the jump animation and improve the mobility of small avatars.
|
2018-10-19 13:55:56 -07:00 |
|
Simon Walton
|
0b2ee35907
|
Merge branch 'master' into avatar-mixer-improvements
|
2018-10-18 14:13:39 -07:00 |
|
Zach Fox
|
2f37a2b1a1
|
Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2
|
2018-10-18 11:12:26 -07:00 |
|
John Conklin II
|
1cc2569bd8
|
Merge pull request #13596 from SamGondelman/scriptvec3
Replace vec2, vec3, and xColor properties with JS prototypes
|
2018-10-18 09:47:56 -07:00 |
|