MuteTab
|
52e5bdb360
|
Added _aboutToQuit guard on eventFilter()
|
2018-07-23 14:27:38 -07:00 |
|
Clément Brisset
|
a375ea8bd6
|
Merge pull request #13634 from SimonWalton-HiFi/systray-go-home
Windows System-tray wording change
|
2018-07-23 13:28:52 -07:00 |
|
Howard Stearns
|
49d9d61425
|
Merge pull request #13305 from howard-stearns/personal-space-bubble-off-for-new-users
Personal space bubble is defaulted off for now for new users
|
2018-07-23 12:29:00 -07:00 |
|
Clément Brisset
|
071a11ce93
|
Merge pull request #13580 from SimonWalton-HiFi/avatar-settings-validate
Validate user-supplied avatar height range before accepting
|
2018-07-23 11:39:24 -07:00 |
|
Ryan Huffman
|
d1da7675f6
|
Merge pull request #13648 from huffman/fix/create-xz-lines
Fix xz guides not showing when translating with Shift
|
2018-07-23 10:44:47 -07:00 |
|
Seth Alves
|
ae83c33621
|
Merge pull request #13646 from sethalves/put-back-old-style-attachment-dialog-master
put back old-style avatar-attachments menu-item
|
2018-07-23 10:25:23 -07:00 |
|
Seth Alves
|
4f45fbc5f5
|
Merge pull request #13661 from danteruiz/avatarapp-undefined-data
fix avatar app from crashing when avatar entity variable is undefined.
|
2018-07-23 10:18:31 -07:00 |
|
Seth Alves
|
a6a4dd3b8e
|
Merge pull request #13570 from danteruiz/fix-tablet-material-entities
clean up tablet material entities and don't display them in create menu
|
2018-07-23 09:50:23 -07:00 |
|
danteruiz
|
9bf6cff5cd
|
fix indent isssues
|
2018-07-20 12:27:51 -07:00 |
|
Qliemillar
|
db8846796f
|
Merge pull request #13614 from Cristo86/android_loading_stuck
Android - App freezes on opening randomly - Fix
|
2018-07-20 13:20:24 -06:00 |
|
Ryan Huffman
|
ae26c5fe9a
|
Remove extraneous logging
|
2018-07-20 11:38:02 -07:00 |
|
Ryan Huffman
|
32122a7c1f
|
Replace magic numbers with RAIL_AXIS_LENGTH
|
2018-07-20 11:37:42 -07:00 |
|
danteruiz
|
ce3922a3c1
|
fix avatarEntities undefined crash
|
2018-07-20 11:23:02 -07:00 |
|
Cristian Luis Duarte
|
2dd09c140a
|
Android - Show a loading indicator while loading domains (same that appears when refreshing with a swipe-down gesture)
|
2018-07-19 23:20:51 -03:00 |
|
Cristian Luis Duarte
|
9bb4bada8a
|
Merge remote-tracking branch 'hifi/master' into android_loading_stuck
|
2018-07-19 21:45:03 -03:00 |
|
Cristian Luis Duarte
|
021905be9b
|
remove unneeded import
|
2018-07-19 21:27:10 -03:00 |
|
Cristian Luis Duarte
|
eb5cc00fff
|
newlines
|
2018-07-19 21:24:29 -03:00 |
|
Cristian Luis Duarte
|
c5ffdbfe0a
|
Android - add a faster to load splash screen (LaunchScreen in Android terminology) and a progress indicator in our loading screen (SplashActivity), to reduce the 'frozen' nature of the app startup
|
2018-07-19 21:19:18 -03:00 |
|
Cristian Luis Duarte
|
6d239f40fb
|
Android - Freeze at startup problem - remove logs
|
2018-07-19 20:47:05 -03:00 |
|
Cristian Luis Duarte
|
19146ef73c
|
Android - avoid the QtNative.m_qtThread.exit(); call
|
2018-07-19 20:31:32 -03:00 |
|
Qliemillar
|
e779e42d90
|
Merge pull request #13635 from NissimHadar/bug16645
Fix for bug16645 "disturbing flash when adding an overlay (even when everything is cached)"
|
2018-07-19 14:43:04 -06:00 |
|
Sam Gondelman
|
74a49dc14f
|
Merge pull request #13638 from jherico/fix/fb16762
Fix for audio continuing on destroyed Web 3D overlays
|
2018-07-19 13:33:18 -07:00 |
|
Ryan Huffman
|
25b558e6b4
|
Fix xz guides not showing when translating with Shift
|
2018-07-19 12:56:18 -07:00 |
|
Brad Davis
|
63fa54ceda
|
Fix for audio continuing on destroyed Web 3D overlays
|
2018-07-19 11:50:18 -07:00 |
|
Qliemillar
|
2163bf1ef0
|
Merge pull request #13628 from r3tk0n/16726-Vive-Blackboxes
16726 - Remove Black Boxes ( HMD.requestShowHandControllers() )
|
2018-07-19 12:34:38 -06:00 |
|
Seth Alves
|
965c35292c
|
put back old-style avatar-attachments menu-item
|
2018-07-19 11:32:19 -07:00 |
|
Qliemillar
|
566c837bba
|
Merge pull request #13631 from ElderOrb/avatarapp-combobox-fix
fix 'the drop down does not shows the wearable'
|
2018-07-19 12:23:48 -06:00 |
|
Howard Stearns
|
2378cdfdc6
|
Merge pull request #13624 from howard-stearns/app-refactor4-merge
appUi module, and use in People app
|
2018-07-19 11:07:54 -07:00 |
|
Qliemillar
|
3466d944fb
|
Merge pull request #13630 from huffman/fix/create-undo-while-disabled-visual
Disable showing the entity edit tools when undoing while disabled
|
2018-07-19 09:03:40 -06:00 |
|
NissimHadar
|
4c0b7ca24c
|
Updated per Samuel's/Austin's comments.
|
2018-07-18 17:30:46 -07:00 |
|
Stephen Birarda
|
6257d5618a
|
Merge pull request #13640 from birarda/bug/404-bad-agent-requests-master
404 malformed agent script requests
|
2018-07-18 16:41:14 -07:00 |
|
Wayne Chen
|
37131d75e9
|
Merge pull request #13629 from wayne-chen/loginDialogBrowser-case-16537
MS16537: Updating "Forgot Username/Forgot Password" behavior
|
2018-07-18 16:32:55 -07:00 |
|
Howard Stearns
|
084a4338ff
|
Merge pull request #13633 from howard-stearns/pre-fectch-infinite-scroll-items
pre-fetch infinite scroll pages before reaching the end
|
2018-07-18 16:18:19 -07:00 |
|
Stephen Birarda
|
499aa4ad13
|
404 malformed agent script requests, check doc root
|
2018-07-18 15:22:45 -07:00 |
|
NissimHadar
|
a882931c6b
|
Only show overlay if textures have loaded
|
2018-07-18 15:02:02 -07:00 |
|
howard-stearns
|
a904182cc2
|
cr feedback
|
2018-07-18 14:03:26 -07:00 |
|
NissimHadar
|
99b95acada
|
Merge branch 'master' of github.com:highfidelity/hifi into bug16645
|
2018-07-18 13:56:12 -07:00 |
|
NissimHadar
|
446ef97fc5
|
Only show overlay if textures have loaded
|
2018-07-18 13:54:03 -07:00 |
|
Thijs Wenker
|
b29044fd7e
|
Merge pull request #13618 from dback2/clickHandleSwitchEntityFix
Fix quickly clicking an edit handle causing selected entity change
|
2018-07-18 22:49:11 +02:00 |
|
howard-stearns
|
74914ffb3e
|
Merge branch 'master' of github.com:highfidelity/hifi into app-refactor4-merge
|
2018-07-18 13:16:50 -07:00 |
|
Simon Walton
|
64b18ee5b9
|
Change sys-tray Sandbox menu item from Go Home to Visit Sandbox
|
2018-07-18 13:11:20 -07:00 |
|
howard-stearns
|
0a47672d64
|
machinery for fetching next page of inifinite scroll before it really
needed, and use in our infinite scrolls
|
2018-07-18 13:00:03 -07:00 |
|
Ryan Huffman
|
b015845371
|
Disable showing the entity edit tools when undoing while disabled
|
2018-07-18 11:54:40 -07:00 |
|
Alexander Ivash
|
fe96ad2389
|
fix 'the drop down does not shows the wearable'
|
2018-07-18 21:16:47 +03:00 |
|
Wayne Chen
|
0cbcae9181
|
reverting onLinkActivated brackets
|
2018-07-18 10:44:37 -07:00 |
|
Howard Stearns
|
db212a0c99
|
Merge pull request #13625 from zfox23/MS16802_openGlyph
Fix MS16802: In Purchases, there shouldn't be a glyph associated with the Open button
|
2018-07-18 10:12:47 -07:00 |
|
r3tk0n
|
a9eb8103f6
|
Clean up comments a bit.
|
2018-07-18 09:52:25 -07:00 |
|
r3tk0n
|
f7b49598b5
|
Disabled tip boxes for Vive controllers, as per experience team request.
|
2018-07-18 09:50:59 -07:00 |
|
Wayne Chen
|
c104e95ef4
|
Merge branch 'master' of https://github.com/highfidelity/hifi into loginDialogBrowser-case-16537
|
2018-07-18 09:06:22 -07:00 |
|
Zach Fox
|
919bfce7ab
|
Simplify
|
2018-07-18 09:00:01 -07:00 |
|