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
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
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
Dante Ruiz
2a8101a944
Merge branch 'master' of github.com:highfidelity/hifi
2018-02-14 09:35:53 -08:00
Zach Fox
2f0c9e1acb
Merge pull request #12394 from zfox23/commerce_fixRecentActivityWrap
...
Commerce: Fix wrap mode for very long P2P memos
2018-02-14 09:14:21 -08:00
samcake
1d3ae1b187
Work in progress to get the render items beeing tagged correctly for groupCulled
2018-02-13 17:50:01 -08:00
Stephen Birarda
6ba2f4b279
Merge pull request #12286 from Atlante45/feat/asset-server-backup
...
Add asset server backups capabilities to the Domain Server
2018-02-13 17:40:11 -07:00
John Conklin II
309c2ecba1
Merge pull request #12239 from druiz17/fix-camera-update
...
Do not override sensorToWorldMatrix if animGraph is loading or failed to load
2018-02-13 15:10:13 -08:00
Zach Fox
a477a3da70
Done with My Purchases flow for now
2018-02-13 15:04:31 -08:00
Zach Fox
69a06bf1b7
Wrong fonts file
2018-02-13 14:42:03 -08:00
Dante Ruiz
119a7554ee
Prevent add the same tablet url app to the tabletApps list
2018-02-13 14:33:15 -08:00
SamGondelman
4500ed17e7
merge from master
2018-02-13 13:58:39 -08:00
Zach Fox
ae8a8a48eb
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
2018-02-13 13:55:32 -08:00
Zach Fox
1b7253dc7f
Already Owned endpoint
2018-02-13 13:54:50 -08:00
Zach Fox
3e41229e8c
Commerce: Fix wrap mode for very long P2P memos
2018-02-13 13:30:17 -08:00
SamGondelman
38290064c1
replace materials by name, hide material mode for now
2018-02-13 13:24:08 -08:00
Zach Fox
8cd00c49d6
PAL: Prevent opening of Availability from WebView
2018-02-13 13:21:40 -08:00
samcake
a98f55298b
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2018-02-13 13:06:58 -08:00
samcake
f64e5f2444
Introducing the cull group
2018-02-13 13:06:26 -08:00
Clément Brisset
593113c102
Merge pull request #12387 from Atlante45/new-master
...
Merge stable back into master
2018-02-13 12:59:59 -08:00
Andrew Meadows
b111e82763
Merge pull request #12365 from AndrewMeadows/workload-001
...
moving Job/Task framework out of 'render' library and into its own 'task' library
2018-02-13 12:26:32 -08:00
Andrew Meadows
20c2a4470e
merge 'findByID' into 'workload-001'
2018-02-13 11:47:02 -08:00
Elisa Lupin-Jimenez
a61021f46c
Merge pull request #12272 from elisa-lj11/2d-images
...
2d images (JPG and PNG) are now supported as (quasi) entities
2018-02-13 11:44:02 -08:00
Andrew Meadows
38bc312004
faster and const EntityTree::findByID()
2018-02-13 11:25:34 -08:00
Zach Fox
0809210dc3
No permission card
2018-02-13 11:16:48 -08:00
Dante Ruiz
809a0e4c2c
Merge branch 'master' of github.com:highfidelity/hifi
2018-02-13 11:08:14 -08:00
Dante Ruiz
cf3d8e4463
remove cached file
2018-02-13 11:07:15 -08:00
John Conklin II
915870018a
Merge pull request #12359 from misslivirose/fix/collapse-headers
...
Fix collapse headers in edit.js
2018-02-13 10:34:30 -08:00
