Ken Cooke
2617febbcd
Replace ad-hoc audio meter with meter calibrated in dBFS
2019-02-07 15:31:13 -08:00
Brad Davis
d3301803d3
Support custom display / input plugin lists and small tweaks
2019-02-07 15:15:26 -08:00
danteruiz
d71fb2a100
moved missed QtWebEngine references to +webengines
2019-02-07 14:57:25 -08:00
Jeff Clinton
54109deab9
Merge pull request #14825 from SamGondelman/fall
...
Case 20829: Always fall when flying is not allowed
2019-02-07 14:39:46 -08:00
SamGondelman
c217f8d80f
remove overlay picks from stats qml
2019-02-07 14:25:07 -08:00
Brad Davis
070fb25b80
Cleaning up differnces from master
2019-02-07 13:33:28 -08:00
Roxanne Skelly
c775a9b23f
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
2019-02-07 13:23:59 -08:00
Roxanne Skelly
d04445c244
Qml Marketplace - remove some quest incompatibilities and disable
...
links for quest
2019-02-07 13:22:49 -08:00
SamGondelman
3addcb630c
Merge remote-tracking branch 'sabrina/hfm_prep_joints' into materialMapping
2019-02-07 11:45:59 -08:00
danteruiz
95d30e5cbf
Merge branch 'master' of github.com:highfidelity/hifi into feature/quest
2019-02-07 10:41:44 -08:00
SamGondelman
e74ff18bef
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
2019-02-07 09:49:27 -08:00
SamGondelman
25ca52d892
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
2019-02-07 09:48:13 -08:00
Cristian Duarte
babb972d89
Merge remote-tracking branch 'hifi/master' into android_handshake
2019-02-07 14:44:22 -03:00
Sam Gateau
632d6e8a73
Merge pull request #14863 from danteruiz/android-apps-directories
...
Case 20877: Support CMake time configuration of QmlFileSelectors
2019-02-07 09:30:49 -08:00
Ken Cooke
ba00f95f72
Expose clipping status to audio scripting interface
2019-02-06 18:23:50 -08:00
SamGondelman
a665664fd5
fix double lasers
2019-02-06 16:13:40 -08:00
SamGondelman
b1e7c3d4fd
allow negative dimensions for planar overlays via HACK, set default texture for line overlays to white pixel
2019-02-06 16:04:40 -08:00
Shannon Romano
6fd480e51d
Merge pull request #14795 from AndrewMeadows/myAvatar-vs-backfacing-triangles-2
...
case 17773: reduce likelihood MyAvatar will get stuck in mesh geometry when flying around
2019-02-06 15:52:31 -08:00
Simon Walton
58d8945aa5
Limit re-sort rate to 2 Hz.
2019-02-06 14:41:27 -08:00
Brad Davis
8b70f1771e
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-02-06 13:16:22 -08:00
Sam Gateau
9ff9117a34
Merge pull request #14811 from jherico/feature/quest_frame_player
...
Case 20884: Quest frame player and Oculus libraries
2019-02-06 13:15:39 -08:00
Shannon Romano
30a6f25b69
Merge pull request #14851 from AndrewMeadows/myAvatar-unmovable-until-floor
...
case 20048: don't allow MyAvatar to move until physics enabled
2019-02-06 11:52:42 -08:00
Simon Walton
a2da59271d
If sorting PAL by loudness re-sort upon loudness updates
2019-02-06 11:38:48 -08:00
danteruiz
d0fecac0d8
+android -> +android_interface
2019-02-06 11:37:52 -08:00
Shannon Romano
61459d5756
Merge pull request #14775 from roxanneskelly/QmlMarketplace
...
Qml marketplace
2019-02-06 11:20:49 -08:00
Brad Davis
91e18f569b
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-02-06 10:15:36 -08:00
Sam Gondelman
bc11d80a52
fix create selectionBox wireframe
2019-02-05 23:07:57 -08:00
amantley
07a4f49c58
adding the armik nodes into the json
2019-02-05 17:21:39 -08:00
John Conklin II
ec0bdba7fb
Merge pull request #14814 from sethalves/fix-edit-in-releaseGrab
...
case 20919: Fix edit in release grab
2019-02-05 14:48:59 -08:00
Anthony Thibault
569bef50fd
AnimPose operator* optimizations
2019-02-05 14:48:05 -08:00
Jeff Clinton
35608c35de
Merge pull request #14808 from danteruiz/webengine-fileselector
...
Case 20879: Migrate webEngine referencing QML into +webengine folder
2019-02-05 12:57:38 -08:00
Roxanne Skelly
d3bc536b58
Merge branch 'QmlMarketplace' of https://github.com/roxanneskelly/hifi into QmlMarketplace
2019-02-05 11:35:28 -08:00
Andrew Meadows
cbd83f972c
remove unsued variable
2019-02-05 10:17:10 -08:00
Roxanne Skelly
2b40260953
QmlMarketplace - disable HTML for quest
2019-02-05 09:27:12 -08:00
Andrew Meadows
e50892b3d2
MyAvatar is unmovable until physics is enabled
2019-02-05 09:00:48 -08:00
Roxanne Skelly
364a1698fe
QmlMarketplace - Height of Marketplace Item was improperly calcualted with attributions
2019-02-04 17:24:30 -08:00
Jamil Akram
35c0af0bf3
Merge pull request #14818 from wayne-chen/oculusLoginFeature
...
MS20925: Oculus login button not appearing
2019-02-04 17:20:07 -08:00
Roxanne Skelly
db9b44a71a
QmlMarketplace - The QML Text object has sufficient markup to handle
...
all of our needs, so use that instead of webengineview
2019-02-04 15:30:53 -08:00
Roxanne Skelly
78aa1783a0
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
2019-02-04 15:04:55 -08:00
Roxanne Skelly
e23c589de7
QmlMarketplace - fix issue with footer not appearing in marketplaces list
2019-02-04 15:04:18 -08:00
SamGondelman
934abb3d52
fix keyboard focus and image overlays
2019-02-04 13:33:03 -08:00
Roxanne Skelly
1840f874ab
Add Attributions to Qml Marketplace
2019-02-04 13:29:06 -08:00
SamGondelman
31cf623252
fix keyboard focus
2019-02-04 12:44:04 -08:00
luiscuenca
cf8f9fa1b6
Threads created correctly
2019-02-04 11:28:42 -07:00
amantley
34d32eeda8
removed the extra ikoverlay in the avatar-animation.json
2019-02-04 10:17:22 -08:00
SamGondelman
4b406bf41c
fix getEntityObject and tablet highlighting (Overlays.findOverlays)
2019-02-01 16:23:06 -08:00
SamGondelman
391cca787f
fix keyboard textures and text display
2019-02-01 15:33:53 -08:00
Roxanne Skelly
39ad36a4d0
QmlMarketplace - bugfixes and Markup rendering of descriptions
...
* Render markup in descriptions (bold, italic, quote, etc.)
* Back button from marketplaces list now works properly
* Layout fixes
2019-02-01 15:27:17 -08:00
SamGondelman
ba8320f561
fix 2d overlay deletion
2019-02-01 14:31:26 -08:00
SamGondelman
b80d2a9b06
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
2019-02-01 13:33:04 -08:00
SamGondelman
50bfe84aa7
fix keyboard intersection, laser alpha
2019-02-01 12:11:00 -08:00
Dante Ruiz
f4118213b1
give tablet root color
2019-02-01 10:12:04 -08:00
SamGondelman
0955512a80
add billboard mode to web entities and fix picking/culling
2019-01-31 15:45:10 -08:00
amantley
61b019d176
added new constructor for cubichermitespline that takes quat and vec3. this means we don't need computeSplineFromTipAndBase to be declared in multiple files
2019-01-31 14:13:51 -08:00
Gabriel Calero
a1d18feb0a
Set message dialog text width so wrap mode takes effect
2019-01-31 16:30:02 -03:00
Dante Ruiz
778ddad9ac
to the spot on first launch
2019-01-31 10:52:48 -08:00
amantley
ffd374e7d4
whitespace
2019-01-31 10:05:08 -08:00
amantley
f68ee4e7ce
merged with master
2019-01-31 09:56:46 -08:00
SamGondelman
2d0c1184e4
only domain zone entities control flying and ghosting
2019-01-30 18:27:17 -08:00
amantley
d547d5b854
changed the json reader to take an array not a string for the flex targets
2019-01-30 18:16:02 -08:00
Brad Davis
8a1a55189a
CMake cleanup and modernization
2019-01-30 16:23:14 -08:00
amantley
7a1c1252ff
cleanup
2019-01-30 16:09:10 -08:00
SamGondelman
6cbc0fad7f
fixes
2019-01-30 15:58:15 -08:00
Wayne Chen
03789e01da
adding fix for oculus store argument check
2019-01-30 15:53:21 -08:00
Seth Alves
30d9fe705e
avoid possible crash
2019-01-30 14:56:50 -08:00
Seth Alves
c6f44234f8
avoid possible crash
2019-01-30 14:56:02 -08:00
amantley
2e1a4545c6
cache the spine2 spline default offset and ratio
2019-01-30 14:47:03 -08:00
Seth Alves
3ab2db96b6
deactivate grab action when grab is released
2019-01-30 14:43:11 -08:00
Seth Alves
0846eb8ec6
attempt to allow position edits in releaseGrab entity-method
2019-01-30 14:43:11 -08:00
Dante Ruiz
93a91cdba2
webengine fileselector
2019-01-30 13:57:49 -08:00
SamGondelman
0e35458f9e
use precisionPicking in RayPick::getAvatarIntersection
2019-01-30 13:27:47 -08:00
SamGondelman
e32a3ba20d
organize new avatar intersection
2019-01-30 13:19:45 -08:00
Gabriel Calero
6a665835e7
Merge remote-tracking branch 'upstream/master' into android_handshake
2019-01-30 17:06:41 -03:00
amer cerkic
708da45ccc
recreated changes due to CLA issue in previous pr. Adding args to intent so that app can parse as comamnd line args.
2019-01-30 11:47:06 -08:00
SamGondelman
834e44dd3a
make polyline's with faceCamera not depend on normal
2019-01-30 11:02:24 -08:00
Brad Davis
10a7403d44
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-01-30 10:19:46 -08:00
Jeff Clinton
0def57f2c8
Merge pull request #14805 from danteruiz/fix-qml-rendering
...
Case 20902: Give SendAsset.qml a background color
2019-01-30 08:54:03 -08:00
amantley
fb0ad7768c
removed clear map
2019-01-29 17:31:20 -08:00
amantley
e2a729b68b
got the spline working in myskeleton model, need to clean up
2019-01-29 17:25:25 -08:00
Dante Ruiz
ccf02d8b65
fix SendAssets.qml
2019-01-29 17:16:27 -08:00
Roxanne Skelly
0fdbca8ade
QmlMarketplace Bugfixes
...
* Fix upgrades
* Certificate 'View in Marketplace' wasn't working
* command-line hifiapp:MARKET wasn't launching
* Home link wasn't disappearing where it should
* Log In button on marketplace wasn't working
* Other minor UI bugfixes
2019-01-29 16:07:27 -08:00
Shannon Romano
4c4a2036c7
Merge pull request #14791 from SimonWalton-HiFi/pal_username_update
...
Don't update PAL namecard with empty strings
2019-01-29 15:41:31 -08:00
Brad Davis
efff296398
Master merge cleanup
2019-01-29 14:45:05 -08:00
Brad Davis
0d34030135
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-01-29 14:13:11 -08:00
Shannon Romano
72d3eb9d33
Merge pull request #14797 from kencooke/audio-injector-stereo-distattn-bugfix2
...
case 20805: RC78.1 to master: Fix the distance attenuation of stereo local injectors
2019-01-29 13:12:51 -08:00
Simon Walton
e45634d4ea
Merge remote-tracking branch 'upstream/master' into pal_username_update
2019-01-29 11:55:39 -08:00
sabrina-shanman
203e8e2455
Realize joint properties isFree and freeLineage are unused, so tear them out
2019-01-29 11:55:35 -08:00
Ken Cooke
fa08e42da6
Restore legacy attenuation behavior for system sounds and scripts that do not set position.
...
JS detects when "position" was not set by the script.
C++ explicitly sets .positionSet=false when not set (for system sounds).
Local rendering uses a direct mix (no attenuation/HRTF) when not set.
2019-01-29 11:21:02 -08:00
Andrew Meadows
fb5ef95a5b
disable bf triangle collisions for flying MyAvatar
2019-01-29 11:00:18 -08:00
Jeff Clinton
536a76a791
Merge pull request #14787 from wayne-chen/oculusLoginFeature
...
MS20874: Only initialize plugin if started through Oculus Store
2019-01-29 10:57:03 -08:00
Jeff Clinton
654712cfad
Merge pull request #14757 from gcalero/display_name_and_avatar
...
Choose avatar and set display name
2019-01-29 10:45:11 -08:00
Angus Antley
3994311583
starting the move of the initial head base spline to myskeletonmodel
2019-01-29 08:54:35 -08:00
SamGondelman
9aae9d13f6
fix tablet home button
2019-01-28 22:19:31 -08:00
SamGondelman
a8dbe5e761
working on build errors
2019-01-28 21:10:24 -08:00
SamGondelman
6ad0b3412a
showKeyboardFocusHighlight + fixes
2019-01-28 20:43:47 -08:00
SamGondelman
7b88efa42c
trying to fix web surfaces??
2019-01-28 18:29:09 -08:00
SamGondelman
0d1e4bed66
merge with master
2019-01-28 18:13:05 -08:00
amantley
1919cc3b1a
disable mid joint when not valid. more work on this tomorrow
2019-01-28 17:49:46 -08:00
Simon Walton
d2af7eed3d
Don't update PAL namecard with empty strings
2019-01-28 17:44:04 -08:00
luiscuenca
a6dce5dd84
Merge branch 'master' into multiSphereAvatar04
2019-01-28 17:48:22 -07:00
luiscuenca
fced9e2814
Review fixes
2019-01-28 17:43:51 -07:00
Shannon Romano
607ce00713
Merge pull request #14766 from AndrewMeadows/grab-it
...
case 20701: fixes for grab
2019-01-28 15:57:36 -08:00
Brad Davis
f1d3fc36e5
Cleaning up pre-master merge
2019-01-28 15:52:36 -08:00
Brad Davis
b1e4e17f47
Santa Cruz
2019-01-28 15:52:36 -08:00
Shannon Romano
d8f781deae
Merge pull request #14719 from jherico/feature/quest_frame_serialization
...
case 20883: GPU frame serialization and related tools
2019-01-28 15:47:55 -08:00
SamGondelman
445608e163
fix entity selection tool
2019-01-28 15:30:19 -08:00
Roxanne Skelly
2fe78383ed
QmlMarketplace - Fix issues found during test
...
* command line --url hifiapp:MARKET was not bringing up correct
marketplace
* Search field was not being cleared when 'home' button was clicked
after a search
* tablet button was not lit when marketplace was launched
2019-01-28 15:14:49 -08:00
Wayne Chen
0f1aebea82
adding init/shutdown for plugin init
2019-01-28 14:35:41 -08:00
SamGondelman
2db45b3ec9
dante's keyboard changes + getProperty + some fixes
2019-01-28 14:03:43 -08:00
luiscuenca
1b75f569b3
fix jsdoc
2019-01-28 15:02:10 -07:00
amantley
ffd3a24bf2
further cleaning, broke the arms
2019-01-28 13:53:30 -08:00
Gabriel Calero
1d1ae90e8e
Merge remote-tracking branch 'upstream/master' into display_name_and_avatar
2019-01-28 17:39:59 -03:00
luiscuenca
2a1f1a4855
Remove debug logging
2019-01-28 12:55:36 -07:00
amantley
f8bfef6dbd
cleaning up the _hipsIndex references, cleaning in general
2019-01-28 11:50:23 -08:00
Roxanne Skelly
d3cffa50d6
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
2019-01-28 11:11:28 -08:00
Roxanne Skelly
8357f1f9b5
CR fixes
2019-01-28 11:10:35 -08:00
luiscuenca
cc73649ef8
Merge branch 'master' into multiSphereAvatar04
2019-01-28 11:57:04 -07:00
luiscuenca
49659f0039
Fix error on exit and jointsToFilter param removed
2019-01-28 11:55:53 -07:00
SamGondelman
e2bdac1bdd
working on polylines
2019-01-28 10:52:30 -08:00
Jeff Clinton
f9b63b975d
Merge pull request #14781 from danteruiz/script-print-log
...
Case: 20770 allow debug prints in the log by default
2019-01-28 10:49:18 -08:00
Jamil Akram
bcaad3092b
Merge pull request #14695 from amantley/trumpFix
...
Fixed Sinking Trump Avatar Bug: Stops unnecessary vertical re-centering with big-headed avatar
2019-01-28 10:12:55 -08:00
Seth Alves
15aa574afd
Merge pull request #14774 from danteruiz/window-ontop
...
case 20705: Allow log window to stay on top
2019-01-28 10:05:48 -08:00
Angus Antley
2679a3a30d
changed the naming of the middle joint from secondary target to midJoint, also generalized the handling of the neck head rotation after the middle spline is updated
2019-01-27 16:30:13 -08:00
SamGondelman
70b1e17a8c
more wip
2019-01-27 00:05:25 -08:00
SamGondelman
0dd729232b
simplify keyboard focus highlight
2019-01-26 22:49:12 -08:00
SamGondelman
8f0bd2449b
pointerevents are working!
2019-01-26 21:53:46 -08:00
SamGondelman
abd7d6bddf
some stuff is working!
2019-01-26 01:39:13 -08:00
SamGondelman
bb5c556657
working on conversion
2019-01-25 19:15:53 -08:00
amantley
0b6d0b4baf
renamed json to reflect spline node
2019-01-25 18:17:15 -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
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
amantley
f2a7f37950
got rid of the lag in the spline code by setting the flex coeffs to 1.0
2019-01-25 17:11:07 -08:00
Roxanne Skelly
dfac0d88a2
QmlMarketplace - Add 'logged out' behavior, fix issue with search scope
...
display
2019-01-25 16:41:13 -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
amantley
91fddf783f
increased the threshold to stop vertical recentering
2019-01-25 16:09:45 -08:00
SamGondelman
becc9f4f8d
DELETE IT ALL
2019-01-25 16:06:59 -08:00
Howard Stearns
2070e9a173
Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory
2019-01-25 15:40:04 -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
amantley
bcbd9323c0
Merge remote-tracking branch 'upstream/master' into animSplineIK
2019-01-25 14:42:24 -08:00
amantley
446d7b9514
added the flex coeff for the primary and secondary spline targets to the json
2019-01-25 14:41:18 -08:00
Howard Stearns
49a3a13d57
use space a bit better
2019-01-25 14:13:58 -08:00
Howard Stearns
52a43ca4cd
support artist's stocking to inventory
2019-01-25 14:09:00 -08:00
Roxanne Skelly
49e6120e73
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
2019-01-25 14:06:44 -08:00
SamGondelman
a2083d949e
IT'S BUILDING (but still wip)
2019-01-25 14:04:52 -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
Roxanne Skelly
6123c4ec96
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
2019-01-25 13:45:04 -08:00
Roxanne Skelly
ff2d51701e
QML Marketplace
...
Add keyboard while in search
General cleanup
2019-01-25 13:41:16 -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
SamGondelman
5ce8f566cc
more overlay wip
2019-01-25 11:10:11 -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
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
amantley
2574e82184
cleaned up print statements
2019-01-24 19:47:27 -08:00
Dante Ruiz
2c22fb82b1
keep log window on top option
2019-01-24 18:16:07 -08:00
Roxanne Skelly
cfaf01b22a
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
2019-01-24 17:21:16 -08:00
Roxanne Skelly
c1ff51a02d
QML Marketplace
...
Checkpoint full functionality
2019-01-24 17:20:42 -08:00
amantley
37f92d2319
added code to read tip and base var info from the json
2019-01-24 17:02:30 -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
ca8d64bc05
removing overlays wip
2019-01-24 14:59:45 -08:00
Andrew Meadows
09fe9735fa
plug grab leak, more correct names
2019-01-24 14:57:54 -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
SamGondelman
0bfcde67ea
remove overlays from application.cpp
2019-01-24 14:11:24 -08:00
Andrew Meadows
160bef8f23
cleanup and minor optimizations
2019-01-23 23:18:52 -08:00
SamGondelman
a75fe4b48b
cloneOverlay, deleteOverlay, findOverlays
2019-01-23 18:54:39 -08:00
SamGondelman
217ff2b1b2
keyboardFocusOverlay
2019-01-23 18:33:35 -08:00
SamGondelman
5d19666f60
merge with master
2019-01-23 17:58:56 -08:00
SamGondelman
9a734b2011
merge with master
2019-01-23 17:48:24 -08:00
amantley
cdd03646c2
latest spline code with ik node removed started cleanup
2019-01-23 17:22:13 -08:00
luiscuenca
7a0f3ea7ef
Fix error
2019-01-23 18:04:13 -07:00
luiscuenca
a947c894c2
Suggested changes
2019-01-23 17:23:36 -07:00
Anthony Thibault
a7a71e4286
Merge branch 'master' into feature/hmd-avatar-alignment-type
2019-01-23 15:52:20 -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
Wayne Chen
049282e2b3
fixing text alignment issues, adding some oculus user log
2019-01-23 14:38:06 -08:00
Brad Davis
e18e3fc138
Gpu Frame serialization
2019-01-23 13:21:34 -08:00
Jeff Clinton
b9f9766b01
Merge pull request #14747 from SimonWalton-HiFi/wallet-in-hmd
...
Fix security-image display in HMD
2019-01-23 13:18:45 -08:00
Wayne Chen
e6426cb680
fixing bug with cancel button
2019-01-23 10:26:51 -08:00
Simon Walton
77293150b7
Const declarations to enforce singleton capability
2019-01-22 18:05:47 -08:00
Simon Walton
3a5d550fa5
Treat QmlCommerce as a singleton class
2019-01-22 17:13:36 -08:00
Clement
61be5a3cc4
Enable "Add To World" Asset Browser button for glTF
2019-01-22 17:01:06 -08:00
Jeff Clinton
3776472550
Merge pull request #14731 from AndrewMeadows/fix-mexico-hats
...
cases 20709 and 20715: wear and see mexico hats
2019-01-22 12:58:56 -08:00
amantley
dbd03e2eb4
got the spline arms and legs working without any inverse kinematic node in the json, using _withIKnode.json
2019-01-22 11:53:18 -08:00
Gabriel Calero
f67d98f296
Merge remote-tracking branch 'upstream/master' into display_name_and_avatar
2019-01-22 14:17:52 -03:00
Gabriel Calero
6c431996c7
Allow to set a display name and choose an avatar
2019-01-22 12:21:06 -03:00
amantley
8d88c627b0
nearly have the arms legs and back working with out the ik node
2019-01-21 17:41:08 -08:00
raveenajain
2393db5e12
collision logic
2019-01-21 16:24:32 -08:00
Roxanne Skelly
8010d86210
QML Marketplace support
...
Support QML UI for the Marketplace as some devices do not handle
web on 3d surfaces.
Checkpoint code
2019-01-21 13:39:16 -08:00