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
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
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
SamGondelman
2d0c1184e4
only domain zone entities control flying and ghosting
2019-01-30 18:27:17 -08:00
Brad Davis
8a1a55189a
CMake cleanup and modernization
2019-01-30 16:23:14 -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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
raveenajain
3f2aa56187
feedback changes
2019-01-21 13:24:07 -08:00
Simon Walton
c3a8c71f60
Add TabletMenu to list of pages that trigger the QmlCommerce bridge
2019-01-21 12:27:14 -08:00
raveenajain
379f98b26d
just using change
2019-01-18 18:20:28 -08:00
Anthony Thibault
205e375d36
Settings > Controls > User Recenter Model now saves properly
2019-01-18 16:58:26 -08:00
raveenajain
d2e37d0c90
my and other avater changes, if setting toggled can pass through other avatar
2019-01-18 16:50:44 -08:00
Andrew Meadows
9a854291af
supress spurious not important AvatarEntity updates
2019-01-18 15:36:38 -08:00
Adam Smith
da7cd6b2f7
Merge pull request #14691 from SamGondelman/multifrustum
...
Case 20394: Fix multi-frustum view updating
2019-01-18 15:23:58 -08:00
Antonina Savinova
8c4c488676
Merge pull request #14721 from Atlante45/feat/upstream-limitter
...
Limit upstream bandwidth to the Avatar Mixer
2019-01-18 13:32:03 -08:00
Jeff Clinton
09b16d2d7a
Merge pull request #14735 from SamGondelman/snap
...
Case 20724: Fix Snap app settings issue
2019-01-18 13:00:18 -08:00
Shannon Romano
11b8ae6d44
Merge pull request #14710 from sethalves/mouse-grab-with-traits
...
case 15962: case 20481: Mouse grab with traits
2019-01-18 11:56:41 -08:00
luiscuenca
43244193e8
Mesh picking against default pose with transformed ray
2019-01-18 12:46:18 -07:00
SamGondelman
d6f0fbd17b
fix snap app issue
2019-01-18 10:48:20 -08:00
Anthony Thibault
0ab13f1e48
Merge pull request #14705 from luiscuenca/changeCollisionDesignOnAvatarApp
...
Change Avatar App design for avatar collisions
2019-01-17 16:06:17 -08:00
Shannon Romano
c764f5182f
Merge pull request #14717 from roxanneskelly/Case20277
...
Case20277 - Ignoring user causes loading orb to appear at /0,0,0
2019-01-17 15:36:31 -08:00
Wayne Chen
238f020392
remove trailing whitespace
2019-01-17 14:20:47 -08:00
