Anthony J. Thibault
558711f906
Smooth hips transition between idle and fly.
...
Also, take dt into account for the critically damped spring lerp calculation.
2018-06-04 16:57:41 -07:00
Anthony J. Thibault
c3d1daf855
Merge branch 'master' into nativeCGCode
2018-06-04 09:32:38 -07:00
Zach Fox
64cccc55d4
Merge pull request #13288 from zfox23/MS15529_secondaryCamNotifications
...
MS15529: Add secondary camera snapshot notification flag
2018-06-04 08:04:26 -07:00
Zach Fox
7f344c33a7
Docs update
2018-06-01 13:51:18 -07:00
Zach Fox
96858c9586
MS15529: Add secondary camera snapshot notification flag
2018-06-01 13:38:41 -07:00
John Conklin II
ed8d12593d
Merge pull request #12789 from sethalves/fix-collisionless-property
...
make legacy ignoreForCollision property work right
2018-06-01 11:46:18 -07:00
Seth Alves
708cbbc984
Merge pull request #13258 from wayne-chen/toggleAdvancedMovementFile-case-15453
...
JavaScript exception in toggleAdvancedMovementForHandControllers.js
2018-06-01 10:48:24 -07:00
Seth Alves
97b3fdfe68
make legacy collisionless property work right
2018-06-01 09:34:34 -07:00
John Conklin II
194c33bf19
Merge pull request #13254 from danteruiz/add-back-reload-scripts
...
adding back reload scripts shortcut and clean up AboutUtil
2018-06-01 09:31:13 -07:00
Brad Hefta-Gaub
81d873a273
Merge pull request #13285 from hyperlogic/bug-fix/make-rotation-constraint-tests-pass
...
Make RotationConstraintTests pass
2018-05-31 21:37:36 -07:00
Anthony J. Thibault
ddce4750ee
Make RotationConstraintTests pass
...
A previous bug fix made ElbowConstraint::apply() always return true.
Because it as always modifying the rotation via swingTwistDecomposition().
The tests now no longer check for a false value.
2018-05-31 17:14:16 -07:00
Wayne Chen
9f20d52d01
adding alternate solution.
2018-05-31 15:05:33 -07:00
Wayne Chen
d66b548fc5
fixing typo in script file.
2018-05-31 15:04:29 -07:00
Sam Gateau
f372e25a9f
Merge pull request #13247 from NissimHadar/DailyTests
...
Daily tests
2018-05-31 14:50:32 -07:00
John Conklin II
611159f65f
Merge pull request #13188 from SimonWalton-HiFi/placename-crash
...
Initialize Qt's use of openssl lib before calling RSA code
2018-05-31 14:34:24 -07:00
John Conklin II
ec3f9549f1
Merge pull request #13172 from wayne-chen/getChildrenIDs-issue-1934
...
Fix EntityScriptingInterface::getChildrenIDs function
2018-05-31 14:27:25 -07:00
Sam Gateau
46d055a488
Merge pull request #12649 from samcake/punk
...
Fix addressing the avatar mesh visibility switch bug
2018-05-31 14:16:04 -07:00
samcake
386c0f9ab2
Re review adjustments
2018-05-31 12:16:57 -07:00
John Conklin II
9d5d4c52c0
Merge pull request #13262 from danteruiz/add-back-notifactions
...
adding back notifcations to default scripts
2018-05-31 11:51:46 -07:00
John Conklin II
4175825093
Merge pull request #13215 from AndrewMeadows/activate-on-action-removal
...
activate RigidBody when removing physics Action
2018-05-31 11:20:03 -07:00
Sam Gateau
513acc529e
INtroduce RenderConstants header file to define the alias names for Tag and Layer for Hifi REnder Engine
2018-05-30 23:31:54 -07:00
NissimHadar
bea21e3a68
WIP.
2018-05-30 17:06:49 -07:00
NissimHadar
6717a16098
WIP.
2018-05-30 17:04:19 -07:00
NissimHadar
51b1188bdb
WIP.
2018-05-30 17:01:47 -07:00
NissimHadar
df668e44ca
WIP.
2018-05-30 16:59:53 -07:00
NissimHadar
c1bc3bd154
WIP.
2018-05-30 16:58:35 -07:00
NissimHadar
d01d774f76
WIP.
2018-05-30 16:51:17 -07:00
NissimHadar
06c167cc68
Add error to failure name.
2018-05-30 16:49:36 -07:00
NissimHadar
78f04f84c5
Merge branch 'master' of github.com:highfidelity/hifi into DailyTests
2018-05-30 16:45:53 -07:00
NissimHadar
c8a04911f4
Interface respects Show Overlay menu checkbox on start up.
2018-05-30 16:45:29 -07:00
samcake
37c1f4fc06
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2018-05-30 16:05:46 -07:00
John Conklin II
6095a3b319
Merge pull request #13082 from jherico/feature/shader_cache
...
Shader load time performance optimiziations
2018-05-30 13:55:34 -07:00
Simon Walton
a3324c5616
Remove empty destructor
2018-05-30 13:52:26 -07:00
Simon Walton
8fb5d1b92d
Make RSA key-pair class a Runnable that's owned by a threadpool
2018-05-30 13:41:08 -07:00
samcake
457b77ca09
fixing static definition maybe
2018-05-30 13:37:32 -07:00
Dante Ruiz
072d8b70b1
adding back notifcations
2018-05-30 13:36:02 -07:00
Sam Gondelman
46a6334c72
Merge pull request #13249 from gcalero/android_remove_mic_bar
...
Android: Update Application.cpp
2018-05-30 14:31:31 -04:00
samcake
2e9076c71e
Clean up and trying to get ready for merge
2018-05-30 11:14:49 -07:00
Sam Gondelman
0d6cd8de58
Merge pull request #13242 from gcalero/signing_apk
...
Sign release apk. Remove daydream intent from manifest
2018-05-30 13:45:54 -04:00
Wayne Chen
81eea5d8d1
Merge pull request #13213 from wayne-chen/filebrowser-case-14515
...
Adding showHidden properties to file dialogs to allow for showing hidden files/folders
2018-05-30 10:43:58 -07:00
NissimHadar
3b44b3a31f
Merge branch 'master' of github.com:highfidelity/hifi into DailyTests
2018-05-30 10:23:10 -07:00
Gabriel Calero
a36c41fc13
Make APK release signature optional
2018-05-30 12:43:44 -03:00
Gabriel Calero
4b9295b9be
Merge remote-tracking branch 'upstream/master' into signing_apk
2018-05-30 11:16:16 -03:00
Andrew Meadows
bc57003cfb
activate body before disconnecting action from entity
2018-05-29 17:56:41 -07:00
Andrew Meadows
5d3502ed88
activate body when removing action
2018-05-29 17:56:41 -07:00
Dante Ruiz
543a721a11
fix headers
2018-05-29 17:55:42 -07:00
samcake
873cabe284
Cleaning the code
2018-05-29 17:46:25 -07:00
Dante Ruiz
ea10dc176a
adding back reload scripts
2018-05-29 17:38:02 -07:00
Simon Walton
66d39667e1
AccountManager destructor waits for any RSA key thread
2018-05-29 17:04:37 -07:00
Gabriel Calero
b99f901595
Merge branch 'android_remove_mic_bar' of https://github.com/gcalero/hifi into android_remove_mic_bar
2018-05-29 17:22:04 -03:00
