NissimHadar
|
d91bca54f0
|
Merge branch '20816-installOnAndroid' of github.com:NissimHadar/hifi into 20816-installOnAndroid
|
2019-01-25 23:22:15 -08:00 |
|
NissimHadar
|
8223e046c8
|
Eliminate silly gcc warnings.
|
2019-01-25 21:41:00 -08:00 |
|
NissimHadar
|
e9ffa05b4b
|
Eliminate silly gcc warnings.
|
2019-01-25 20:27:23 -08:00 |
|
NissimHadar
|
7a957d829c
|
Missing files.
|
2019-01-25 19:36:06 -08:00 |
|
NissimHadar
|
8871621372
|
Removed duplicated folder.
|
2019-01-25 18:26:29 -08:00 |
|
NissimHadar
|
a2bae0b329
|
Fixing merge issues.
|
2019-01-25 18:15:26 -08:00 |
|
NissimHadar
|
79f096fb7e
|
Merge branch 'master' of github.com:highfidelity/hifi into 20816-installOnAndroid
|
2019-01-25 18:02:59 -08:00 |
|
Shannon Romano
|
1584311689
|
Merge pull request #14745 from sabrina-shanman/material-inspector
(case 20748) Add material inspector to Luci.js
|
2019-01-25 17:35:07 -08:00 |
|
Shannon Romano
|
a2b2f3f67c
|
Merge pull request #14742 from hyperlogic/bug-fix/user-recenter-model-pref
Settings > Controls > User Recenter Model now saves properly
|
2019-01-25 17:34:33 -08:00 |
|
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 |
|
NissimHadar
|
ce90b62c3e
|
Testing APK installation.
|
2019-01-25 16:48:29 -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 |
|
NissimHadar
|
57d3cec2f9
|
Completed - downloading Installer (APK)
|
2019-01-25 14:34:11 -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 |
|
NissimHadar
|
b95cc149aa
|
Corrected miss-named Pushbutton.
|
2019-01-25 13:00:17 -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 |
|
NissimHadar
|
1c1b34c3aa
|
WIP - downloading Installer (APK)
|
2019-01-25 11:30:43 -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
|
50e7adf32c
|
Can download Build XML in Test on Mobile mode.
|
2019-01-24 17:55:00 -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 |
|
NissimHadar
|
6de5527f20
|
Merge branch 'master' of github.com:highfidelity/hifi into 20550-nitpickInstaller
|
2019-01-24 14:46:29 -08:00 |
|