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
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
John Conklin II
44041fcc14
Merge pull request #13986 from Atlante45/fix/ess-crash
...
Fix ESS crash caused by concurrent access to _entityScripts
2018-09-14 07:56:45 -07:00
Sam Gateau
eccca053f9
Clean changes
2018-09-13 23:58:40 -07:00
Sam Gateau
1438643a5f
Adding extra sanity checks on all time dependant values to avoid bad behavior maybe
2018-09-13 23:48:50 -07:00
unknown
f9480c24a5
store search term lower
2018-09-13 20:07:49 -07:00
unknown
ae2005b8c4
Merge branch 'master' of https://github.com/highfidelity/hifi into entityListSearchCase
2018-09-13 19:37:16 -07:00
Wayne Chen
568b5b9142
Merge pull request #13991 from wayne-chen/fixGoToButtonInterstitial
...
Fix GOTO TheSpot Button in Interstitial Page
2018-09-13 18:46:10 -07:00
luiscuenca
fb37e13aae
fix hat stand fail
2018-09-13 18:21:22 -07:00
David Back
b65bd6736f
also allow search using entity id
2018-09-13 18:20:11 -07:00
David Back
c5b5a5e8c1
Merge branch 'master' of https://github.com/highfidelity/hifi into entityListSearchCase
2018-09-13 18:03:13 -07:00
Wayne Chen
79cf1cb612
Merge pull request #13993 from highfidelity/revert-13989-fixLoginFailTwiceCall
...
Revert "Fix login fail twice call"
2018-09-13 17:49:06 -07:00
Wayne Chen
53582bddcd
pushing more changes
2018-09-13 17:26:08 -07:00
Wayne Chen
bf7dd94db7
button was clipped; adding higher res img
2018-09-13 17:25:33 -07:00
Wayne Chen
2b8aebdb6b
Revert "Merge branch 'master' into fixGoToButtonInterstitial"
...
This reverts commit b4b0c519f3aef3ed3e01
2018-09-13 17:21:29 -07:00
Wayne Chen
40451a1fc1
Revert "Revert "Merge branch 'master' into fixGoToButtonInterstitial""
...
This reverts commit c5468fd8e9
2018-09-13 17:21:07 -07:00
Wayne Chen
c5468fd8e9
Revert "Merge branch 'master' into fixGoToButtonInterstitial"
...
This reverts commit b4b0c519f377d5ebf34f
2018-09-13 17:18:49 -07:00
Wayne Chen
b4b0c519f3
Merge branch 'master' into fixGoToButtonInterstitial
2018-09-13 17:11:34 -07:00
Wayne Chen
fd1e64e4e6
Revert "Fix login fail twice call"
2018-09-13 17:01:59 -07:00
