Andrew Meadows
cf85c617a2
tweak avatar update priority coefs for load tests
2018-09-20 09:56:50 -07:00
Ryan Huffman
8805ce49e3
Remove verbose logging of keyboard messages in edit.js and gridTool.js
2018-09-19 15:06:58 -07:00
Wayne Chen
7e796f7e7f
committing requested changes
2018-09-19 14:26:30 -07:00
Wayne Chen
8d0e55c1cd
Merge branch 'master' of https://github.com/highfidelity/hifi
2018-09-19 13:00:33 -07:00
John Conklin II
3b1e0dc7d9
Merge pull request #13987 from zfox23/discovery_appUi
...
Discovery Notifications Project Checkpoint: Discovery apps now use AppUI module; PEOPLE app notifications
2018-09-19 12:38:28 -07:00
John Conklin II
6c63f92f39
Merge pull request #13933 from SamGondelman/accelerationSpread
...
Fix particle acceleration spread
2018-09-19 11:49:42 -07:00
John Conklin II
60c07280f8
Merge pull request #13971 from SamGondelman/parabola
...
Correct transparent parabola shader
2018-09-19 11:46:24 -07:00
Brad Davis
783ea21951
Fix AMD highlighting effect
2018-09-19 11:21:12 -07:00
Wayne Chen
a43799fffa
moving settings check within slotted functions
2018-09-19 10:40:49 -07:00
Wayne Chen
01594d7a52
fixing settings check in domain handler
2018-09-19 10:17:14 -07:00
Wayne Chen
795580f4e1
adding 404 redirect toggle with interstitial
2018-09-19 09:55:15 -07:00
Stephen Birarda
3a7785d10f
fix for deadlock in other avatar entity removal
2018-09-18 17:52:24 -07:00
Wayne Chen
8b3fff120a
Merge branch 'master' of https://github.com/highfidelity/hifi
2018-09-18 16:28:33 -07:00
Wayne Chen
be5f498c2f
reversion
2018-09-18 15:47:54 -07:00
Wayne Chen
48e4b38312
reversion
2018-09-18 15:28:15 -07:00
Wayne Chen
8274f4cb4c
reverting domain handler change
2018-09-18 15:26:12 -07:00
Zach Fox
d487914656
Prevent text notification from appearing when not necessary
2018-09-18 11:28:59 -07:00
Sam Gateau
d768809fbc
Merge pull request #13969 from SamGondelman/modelBugs
...
Fixing Model animation bugs
2018-09-18 11:28:37 -07:00
Wayne Chen
f82063ed46
Merge branch 'master' of https://github.com/highfidelity/hifi
2018-09-18 09:17:28 -07:00
Anthony Thibault
8229c14c44
Fix for type in AnimStats.qml
2018-09-17 15:17:43 -07:00
Zach Fox
c453594eb7
Overhaul notification logic for PAL
2018-09-17 14:41:18 -07:00
Zach Fox
143a059b16
Small changes to AppUI and PAL
2018-09-17 11:11:36 -07:00
Zach Fox
23fab0985b
Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi
2018-09-17 11:11:21 -07:00
Anthony Thibault
11fe657c05
Swaped AnimVar and StatMachine panels
2018-09-17 10:33:04 -07:00
Seth Alves
f86075b2dd
Revert "Fix for angularVelocity zeroing out on duplication or undo"
...
This reverts commit 9c96a10f6c
2018-09-15 09:21:12 -07:00
Seth Alves
1a44054c49
attempt fix for fb-17131
2018-09-15 09:15:43 -07:00
John Conklin II
be76c43aec
Merge pull request #13999 from gcalero/dont_popup_login_android
...
Don't popup login dialog in android
2018-09-14 16:06:03 -07:00
John Conklin II
cb8e3c6452
Merge pull request #14003 from danteruiz/snap-fix
...
Fix snapshot settings issue in HMD
2018-09-14 15:34:22 -07:00
John Conklin II
49e578ebef
Merge pull request #13998 from AndrewMeadows/dont-zero-kinematic
...
don't zero kinematic velocities when releasing simulation ownership
2018-09-14 15:18:06 -07:00
John Conklin II
65ef04ae75
Merge pull request #13937 from luiscuenca/stt_teleport_wip
...
Safe Teleport Target
2018-09-14 15:11:18 -07:00
Anthony Thibault
b0cde2afcc
Small addition to Anim Stats
...
* During a state machine interp the previous state now shows up in AlphaValues panel, with parentheses around the name.
* Added 3 new fields
* Position - in world coordinate frame.
* Heading - the facing angle in the world corrdinate frame.
* Local Vel - the velocity of the character in the local coordinate frame. (left, forward, up).
2018-09-14 15:05:17 -07:00
Zach Fox
9c5544af39
Merge in big work from appui_notifications branch
2018-09-14 14:37:04 -07:00
Zach Fox
9e50904376
Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi
2018-09-14 14:36:22 -07:00
Dante Ruiz
ff52639bc3
fix update
2018-09-14 14:10:36 -07:00
Dante Ruiz
4eb5c9714b
fix snapshot settings
2018-09-14 12:59:28 -07:00
luiscuenca
04e6225a95
Threshold back
2018-09-14 11:22:47 -07:00
Wayne Chen
0afea6fbd1
removing double login fail signal
2018-09-14 11:08:53 -07:00
luiscuenca
8c9173b639
Safe landing for discrepancies
2018-09-14 11:06:30 -07:00
David Back
86972cf4fb
Merge pull request #13992 from dback2/entityListSearchCase
...
Fix entity list search case-sensitivity and allow id search
2018-09-14 10:58:44 -07:00
Gabriel Calero
72eeeac2ba
Don't popup login dialog in android
2018-09-14 14:40:30 -03:00
Andrew Meadows
9390687e2d
remove redundant EntityMotionState::updateSendVelocities() call
2018-09-14 10:37:55 -07:00
Andrew Meadows
9073e1ade3
don't zero kinematic velocity at end of sim ownership
2018-09-14 10:37:17 -07:00
sabrina-shanman
237022d304
Refactor new pick parenting system for use with RayPick, ParabolaPick
2018-09-14 10:28:15 -07:00
Howard Stearns
4378f5bf1c
Merge pull request #13996 from howard-stearns/text-tuning-for-wallet-setup-cta
...
Text tuning for wallet setup call to action
2018-09-14 10:17:22 -07:00
David Back
296e2ba488
lowercase search term at start
2018-09-14 09:57:27 -07:00
David Back
30f0bd577a
Merge branch 'entityListSearchCase' of github.com:dback2/hifi into entityListSearchCase
2018-09-14 09:42:44 -07:00
David Back
a45be897ec
Merge branch 'master' of https://github.com/highfidelity/hifi into entityListSearchCase
2018-09-14 09:42:04 -07:00
Sam Gateau
81a69c7769
Merge pull request #13995 from samcake/black
...
Attempt to fix LOD setting getting stuck
2018-09-14 09:31:35 -07:00
sam gateau
b35f09fead
Address review comments
2018-09-14 08:43:35 -07:00
howard-stearns
685b2978ce
Text tuning for wallet setup call to action
2018-09-14 08:26:25 -07:00
