LaShonda Hopper
a057cb914f
[Case 6569] Fixes clipping of cancel button by window edge.
...
Changes Committed:
modified: interface/resources/qml/hifi/tablet/NewModelDialog.qml
2017-11-08 18:27:25 -05:00
LaShonda Hopper
dac2ae19a4
[Case 6569] Add protection for dynamic vs static collision type (details below).
...
When creating a model, it was possible to elect Exact collision with the dynamic
property even though this combination is prohibited. This combination would silently
fail rather than notifying the user of the error.
This commit implements safeguards against the invalid combination:
* If the user elects the Exact collision type and the dynamic field is unchecked, then dynamic field is disabled.
* If the user elects a different collision type and the dynamic filed is unchecked, then the dynamic field is enabled.
* If the user has checked the dynamic field and subsequently elects the Exact collision type, then the selection is
void and the previous collision selection is retained; however, an error dialog is presented informing the user of the error.
Changes Committed:
modified: interface/resources/qml/hifi/tablet/NewModelDialog.qml
2017-11-08 18:27:24 -05:00
Seth Alves
e9c0e53aa6
Merge pull request #11760 from druiz17/far-grab-parent
...
Far grab rolls up parent tree when grabbing and add offset to LaserPointer::lockEndUUID
2017-11-07 08:53:13 -08:00
Dante Ruiz
c9d67f762b
made requested changes
2017-11-06 16:20:16 -08:00
Dante Ruiz
067ed2ffe0
apply coding standard
2017-11-06 16:09:31 -08:00
Dante Ruiz
646e5455ac
forgot to remove unused variable
2017-11-06 16:05:44 -08:00
Dante Ruiz
41c6261b74
LaserPointer: made _objectLockEnd into a struct
2017-11-06 16:04:33 -08:00
Dante Ruiz
3b15897b12
fixed farGrab parent grabbing and laser LockEndUUID
2017-11-06 15:21:20 -08:00
Zach Fox
bb21c52783
Fix crash when logging out while Passphrase screen visible
2017-11-06 15:12:01 -08:00
Stephen Birarda
99552910f7
Merge pull request #11754 from ctrlaltdavid/21591
...
Fix Asset Browser's "Copy URL" context menu
2017-11-06 13:42:22 -08:00
Howard Stearns
0898ad8b25
Merge pull request #11745 from zfox23/commerce_receiveAtFingerprint
...
Add Machine Fingerprint to receive_at endpoint txn
2017-11-06 09:06:01 -08:00
Dante Ruiz
e432e62a39
Merge branch 'master' of github.com:highfidelity/hifi into far-grab-parent
2017-11-06 09:02:03 -08:00
David Rowe
9db0dd6fea
Fix Asset Browser's "Copy URL" context menu
2017-11-05 20:38:37 +13:00
Brad Hefta-Gaub
c1dfa24c12
Merge pull request #11743 from kencooke/audio-peakmeters-bugfix
...
Fix the audio input device peak meters
2017-11-04 13:55:08 -07:00
Dante Ruiz
539cf35f30
saving work
2017-11-03 17:14:27 -07:00
Melissa Brown
a14e98053e
Merge pull request #11138 from Nex-Pro/21466
...
Fix Avatar Rotation upon Teleporting Using PAL
2017-11-03 11:58:15 -07:00
Zach Fox
c496429a85
Add Machine Fingerprint to receive_at endpoint txn'
2017-11-03 10:40:25 -07:00
Nex-Pro
3171418173
Update NameCard.qml
2017-11-03 17:21:35 +00:00
John Conklin II
ff36cbf45f
Merge pull request #11731 from sethalves/fix-ignore
...
stop drawing ignored avatars, even if PAL is still open
2017-11-03 09:45:03 -07:00
Ken Cooke
babaef8399
Fix the audio input device peak meters
2017-11-03 05:59:59 -07:00
Zach Fox
6f3c61c4e0
Slightly modify invalid cert language
2017-11-02 17:59:36 -07:00
Zach Fox
6173ad810b
Reset wallet passphrase when login username changes
2017-11-02 15:48:59 -07:00
Zach Fox
23e627a46f
Send empty decrypted text if impossible to decrypt
2017-11-02 13:46:24 -07:00
Zach Fox
19945c5991
Update cert UI
2017-11-02 10:22:00 -07:00
Zach Fox
f8718efe25
Fix warnings
2017-11-02 09:42:33 -07:00
Seth Alves
12792c3821
stop drawing ignored avatars, even if PAL is still open
2017-11-01 17:26:00 -07:00
Zach Fox
72d61f1825
Remove unnecessary log - static verif isn't working
2017-11-01 12:03:44 -07:00
Zach Fox
56cb98d96f
Make inspection cert work
2017-11-01 12:02:57 -07:00
Zach Fox
b335ba9a75
Timeout timer
2017-11-01 11:34:29 -07:00
Zach Fox
8a6a744099
It's working
2017-11-01 10:46:13 -07:00
Zach Fox
93308dfcd3
Why did I think this would work before?
2017-10-31 16:21:10 -07:00
Zach Fox
d49e281fab
Add RSA error handling
2017-10-31 14:12:30 -07:00
Zach Fox
e9c144892a
Fixes
2017-10-31 13:11:32 -07:00
Zach Fox
f5ada4fe62
Will it compile?
2017-10-31 12:33:28 -07:00
Zach Fox
6f96e0c7bd
More progress
2017-10-31 12:14:12 -07:00
Zach Fox
90e9251176
It's a start
2017-10-31 11:28:19 -07:00
Ryan Downe Karpf
28a99fe685
Merge pull request #11655 from dback2/tabletcontextualmode
...
add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place
2017-10-30 08:56:26 -07:00
vladest
b1601dcd4c
fix typo in tablet avatar browser
2017-10-28 12:07:29 +02:00
Andrew Meadows
f958829d00
Merge pull request #11708 from samcake/blue
...
Expose the Render api to the tablet js context and update render engine tool
2017-10-27 17:12:36 -07:00
Brad Hefta-Gaub
8322631a6d
Merge pull request #11695 from luiscuenca/case6719
...
6719 Avatar attachment window will update when attachments are modified
2017-10-27 17:01:05 -07:00
samcake
8a3b1a20cc
merge with upstream
2017-10-27 14:57:25 -07:00
Brad Hefta-Gaub
d61ede2a4e
Merge pull request #11697 from ElderOrb/FB8211
...
8211 Add very short haptic feedback when highlighting letters on keyboard
2017-10-27 13:26:41 -07:00
Zach Fox
5ab737f66d
Merge pull request #11658 from zfox23/pop_dynamicTestsMaster
...
Commerce: Owner Verification for Certified Entities
2017-10-27 12:28:04 -07:00
Zach Fox
3fae121335
Merge pull request #11670 from zfox23/stagingSetting
...
Make it easier to switch between STABLE and STAGING Metaverses
2017-10-27 12:03:29 -07:00
samcake
55f6ecb070
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-27 09:29:41 -07:00
samcake
0636a2db06
removing historic changes
2017-10-26 19:19:52 -07:00
Zach Fox
9481824d0a
Fix enabled status of wear button
2017-10-26 17:02:09 -07:00
beholder
6093cef6f0
add comments to explain '-1'
2017-10-27 01:25:26 +03:00
beholder
f6fa85fed2
adjust to coding standards
2017-10-27 01:25:25 +03:00
samcake
b9112024b8
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-26 14:27:23 -07:00
