Nissim Hadar
2920c6f9a9
Merge branch 'master' into hazeUIFix
2017-11-08 15:42:20 -08:00
Nissim Hadar
c1b5d00993
Converted 'Background Blend' control to a slider.
2017-11-08 15:41:24 -08:00
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
Elisa Lupin-Jimenez
45b9a150dc
updated blocks url refs in application to fix download issue
2017-11-08 15:21:48 -08:00
Zach Fox
33b6a13a4d
Revert 11728 and fix marketplace JS injection - should revisit
2017-11-08 15:21:36 -08:00
Brad Hefta-Gaub
d608d6ebf4
Merge pull request #11763 from Atlante45/new-master
...
Merge stable back into master
2017-11-08 15:10:06 -08:00
Elisa Lupin-Jimenez
796388dfb4
reverted a line to match current master
2017-11-08 14:50:15 -08:00
Elisa Lupin-Jimenez
e4c7958585
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
2017-11-08 14:36:07 -08:00
MissLiviRose
45e58b93e5
add skeleton scale change signal so scripts can detect scaling change
2017-11-08 14:23:49 -08:00
Seth Alves
34500fdf18
Merge pull request #11773 from vladest/fix_avatar_new_attachment
...
Remove checking of empty model url and add sanity for checking modelU…
2017-11-08 14:15:17 -08:00
Ryan Huffman
028410a26a
Fix alignment of Disconnect btn on ds settings
2017-11-08 14:05:51 -08:00
Ryan Huffman
1db8e2a0ec
Update create domain id language
2017-11-08 14:01:04 -08:00
Ryan Huffman
a55a30f87f
Fix 'Path' label when adding a place name
2017-11-08 14:00:43 -08:00
David Rowe
c5c1ead400
Fix GOTO dialog's connection status and location not always updating
2017-11-09 10:51:21 +13:00
Ryan Huffman
c77942c542
Fix domain settings not showing label when first setting a placename
...
This occurs because previously we only created the input elements if you
have a domain id when the page loads. Because you can now have a domain
id assigned after the page initially loads, we need to always create the
input.
2017-11-08 13:36:03 -08:00
Zach Fox
38fde43009
...simplify your life
2017-11-08 13:19:47 -08:00
Ryan Huffman
3a9c364837
Fix domain server label not handling spaces correctly
2017-11-08 13:09:42 -08:00
vladest
02625a6e28
Remove script from engine
2017-11-08 21:53:42 +01:00
Zach Fox
7995f50fab
Fix seeding
2017-11-08 12:52:53 -08:00
Zach Fox
3190fe1f32
Use keyfilepath instead of cached public keys
2017-11-08 12:30:48 -08:00
Sam Gateau
114a45a089
Merge pull request #11742 from samcake/orange
...
Fix avatar attachment tearing
2017-11-08 12:29:46 -08:00
vladest
6685b74c2a
Remove checking of empty model url and add sanity for checking modelUrl field existing
2017-11-08 21:23:50 +01:00
samcake
af1180255e
fixes from code review
2017-11-08 11:45:40 -08:00
Ryan Huffman
393b55424f
Fix Create-new-domain-id not saving in DS settings
2017-11-08 11:37:22 -08:00
samcake
75ce61c3a6
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-11-08 11:30:53 -08:00
Zach Fox
72fa0823ba
Logic changes
2017-11-08 11:01:54 -08:00
Zach Fox
b7163bb8fc
Frontend changes
2017-11-08 10:25:11 -08:00
Zach Fox
bd0c87ddad
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_seedingFrontend
2017-11-08 10:14:59 -08:00
vladest
5e32298183
Rework as script=only solution
2017-11-08 18:43:59 +01:00
Ken Cooke
addcb51ed9
Change slider label from "master gain" to "master volume"
2017-11-08 07:50:35 -08:00
vladest
72c4f5761a
Merge branch 'master' into fix_sriptslog_multiply_window
2017-11-08 14:04:09 +01:00
Olivier Prat
350993bef0
Merged with origin
2017-11-08 13:55:38 +01:00
Olivier Prat
bbcb0b2d9b
Fixed highlight in stereo mode, including HMD (testing on simulator)
2017-11-08 13:49:18 +01:00
Olivier Prat
f996435ac8
Merge branch 'master' of git://github.com/highfidelity/hifi into highlight
2017-11-08 11:41:21 +01:00
Olivier Prat
39604363ea
Optimized performance of bloom by reducing blur resolution and merging some downsampling passes with blur passes
2017-11-08 11:38:20 +01:00
Olivier Prat
91d8435a99
Merge branch 'master' of git://github.com/highfidelity/hifi into bloom
2017-11-08 08:17:55 +01:00
David Rowe
0d21e0be11
Delete old, no longer used file
2017-11-08 17:14:17 +13:00
David Rowe
055470296d
Move current location in GOTO dialog and add placeholder text to input
2017-11-08 17:13:40 +13:00
luiscuenca
8c5f97f3d1
More corrections
2017-11-07 20:25:24 -07:00
Sam Gateau
3ef9ce0af6
Merge pull request #11732 from NissimHadar/hazeMaskFix
...
Haze mask fix
2017-11-07 17:37:24 -08:00
luiscuenca
536bf6f81d
Corrections
2017-11-07 18:34:33 -07:00
samcake
0718763ed1
Adjust syntax
2017-11-07 17:31:15 -08:00
luiscuenca
ee3900be4f
Corrections
2017-11-07 18:26:41 -07:00
David Rowe
ebe5d51ee8
Label models.json.gz paths in server Content tab with operating system
2017-11-08 14:25:10 +13:00
Elisa Lupin-Jimenez
1ceec17405
missed an fbx block
2017-11-07 17:12:39 -08:00
Elisa Lupin-Jimenez
9a09ffe12f
removed old fbx code
2017-11-07 17:10:57 -08:00
Elisa Lupin-Jimenez
e37010565f
changed fileDialog return value to be compatible with musvis
2017-11-07 16:55:07 -08:00
Luis Cuenca
6fb47eef85
Merge branch 'master' into case7587
2017-11-07 17:19:39 -07:00
