Shannon Romano
b9b21b7f87
Merge pull request #14712 from AndrewMeadows/shaped-zones-2
...
case 20597: fix zones using FBX models with non-trivial mesh.modelTransform
2019-01-25 17:33:45 -08:00
Shannon Romano
f084021fdf
Merge pull request #14678 from hyperlogic/feature/hmd-avatar-alignment-type
...
Added HMD Avatar Alignment Type
2019-01-25 17:32:41 -08:00
Shannon Romano
fe874ca5b1
Merge pull request #14511 from danteruiz/spinbox-fixes
...
case 20100: fix SpinBox.qml in ControlsUit and adjusting OpenVrConfiguration SpinBoxes
2019-01-25 17:30:16 -08:00
Shannon Romano
fc12975231
Merge pull request #14780 from davidkelly/dk/20362
...
Transmit octree string parameters as utf-8 strings
2019-01-25 17:29:02 -08:00
Shannon Romano
9c582f2870
Merge pull request #14684 from NissimHadar/20550-nitpickInstaller
...
Case 20550 - nitpick installer
2019-01-25 16:42:55 -08:00
Adam Smith
e648ce38c0
Merge pull request #14679 from sabrina-shanman/bug_uv-scale
...
(case 20096) Fix missing support for UV scaling parameters in FBX files
2019-01-25 16:21:15 -08:00
Jeff Clinton
f78fdffeda
Merge pull request #14727 from wayne-chen/oculusLoginFeature
...
MS20311: Oculus login feature
2019-01-25 16:16:32 -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
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
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
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
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
David Kelly
05d56a5fe9
Transmit octree string parameters as utf-8 strings
2019-01-25 08:43:56 -07: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
NissimHadar
6de5527f20
Merge branch 'master' of github.com:highfidelity/hifi into 20550-nitpickInstaller
2019-01-24 14:46:29 -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
NissimHadar
f949b9d5b4
Initial tab set (back) to 0.
2019-01-24 12:16:12 -08:00
NissimHadar
817d132604
renamed ...Button... to ...pushButton... for consistency.
2019-01-24 12:13:35 -08:00
NissimHadar
64843b5ed2
Added "Download APK" push-button.
2019-01-24 12:01:00 -08:00
NissimHadar
e87d5abbd7
Merge branch 'master' of github.com:highfidelity/hifi into 20778-pullFolderFromAndroid
2019-01-24 08:55:30 -08:00
Simon Walton
cc6caa61a7
Change common warning to debug
2019-01-23 21:02:52 -08:00
SamGondelman
9a734b2011
merge with master
2019-01-23 17:48:24 -08:00
Simon Walton
74748b15fd
Add a filter functor to the plugin manager and use it in AudioMixer
2019-01-23 17:28:18 -08:00
Anthony Thibault
96f55d2571
Merge branch 'feature/hmd-avatar-alignment-type' of github.com:hyperlogic/hifi into feature/hmd-avatar-alignment-type
2019-01-23 15:53:28 -08:00
Anthony Thibault
a7a71e4286
Merge branch 'master' into feature/hmd-avatar-alignment-type
2019-01-23 15:52:20 -08:00
Sam Gateau
3ec9290dca
Merge pull request #14619 from SamGondelman/matTarget
...
Case 20240: Better material entity targeting
2019-01-23 15:47:22 -08:00
Jeff Clinton
49fa2dc75d
Merge pull request #14715 from ctrlaltdavid/M20052
...
Case 20052: Fix tablet sometimes not working after domain change
2019-01-23 15:29:20 -08:00
Dante Ruiz
df34d8dcc0
fix spinbox and adjusting OpenVrConfiguration spin boxes
2019-01-23 14:59:37 -08:00
