amantley
91fddf783f
increased the threshold to stop vertical recentering
2019-01-25 16:09:45 -08:00
Dante Ruiz
db58173977
fix mac issue
2019-01-25 15:10:53 -08:00
amantley
cc4d9e2ae2
Merge remote-tracking branch 'upstream/master' into trumpFix
2019-01-25 15:05:00 -08:00
Clément Brisset
17b8f65d0a
Merge pull request #14773 from Atlante45/fix/corrupted-backups-status
...
Add failed backup as corrupted during creation
2019-01-25 14:46:24 -08:00
SamGondelman
a10f52c66d
merge with master
2019-01-25 14:16:07 -08:00
Jeff Clinton
d92d256cfc
Merge pull request #14656 from SamGondelman/matFallthrough
...
Case 20241: Material entity fallthrough
2019-01-25 14:01:27 -08:00
Adam Smith
f651ad2f67
Merge pull request #14711 from SamGondelman/NOverlays10
...
Case 20585: Add missing Web Overlay functionality to Web Entities
2019-01-25 14:00:52 -08:00
Wayne Chen
1c6521486e
fixing compile errors
2019-01-25 13:56:56 -08:00
Dante Ruiz
4ed54f63ea
allow debug prints in the log by default
2019-01-25 13:56:54 -08:00
luiscuenca
f54f9e5bfd
Merge branch 'master' into multiSphereAvatar04
2019-01-25 13:54:01 -07:00
luiscuenca
df4be641eb
More fixes
2019-01-25 13:42:18 -07:00
Wayne Chen
6f49914167
Merge branch 'oculusLoginFeature' of https://github.com/wayne-chen/hifi into oculusLoginFeature
2019-01-25 12:19:20 -08:00
Wayne Chen
635c7533b9
more code review feedback
2019-01-25 12:15:38 -08:00
Wayne Chen
c136f24181
Merge branch 'master' into oculusLoginFeature
2019-01-25 11:44:14 -08:00
Wayne Chen
0928b1bff1
code review feedback
2019-01-25 11:36:58 -08:00
Shannon Romano
90c7423dfb
Merge pull request #14772 from wayne-chen/loginScreenPreserveRatio
...
MS20825: Login Screen Aspect/Crop with resizing
2019-01-25 11:16:10 -08:00
Brad Davis
81a7fa17bf
PR feedback
2019-01-25 11:14:40 -08:00
Shannon Romano
28edb472fc
Merge pull request #14713 from raveenajain/collideWithOtherAvatars_scale
...
20565 Avatar::_collideWithOtherAvatars does not scale
2019-01-25 11:06:36 -08:00
Gabriel Calero
3a3bd5922a
Bugfix: fragment title remains as Avatar after closing it
2019-01-25 16:01:21 -03:00
Jamil Akram
7e6af92700
Merge pull request #14771 from hyperlogic/bug-fix/avatar-translation-bug
...
Bug fixes for avatarData protocol
2019-01-25 10:52:15 -08:00
Jeff Clinton
efb278b258
Merge pull request #14707 from thoys/fix/create/activeColorPickerDoesNotUpdateOnEntitySwitch
...
fix for continuous color picker update loop
2019-01-25 10:38:14 -08:00
Shannon Romano
fd04996853
Merge pull request #14755 from hyperlogic/bug-fix/joint-mesh-name-collisions
...
Bug fix for avatars that have mesh/joint name duplicates
2019-01-25 09:59:44 -08:00
Shannon Romano
552729abe7
Merge pull request #14759 from Atlante45/feat/gltf
...
Enable "Add To World" Asset Browser button for glTF
2019-01-25 09:56:40 -08:00
Shannon Romano
6baa9d9d8c
Merge pull request #14763 from SimonWalton-HiFi/pluginmanager-filtering
...
Allow filtering on plugin metadata to avoid inappropriate plugins
2019-01-25 09:51:12 -08:00
NissimHadar
70053d3bba
Merge pull request #14664 from NissimHadar/20526-updateReadme
...
Case 20526 - update readme
2019-01-25 09:15:42 -08:00
Andrew Meadows
c9ef439a7f
fix more grab bugs
2019-01-25 08:46:24 -08:00
David Kelly
05d56a5fe9
Transmit octree string parameters as utf-8 strings
2019-01-25 08:43:56 -07:00
Thijs Wenker
e2dc86261e
add missing Material Entity tooltips
2019-01-25 05:16:04 +01:00
Thijs Wenker
992ce9f875
ignore scripted key events from the JSON Editors
2019-01-25 04:41:36 +01:00
Thijs Wenker
85e26e949b
fix issue where empty values are always on bottom on default ascending columns
2019-01-25 04:02:19 +01:00
Thijs Wenker
ae2e85d802
entity list, default column sort orders, when in default order always move empty values to bottom
2019-01-25 03:22:27 +01:00
Dante Ruiz
2c22fb82b1
keep log window on top option
2019-01-24 18:16:07 -08:00
NissimHadar
e77e2b9583
Merge mess...
2019-01-24 16:35:13 -08:00
NissimHadar
e39012de6e
Merge mess...
2019-01-24 16:32:30 -08:00
NissimHadar
c2ee8f7795
Merge mess...
2019-01-24 16:30:21 -08:00
NissimHadar
684172bf6b
Merge branch 'master' of github.com:highfidelity/hifi into 20550-nitpickInstaller
2019-01-24 16:23:08 -08:00
Shannon Romano
66d5b16a5d
Merge pull request #14744 from dback2/shapeTypeFix
...
Shape type and compound shape property fixes
2019-01-24 16:18:34 -08:00
NissimHadar
61a3bb667d
Fixed gcc warnings.
2019-01-24 16:16:24 -08:00
Clement
95714b7eb3
Add failed backup as corrupted during creation
2019-01-24 16:11:38 -08:00
Wayne Chen
4880c7081e
adding blurred images
2019-01-24 16:00:24 -08:00
Wayne Chen
5c55761e4d
adding fill mode for aspect/crop
2019-01-24 15:57:04 -08:00
Wayne Chen
9da7465698
readding render session, adding newlines for oculus failure
2019-01-24 15:33:50 -08:00
SamGondelman
24b62ca87c
Merge remote-tracking branch 'upstream/master' into NOverlays10
2019-01-24 15:00:37 -08:00
Andrew Meadows
09fe9735fa
plug grab leak, more correct names
2019-01-24 14:57:54 -08:00
NissimHadar
6de5527f20
Merge branch 'master' of github.com:highfidelity/hifi into 20550-nitpickInstaller
2019-01-24 14:46:29 -08:00
sabrina-shanman
5993aab174
Fix linker error and build warnings
2019-01-24 14:43:43 -08:00
Andrew Meadows
ee3fde9df1
unravel spaghetti, prefer std over Qt containers
2019-01-24 14:39:00 -08:00
Adam Smith
dadd49f535
Merge pull request #14667 from SamGondelman/NOverlays9
...
Case 20535: renderLayer, primitiveMode, groupCulled Entity properties
2019-01-24 14:36:27 -08:00
Anthony Thibault
77fb20801f
Bug fixes for avatarData protocol
...
Two issues were recently discovered after they were introduced by PR #14733
1) The Avatar Mixer would sometimes have incorrect translation scale when splitting BulkAvatarData across multiple MTUs
2) Old avatar recordings would no longer work properly.
This PR should fix both of these issues.
2019-01-24 14:24:11 -08:00
Gabriel Calero
4a345a5559
Change default avatar name to Wooden Mannequin
2019-01-24 18:53:15 -03:00
