David Back
0cee023aa0
Merge branch 'master' of https://github.com/highfidelity/hifi
2018-02-15 10:06:41 -08:00
Clément Brisset
c62f68264f
Merge pull request #12295 from birarda/feat/content-split-from-settings
...
initial separation of DS into domain settings and content settings
2018-02-15 10:04:36 -08:00
John Conklin II
29b50ed711
Merge pull request #12376 from dback2/avatarInRange
...
get Avatars In Range
2018-02-15 09:49:17 -08:00
John Conklin II
db399a47eb
Merge pull request #12405 from ElderOrb/FB12297
...
Fix for privacy screen not displayed during wallet creation on step 3, while user entering password for the wallet
2018-02-15 09:47:45 -08:00
Sam Gondelman
09645c8b48
Merge pull request #12403 from 1P-Cusack/EntityPropertiesJS_801_on_split
...
[EntityPropertiesJS] Fix for 801 Uncaught TypeError (details below).
2018-02-15 09:34:59 -08:00
Nissim Hadar
7e99570824
Fixed Ubuntu warnings.
2018-02-15 07:54:55 -08:00
Nissim Hadar
adb02d69f9
WIP -adding canCastShadow flag.
2018-02-14 21:45:56 -08:00
Nissim Hadar
26e7a85a95
Fixed possible crash.
2018-02-14 21:15:29 -08:00
Sam Gateau
982e0b3e6c
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2018-02-14 20:37:34 -08:00
Nissim Hadar
12f4b8dbb1
Corrected event listener for canCastShadow - still bad.
2018-02-14 19:12:24 -08:00
Nissim Hadar
ef771b6db4
Minor indentation correction.
2018-02-14 19:11:13 -08:00
Nissim Hadar
a679b6f828
Fixed possible crash.
2018-02-14 18:55:04 -08:00
Nissim Hadar
be940493cc
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
2018-02-14 18:29:58 -08:00
samcake
246ac25d0a
Introducing a way to abort a task from one of its job, using it to skip highlight tasks if nothing to highlight
2018-02-14 17:36:46 -08:00
Sam Gondelman
15cdfef16a
Merge branch 'master' into decals
2018-02-14 17:33:01 -08:00
MiladNazeri
258133f1db
Merge pull request #12335 from ctrlaltdavid/21736
...
Update Overlays circle3d JSDoc per recent code changes
2018-02-14 17:17:04 -08:00
Nissim Hadar
054b2bf3e2
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
...
# Conflicts:
# libraries/networking/src/udt/PacketHeaders.cpp
# scripts/system/html/js/entityProperties.js
2018-02-14 17:10:07 -08:00
SamGondelman
324eefc914
remove fresnel, add unlit, fix overlays, cleanup
2018-02-14 17:02:07 -08:00
Zach Fox
5a8b8d4ac8
Lots of changes
2018-02-14 16:44:02 -08:00
David Back
e4263100b4
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarInRange
2018-02-14 16:40:11 -08:00
Stephen Birarda
4d4b42848b
add alert for moved content settings
2018-02-14 16:31:28 -08:00
Seth Alves
93d8a6f00d
Merge pull request #12402 from druiz17/fix-tablet-create-rotation
...
Fix tablet rotation when going into and out of create mode
2018-02-14 16:10:10 -08:00
Bradley Austin Davis
33690e09b7
Merge pull request #12399 from samcake/blue
...
Introducing group culling to avoid the avatar model to be partially culled
2018-02-14 15:38:52 -08:00
Dante Ruiz
8a95920c31
Merge branch 'master' of github.com:highfidelity/hifi
2018-02-14 15:15:46 -08:00
Seth Alves
d1c0f0a40f
Merge pull request #12390 from druiz17/add-control-mapping
...
add control button mapping for controller API
2018-02-14 15:02:28 -08:00
Alexander Ivash
611c67bf2f
FB12297 - HMD: Disabled preview mode only occurs during step 2 of the wallet setup wizard
2018-02-15 02:00:51 +03:00
LaShonda Hopper
d466c079a4
Simple fix for 801 Uncaught TypeError (details below).
...
entityProperties.js was throwing out: 801 Uncaught TypeError: Cannot read property 'split' of undefined
This moves properties.modelURL related checks behind the property.type validation check to avoid
calling the function on an undefined member if the object doesn't have that key defined.
Changes Committed:
modified: scripts/system/html/js/entityProperties.js
2018-02-14 17:00:52 -05:00
Dante Ruiz
e14f46101b
fix tablet rotation when switching into and out of create mode
2018-02-14 13:49:43 -08:00
John Conklin II
9ba29028e3
Merge pull request #12398 from jherico/fix/spectator_cam
...
Fix spectator camera crash
2018-02-14 13:15:42 -08:00
Stephen Birarda
37b8fa2c0c
put back default values in settings response
2018-02-14 12:09:57 -08:00
Stephen Birarda
3516a8939a
flag settings in description as being excluded from backups
2018-02-14 12:09:57 -08:00
Stephen Birarda
9f2015ba46
check correct element to determine if restart is required
2018-02-14 12:09:57 -08:00
Stephen Birarda
09c2390db4
change backup file name, fix safari button click bug
2018-02-14 12:09:57 -08:00
Stephen Birarda
11fe279f6f
add domain settings backup and restore to web interface
2018-02-14 12:09:57 -08:00
Stephen Birarda
2f6b079d80
quick re-organization of settings groups
2018-02-14 12:09:57 -08:00
Stephen Birarda
0ace92798d
repair 2.1 settings migration code for avatar height
2018-02-14 12:09:57 -08:00
Stephen Birarda
bb2df1eb37
rename entity server section to remove settings
2018-02-14 12:09:57 -08:00
Stephen Birarda
3969288996
re-hide advanced settings and show with collapsible
2018-02-14 12:09:57 -08:00
Stephen Birarda
b650753e43
hide confusing label from domain settings for now
2018-02-14 12:09:57 -08:00
Stephen Birarda
6e93eb5dfa
update SVG icon for HMD with new colour
2018-02-14 12:09:57 -08:00
Stephen Birarda
2c2a6d5c60
add the empty label group to domain extra groups
2018-02-14 12:09:57 -08:00
Stephen Birarda
8c924ea106
update badge colour
2018-02-14 12:09:57 -08:00
Stephen Birarda
b0967dfc3a
move some more settings to content, leave places in domain settings
2018-02-14 12:09:57 -08:00
Stephen Birarda
6240181474
initial separation of content settings and domain settings
2018-02-14 12:09:56 -08:00
Nissim Hadar
a92765a83a
Adding can cast shadow property.
2018-02-14 12:01:30 -08:00
John Conklin II
6187731fdc
Merge pull request #12291 from 1P-Cusack/FogBugz/Case_10865
...
[Case 10865] Make Asset Browser multi-select work with Ctrl/Cmd/Shift+Click
2018-02-14 11:14:26 -08:00
John Conklin II
63f752e76f
Merge pull request #12366 from sethalves/fix-children-of-animated-entity-joints
...
fix -- get children of animated entity joints to follow along, again
2018-02-14 11:12:45 -08:00
Brad Davis
8853bd6388
Fix spectator camera crash
2018-02-14 11:11:28 -08:00
samcake
6357f36a97
Fixing names
2018-02-14 10:39:14 -08:00
Zach Fox
0fca843667
Integrate 'alreadyOwned' endpoint
2018-02-14 10:24:34 -08:00
