Andrew Meadows
9246f6c24a
render-perf depdends on workload library
2018-02-20 19:15:54 -08:00
Andrew Meadows
c3d08d06ff
remove cruft
2018-02-20 17:50:12 -08:00
Andrew Meadows
e7495d830b
maintain Space proxies for entities
2018-02-20 17:39:05 -08:00
Andrew Meadows
76d2e9bc78
fix comment
2018-02-20 17:38:01 -08:00
Andrew Meadows
7ed68ced62
Merge master into highfidelity/workload
2018-02-20 12:31:37 -08:00
John Conklin II
6148c407a5
Merge pull request #12422 from misslivirose/fix-overlay-lines
...
Show outline for zones when rotating
2018-02-20 09:30:22 -08:00
John Conklin II
aa67a98d02
Merge pull request #12426 from ElderOrb/FB11508
...
fix for toolbar slowly drifting on switching between HMD/Desktop modes
2018-02-20 09:30:01 -08:00
Sam Gateau
fd49c0d100
Merge pull request #12401 from SamGondelman/decals
...
Material Entities
2018-02-19 10:58:02 -08:00
Brad Hefta-Gaub
0ef2794c35
Merge pull request #12395 from druiz17/fix-qml-tablet-apps
...
Prevent adding the same tablet url to the tabletApps list
2018-02-18 19:10:24 -08:00
Brad Hefta-Gaub
a4783ded15
Merge pull request #12414 from hyperlogic/bug-fix/scramlbed-avaatrs
...
Bug fix for Scrambled Avatars
2018-02-18 19:06:53 -08:00
Brad Hefta-Gaub
d0b0fcba9a
Merge pull request #12436 from cain-kilgore/patch-1
...
Fixed extra " in backup_instructions.html
2018-02-18 19:06:24 -08:00
Cain Kilgore
47ed45b5e9
Fixed extra " in backup_instructions.html
2018-02-17 18:14:44 +00:00
Stephen Birarda
311b9388d6
Merge pull request #12424 from birarda/bug/settings-response-filter
...
fix overwrite of general description object with filtered
2018-02-16 10:57:58 -07:00
John Conklin II
24a3eb6e80
Merge pull request #12419 from druiz17/fix-edit-avatar-entities
...
Don't update avatar entities of the avatars ID is AVATAR_SELF_ID
2018-02-16 09:48:19 -08:00
Alexander Ivash
2eb8ebcdbc
FB11508 - toolbar slowly sides downward
2018-02-16 20:22:16 +03:00
MiladNazeri
331b253ba0
Merge pull request #12386 from cain-kilgore/21668
...
WL 21668 - Make sure all Prompts are correctly emitting a signal on cancel and that cancellations return null
2018-02-16 06:57:03 -08:00
Stephen Birarda
81662b5edc
don't overwrite general description object with filtered one
2018-02-15 19:14:14 -08:00
Andrew Meadows
6d347cf44f
revert deadlock, remove Space stubbery in EntityTree
2018-02-15 17:40:15 -08:00
SamGondelman
2d0b85af72
workaround bug
2018-02-15 17:28:59 -08:00
Liv Erickson
175532c444
show outline for zones when rotating
2018-02-15 15:51:54 -08:00
Sam Gateau
f809862870
Merge pull request #12412 from samcake/blue
...
Introduce task abort feature for early exit of task branch
2018-02-15 15:50:43 -08:00
SamGondelman
b189433855
merge
2018-02-15 15:50:36 -08:00
SamGondelman
2d754edf74
CR
2018-02-15 15:48:41 -08:00
Dante Ruiz
a194c8bc03
Merge branch 'master' of github.com:highfidelity/hifi into fix-qml-tablet-apps
2018-02-15 15:46:16 -08:00
Dante Ruiz
bbcf865db3
Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-avatar-entities
2018-02-15 15:03:12 -08:00
Dante Ruiz
e4db09fef8
don't update avatar entities if the avatars ID is AVATAR_SELF_ID
2018-02-15 15:02:45 -08:00
Andrew Meadows
91f0134632
remove linux crash-on-login workaround hackery
2018-02-15 13:10:26 -08:00
Andrew Meadows
f35469c0de
give EntityTree a workload/Space instance
2018-02-15 12:57:58 -08:00
Andrew Meadows
1247f88d83
merge 'master' into 'workload'
2018-02-15 12:21:05 -08:00
samcake
c70b655fbc
A bit more explanations to the Task Flow class
2018-02-15 11:55:16 -08:00
Anthony J. Thibault
f07b1fa4c5
Revert "FBX node IDs aren't alphanumerically ordered per logical structure"
...
This reverts commit a7ec4501e6http://doc.qt.io/qt-5/qset.html
This was bug was causing scrambled avatars, because both the transmitter and receiver of the AvatarData packets
make the strong assumption that the joint orders are same. When they are not the avatar's appear scrambled.
2018-02-15 11:32:29 -08:00
samcake
0228392ac9
Merge branch 'blue' of https://github.com/samcake/hifi into blue
2018-02-15 11:24:49 -08:00
samcake
b21b98c810
Add a way to early abort a task from a Job, apply that to the highlight effect to shave unecessary work
2018-02-15 11:24:20 -08:00
Zach Fox
3c620282b1
Merge pull request #12393 from zfox23/fixAvailabilityMouseArea
...
PAL: Prevent opening of Availability from WebView
2018-02-15 11:10:05 -08:00
Sam Gondelman
36a74eaeee
Merge branch 'master' into decals
2018-02-15 11:02:49 -08:00
Brad Hefta-Gaub
e367af6cd8
Merge pull request #12385 from birarda/bug/cve-update-marked
...
updates to electron-packager and node-notifier for CVEs
2018-02-15 10:49:25 -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
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
Sam Gateau
982e0b3e6c
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2018-02-14 20:37:34 -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
SamGondelman
324eefc914
remove fresnel, add unlit, fix overlays, cleanup
2018-02-14 17:02:07 -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
