LaShonda Hopper
0e90c92cf5
[Case 6569] Minor: Break up line to pass column count guidelines.
...
Changes Committed:
modified: interface/resources/qml/hifi/tablet/NewModelDialog.qml
2017-11-08 18:35:12 -05:00
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
Sam Gateau
114a45a089
Merge pull request #11742 from samcake/orange
...
Fix avatar attachment tearing
2017-11-08 12:29:46 -08:00
samcake
af1180255e
fixes from code review
2017-11-08 11:45:40 -08:00
samcake
75ce61c3a6
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-11-08 11:30:53 -08:00
Sam Gateau
3ef9ce0af6
Merge pull request #11732 from NissimHadar/hazeMaskFix
...
Haze mask fix
2017-11-07 17:37:24 -08:00
samcake
0718763ed1
Adjust syntax
2017-11-07 17:31:15 -08:00
samcake
91030a0057
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-11-07 15:55:59 -08:00
Seth Alves
0edf056b78
Merge pull request #11755 from MidnightRift/patch-1
...
Fix controllerDispatcherUtils file path
2017-11-07 13:22:18 -08:00
samcake
6481e0f713
Address cauterized cluster matrices issue
2017-11-07 12:52:23 -08:00
samcake
5ca3113709
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-11-07 10:42:28 -08:00
Clément Brisset
85efe5265d
Merge pull request #11724 from ctrlaltdavid/21580
...
Fix serverScripts not being able to see entities in parent/child tree
2017-11-07 10:36:20 -08:00
Seth Alves
7c6b5081d6
Merge pull request #11725 from luiscuenca/case8270
...
8270 Changing avatars while sitting - restore animations
2017-11-07 09:55:06 -08:00
Seth Alves
e22926eb89
Merge pull request #11762 from ctrlaltdavid/21594
...
Speed up entity list update after deleting entities
2017-11-07 09:34:47 -08:00
Seth Alves
ce7d0c324b
Merge pull request #11761 from ctrlaltdavid/21593
...
Don't move or rotate entities if Alt or Meta keys are pressed
2017-11-07 09:33:21 -08: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
David Rowe
fadbf09cdd
Avoid potentially slow entity list refresh upon deleting entities
2017-11-07 18:10:10 +13:00
samcake
f665bf384b
merge with upstream, and clean code
2017-11-06 17:02:10 -08:00
David Rowe
60319e8d53
Don't move or rotate entities if Alt or Meta keys are pressed
2017-11-07 13:35:31 +13:00
Zach Fox
fff2160113
Merge pull request #11759 from zfox23/commerce_fixLogOutCrash
...
Fix crash when logging out while Passphrase screen visible
2017-11-06 16:21:08 -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
samcake
eaed02b144
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-11-06 13:52:05 -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
d7429094e4
Merge pull request #11728 from howard-stearns/stable-v-staging-update-for-marketplace-injection
...
stable-v-staging for marketplace injection
2017-11-06 13:36:56 -08:00
Brad Hefta-Gaub
26c77ba72d
Merge pull request #11749 from ZappoMan/fixImportLargeEntities
...
allow splitting of edit or add entity packets across multiple edit packets when property list is larger than MTU
2017-11-06 10:06:07 -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
Midnight
e2ca3c6de0
Fix lib file path
...
Changed the include to what should be the correct file path. it does not exist in the controllers folder.
2017-11-05 13:39:26 -07:00
David Rowe
9db0dd6fea
Fix Asset Browser's "Copy URL" context menu
2017-11-05 20:38:37 +13:00
David Rowe
05275afb4f
Resending full scene is not necessary after all
2017-11-05 15:48:02 +13:00
David Rowe
a76b7855b5
Record only explicitly filtered-in entities for flagging extras
2017-11-05 15:03:43 +13:00
David Rowe
4a5f52155c
Pin node pointer
2017-11-05 14:33:30 +13:00
David Rowe
2d27a6cf4c
Merge branch 'master' into 21580
2017-11-05 13:59:43 +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
ZappoMan
d4b4d188ed
allow splitting of edit or add entity packets across multiple edit packets when property list is larger than MTU
2017-11-04 13:40:41 -07:00
Ken Cooke
9c1a33c826
Merge pull request #11748 from kencooke/audio-wasapi-update
...
Update WASAPI audio plugin
2017-11-04 09:25:00 -07:00
Sam Gateau
7da69633f3
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-11-03 20:20:53 -07:00
Ken Cooke
6ca9cc0239
Update WASAPI audio plugin
2017-11-03 18:40:55 -07:00
Dante Ruiz
539cf35f30
saving work
2017-11-03 17:14:27 -07:00
samcake
053052a95d
removing warnings
2017-11-03 13:28:20 -07:00
Brad Hefta-Gaub
d5eb670819
Merge pull request #11746 from highfidelity/RC-58
...
Merge RC58 into master
2017-11-03 12:50:02 -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
Ryan Huffman
7210a457c9
Merge pull request #11740 from huffman/fix/placename-erase-domain-id
...
Fix domain id getting set to empty when adding place name
2017-11-03 11:37:07 -07:00
Zach Fox
c496429a85
Add Machine Fingerprint to receive_at endpoint txn'
2017-11-03 10:40:25 -07:00
