Simon Walton
|
82e21e89e4
|
Merge remote-tracking branch 'upstream/master' into max-json-size
|
2018-11-13 17:26:20 -08:00 |
|
Simon Walton
|
167a8fdc04
|
Merge branch 'master' into max-json-size
|
2018-11-13 14:57:06 -08:00 |
|
Jamil Akram
|
d65a79e815
|
Merge pull request #14377 from huffman/feat/ui-updates
Update the styling for the Entity Properties window
|
2018-11-13 14:39:57 -08:00 |
|
Jeff Clinton
|
2afc8c505d
|
Merge pull request #14344 from ElderOrb/FB19348
FB19348 - Interface doesn't save changes to avatar animation text field
|
2018-11-13 14:29:25 -08:00 |
|
Jeff Clinton
|
18bf6bf975
|
Merge pull request #14143 from ElderOrb/FB18673
FB18673 - Last line of GOTO desktop notification text cropped off on …
|
2018-11-13 14:05:21 -08:00 |
|
Jamil Akram
|
822e4bfe48
|
Merge pull request #14386 from ctrlaltdavid/M19820
Fix entities not loading when Interface doesn't have focus
|
2018-11-13 13:45:42 -08:00 |
|
Ryan Huffman
|
aecbccc058
|
Remove dead code and cleanup JS styling for entity properties redesign
|
2018-11-13 13:45:27 -08:00 |
|
Ryan Huffman
|
8c9015b224
|
Remove redundant dimensions in default entity properties
|
2018-11-13 13:45:27 -08:00 |
|
Ryan Huffman
|
536ba645b1
|
Update the styling for the Entity Properties window
|
2018-11-13 13:45:27 -08:00 |
|
Simon Walton
|
a65466f154
|
Use traditional C strings rather than raw strings
|
2018-11-13 13:33:36 -08:00 |
|
Brad Hefta-Gaub
|
bb2239c0bd
|
Merge pull request #14359 from howard-stearns/no-url-logging
remove urls from logs in Interface
|
2018-11-13 13:19:30 -08:00 |
|
John Conklin II
|
7e7817212c
|
Merge pull request #14321 from jherico/fix/19256
Case 19256: Switch back to Qt for GL context creation by default
|
2018-11-13 13:14:22 -08:00 |
|
Brad Hefta-Gaub
|
4cab805392
|
Merge pull request #12718 from gcalero/tester_flag
Detect if Interface is running on an android testing device
|
2018-11-13 13:13:52 -08:00 |
|
Brad Davis
|
099ffa23ec
|
PR feedback
|
2018-11-13 12:19:20 -08:00 |
|
Brad Hefta-Gaub
|
07f94030ce
|
Merge pull request #14357 from ctrlaltdavid/M19761
Fix mini tablet JavaScript crash
|
2018-11-13 12:15:56 -08:00 |
|
Brad Hefta-Gaub
|
153b8920be
|
Merge pull request #14348 from sabrina-shanman/hfm_library
(case 19302) Create the HFM library and namespace
|
2018-11-13 12:03:53 -08:00 |
|
Brad Hefta-Gaub
|
6e2024350d
|
Merge pull request #14282 from gcalero/android_new_login
Change Android login flow (MS case 19470)
|
2018-11-13 12:02:10 -08:00 |
|
Brad Hefta-Gaub
|
b5e432bcb1
|
Merge pull request #14265 from amantley/needToSquat
Bug fix for Users unable to Squat
|
2018-11-13 12:01:06 -08:00 |
|
Brad Hefta-Gaub
|
41d8220cbd
|
Merge pull request #14362 from ctrlaltdavid/M19768
Add option to enable/disable the mini tablet
|
2018-11-13 11:59:24 -08:00 |
|
Brad Hefta-Gaub
|
47cd6b332c
|
Merge pull request #14349 from hyperlogic/bug-fix/head-trackers-in-desktop-mode
Bug fix for head trackers in desktop mode
|
2018-11-13 11:49:24 -08:00 |
|
Brad Hefta-Gaub
|
4bafcd2cfa
|
Merge pull request #14271 from SamGondelman/oculus
Case 19475: Fix various Oculus Store test failures
|
2018-11-13 11:06:39 -08:00 |
|
Howard Stearns
|
938b45d3da
|
more removal
|
2018-11-13 11:05:45 -08:00 |
|
Jeff Clinton
|
6bd08325ec
|
Merge pull request #14272 from FlameSoulis/fix/spacenavigator
Update Spacemouse plugin + Proposal to main build
|
2018-11-13 10:59:11 -08:00 |
|
Brad Hefta-Gaub
|
63e52ba8bd
|
Merge pull request #14284 from ctrlaltdavid/M19404
Fix interstitial page not displaying at Interface start-up
|
2018-11-13 10:38:38 -08:00 |
|
Howard Stearns
|
ad7266062d
|
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
|
2018-11-13 10:33:27 -08:00 |
|
Simon Walton
|
df2bc6ba5c
|
Remove unused function
|
2018-11-13 10:18:30 -08:00 |
|
John Conklin II
|
85e5c1d6ef
|
Merge pull request #14363 from SimonWalton-HiFi/scale-avatar-joint-translations
Send avatar-joint translations at world scale
|
2018-11-13 10:04:30 -08:00 |
|
Howard Stearns
|
545b85bc9d
|
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
|
2018-11-13 09:55:54 -08:00 |
|
Howard Stearns
|
fc62700587
|
Merge branch 'no-url-logging' of github.com:howard-stearns/hifi into no-url-logging
|
2018-11-13 09:55:09 -08:00 |
|
Seth Alves
|
7ffba9d987
|
Merge pull request #14204 from ctrlaltdavid/M12661
Fixes for collisionless entities
|
2018-11-13 09:42:07 -08:00 |
|
Seth Alves
|
1611525220
|
Merge pull request #14028 from ElderOrb/FB12459
Improve keyboard raising logic for web views
|
2018-11-13 09:41:04 -08:00 |
|
Seth Alves
|
e5114c9b43
|
Merge pull request #14283 from ctrlaltdavid/M14836
Make tablet page indicators clickable to scroll tablet
|
2018-11-13 09:38:43 -08:00 |
|
Seth Alves
|
4ac719a87f
|
Merge pull request #14298 from ctrlaltdavid/M17640
Fix Goto app cards staying highlighted if move off dialog while dragging
|
2018-11-13 09:32:24 -08:00 |
|
Seth Alves
|
969776e476
|
Merge pull request #14312 from ctrlaltdavid/M18577
Add option to start up at home location
|
2018-11-13 09:29:37 -08:00 |
|
Gabriel Calero
|
e9fe0c85f2
|
Fix merge
|
2018-11-13 11:03:46 -03:00 |
|
Gabriel Calero
|
3d4893aba2
|
Merge remote-tracking branch 'upstream/master' into android_new_login
|
2018-11-13 10:43:36 -03:00 |
|
David Rowe
|
e12833da23
|
Fix entities not loading when Interface doesn't have focus
Reverts https://github.com/highfidelity/hifi/pull/14286
|
2018-11-13 14:50:02 +13:00 |
|
Howard Stearns
|
7da440a886
|
Merge pull request #14385 from howard-stearns/inventory-icons-again
new inventory icons, and align message waiting light in items tab
|
2018-11-12 17:05:06 -08:00 |
|
Howard Stearns
|
c520e9de35
|
Merge pull request #14384 from roxanneskelly/Case19808
Case19808 - Sys tray need to remove wallet and market --> inventory
|
2018-11-12 17:02:34 -08:00 |
|
Sam Gondelman
|
f68706e72f
|
Merge pull request #14252 from gcalero/enable_aec_by_default
Enabled AEC by default (bug 19210)
|
2018-11-12 16:15:33 -08:00 |
|
Jeff Clinton
|
ab8ba2daad
|
Merge pull request #14230 from amantley/shoulderSpaceFix
Hand Azimuth improvement
|
2018-11-12 16:00:26 -08:00 |
|
Simon Walton
|
6ee837d47c
|
OctreeDataUtils - use new json from DS also; allow upload of large domains
|
2018-11-12 15:43:09 -08:00 |
|
John Conklin II
|
0370c60398
|
Merge pull request #14358 from AndrewMeadows/fix-capsuleY
Case 18436: consistent handling of CapsuleShape dimensions
|
2018-11-12 15:25:42 -08:00 |
|
amantley
|
f2f4a55c19
|
removed cruft
|
2018-11-12 15:07:14 -08:00 |
|
sabrina-shanman
|
753557736e
|
Merge branch 'master' into hfm_library
|
2018-11-12 15:03:30 -08:00 |
|
Howard Stearns
|
3431bdbb0e
|
new inventory icons, and align message waiting light in items tab
|
2018-11-12 14:51:32 -08:00 |
|
Gabriel Calero
|
0aaf92ce79
|
Fix UI issue: login confirmation sometimes does not appear
|
2018-11-12 19:51:28 -03:00 |
|
John Conklin II
|
ec4f2f781d
|
Merge pull request #14352 from Atlante45/feat/solo-source
[master] Add audio soloing feature
|
2018-11-12 14:07:30 -08:00 |
|
Roxanne Skelly
|
762033580d
|
And remove another url log item.
|
2018-11-12 13:48:08 -08:00 |
|
Roxanne Skelly
|
7a14cb1bbc
|
Remove additional url logging message.
|
2018-11-12 13:36:14 -08:00 |
|