Ryan Huffman
|
0e0966004c
|
Fix edit.js not being able to delete after creating entity
This fix puts focus back on the main window when creating an entity so that the user can use shortcuts like 'f' and 'delete'
|
2018-07-25 14:52:56 -07:00 |
|
John Conklin II
|
21d043d179
|
Merge pull request #13534 from huffman/fix/ess-avatar-entities
Fix crash when editing avatar entities with no myAvatar
|
2018-07-25 14:21:12 -07:00 |
|
John Conklin II
|
89e7e3b938
|
Merge pull request #13682 from zfox23/MS16704_removeWearableAvatar
Fix MS16704: Remove worn Avatar/Wearable before updating
|
2018-07-25 12:12:50 -07:00 |
|
John Conklin II
|
6a491d1ac6
|
Merge pull request #13690 from danteruiz/fix-audio-hmd-issue
Fix audio page being set to desktop when starting in HMD.
|
2018-07-25 10:53:29 -07:00 |
|
Dante Ruiz
|
a21a475784
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-hmd-issue
|
2018-07-25 08:44:28 -07:00 |
|
Dante Ruiz
|
8da1db31df
|
fix audio page being in desktop when your in HMD
|
2018-07-25 08:44:11 -07:00 |
|
John Conklin II
|
1a732f9c8f
|
Merge pull request #13684 from ElderOrb/FB17036
FB17036 Avatar App causes error on cache reload (CTRL+R)
|
2018-07-25 08:03:02 -07:00 |
|
Stephen Birarda
|
0cd5a24233
|
Merge pull request #13677 from birarda/bug/no-socket-error-string
remove thread-unsafe socket errorString call
|
2018-07-24 16:16:25 -07:00 |
|
Alexander Ivash
|
6db46e84ff
|
FB17036 Avatar App causes error on cache reload (CTRL+R)
|
2018-07-25 01:11:26 +03:00 |
|
Zach Fox
|
eea4630d2b
|
Fix MS16704: Remove worn Avatar/Wearable before updating
|
2018-07-24 14:29:05 -07:00 |
|
John Conklin II
|
fe5b13b781
|
Merge pull request #13636 from gcalero/android_audio_fixes2
Android audio fixes
|
2018-07-24 13:02:56 -07:00 |
|
Stephen Birarda
|
8224492d72
|
avoid thread-unsafe socket errorString call
|
2018-07-24 12:24:01 -07:00 |
|
John Conklin II
|
99c26e6363
|
Merge pull request #13674 from r3tk0n/16984-CompositorHelper
Added _aboutToQuit guard on eventFilter()
|
2018-07-24 11:37:19 -07:00 |
|
Gabriel Calero
|
f24cfebe88
|
Revert "Add logs to debug. Revert later"
This reverts commit 3c49e7783c.
|
2018-07-24 14:57:48 -03:00 |
|
Thijs Wenker
|
b7d12c6b1c
|
Merge pull request #13656 from huffman/fix/create-selection-box
Fix the Create selection box not always matching outline
|
2018-07-24 19:49:20 +02:00 |
|
John Conklin II
|
2ac9463830
|
Merge pull request #13653 from ElderOrb/fake-wearables-fix
FB16870: Avatar Wearables showing incorrect number
|
2018-07-23 15:55:11 -07:00 |
|
John Conklin II
|
27b35d84cc
|
Merge pull request #13652 from r3tk0n/16206-flying-settings
MS16206 - Enable flight by default in desktop, controls menu changes re: flying
|
2018-07-23 15:19:46 -07:00 |
|
Sam Gondelman
|
f1a2fe2927
|
Merge pull request #13667 from Cristo86/android_crash_back_from_domain_fix
Android - fix crash when returning from a Domain back to Home
|
2018-07-23 14:46:24 -07:00 |
|
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 |
|
Cristian Luis Duarte
|
f06c57a1f4
|
Android - fix crash when returning from domains to Home when attempting to detach when not necessary
|
2018-07-23 15:51:54 -03: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 |
|
Alexander Ivash
|
33c858774b
|
fix coding standard compliance
|
2018-07-23 21:01:43 +03: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 |
|
Gabriel Calero
|
3c49e7783c
|
Add logs to debug. Revert later
|
2018-07-23 14:03:58 -03: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 |
|
r3tk0n
|
bc91affa70
|
Bring this PR inline with RC70.1 PR.
|
2018-07-20 15:13:44 -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 |
|
Alexander Ivash
|
f5717b7648
|
add check for SELF_ID
|
2018-07-20 19:33:16 +03:00 |
|
Alexander Ivash
|
849c91d8f6
|
remove not necessary EntityTreeRenderer from removeAvatarEntities's condition
|
2018-07-20 19:32:58 +03:00 |
|
r3tk0n
|
3108d650de
|
Restore original menu string for flying
Restore the original menu string for flying as it apparently *does* effect jumping.
|
2018-07-20 08:29:11 -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 |
|
Alexander Ivash
|
fb8640de47
|
FB16870: Avatar Wearables showing incorrect number
|
2018-07-20 02:51:17 +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 |
|
Ryan Huffman
|
2305099874
|
Fix the Create selection box not always matching outline
|
2018-07-19 16:09:21 -07:00 |
|
Gabriel Calero
|
00e3de4e0a
|
Revert output sample rate to native rate
|
2018-07-19 19:13:28 -03:00 |
|
Gabriel Calero
|
988acdb3f9
|
Set output sample rate at 24000 (with testing purposes only)
|
2018-07-19 18:53:03 -03:00 |
|
MuteTab
|
dfcf47e8ee
|
Removed useless comment.
|
2018-07-19 14:44:32 -07:00 |
|