NissimHadar
|
620c9e2f93
|
All results now logged, so don't mark as failed.
|
2018-11-13 13:38:44 -08:00 |
|
NissimHadar
|
c7b3b9c0d2
|
Reverted previous commit.
|
2018-11-13 11:49:59 -08:00 |
|
NissimHadar
|
ef34ff622a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into MAC
|
2018-11-13 11:11:53 -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 |
|
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 |
|
NissimHadar
|
2011e7b94c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into MAC
|
2018-11-13 10:12:52 -08:00 |
|
NissimHadar
|
14dfb35fad
|
Merge branch 'MAC' of https://github.com/NissimHadar/hifi into MAC
|
2018-11-13 10:12:38 -08:00 |
|
NissimHadar
|
234a46bd43
|
Evaluate results even if Interface crashed midway.
|
2018-11-13 10:12:06 -08:00 |
|
NissimHadar
|
c7e0cb1757
|
Moved downloader deletion to after completion of download.
|
2018-11-13 10:11:22 -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 |
|
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 |
|
NissimHadar
|
81d07b695f
|
Merge branch 'MAC' of github.com:NissimHadar/hifi into MAC
|
2018-11-13 08:41:05 -08:00 |
|
NissimHadar
|
e378a1b79c
|
Added missing CR
|
2018-11-13 08:39:52 -08:00 |
|
NissimHadar
|
fc832bff58
|
Merge branch 'master' of https://github.com/highfidelity/hifi into MAC
|
2018-11-13 08:27:23 -08: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 |
|
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 |
|
Howard Stearns
|
3431bdbb0e
|
new inventory icons, and align message waiting light in items tab
|
2018-11-12 14:51:32 -08: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 |
|
NissimHadar
|
5d47efa0b8
|
Merge branch 'MAC' of https://github.com/NissimHadar/hifi into MAC
|
2018-11-12 14:01:30 -08:00 |
|
NissimHadar
|
07515eab68
|
Merge branch 'master' of https://github.com/highfidelity/hifi into MAC
|
2018-11-12 14:00:46 -08:00 |
|
NissimHadar
|
6e3ead0c5f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into MAC
|
2018-11-12 14:00:24 -08:00 |
|
Jamil Akram
|
6511b60aa4
|
Merge pull request #14264 from ctrlaltdavid/M19085
Fix AvatarManager.getPalData() returning data for just a single avatar
|
2018-11-12 12:27:58 -08:00 |
|
NissimHadar
|
050a13433b
|
Merge branch 'MAC' of github.com:NissimHadar/hifi into MAC
|
2018-11-12 12:20:32 -08:00 |
|
NissimHadar
|
05033b7da1
|
Echo status to screen
|
2018-11-12 12:19:32 -08:00 |
|
John Conklin II
|
cd3dc04dc5
|
Merge pull request #14159 from alexiamandeville/WoodyUpdate
Updating Woody avatar for new UV seams
|
2018-11-12 12:12:49 -08:00 |
|
NissimHadar
|
4a158ea789
|
Fixed Linux compilation error.
|
2018-11-12 11:07:18 -08:00 |
|
NissimHadar
|
a535519fbc
|
Typo.
|
2018-11-12 11:00:24 -08:00 |
|
John Conklin II
|
512b847684
|
Merge pull request #14339 from hyperlogic/bug-fix/anim-debug-draw-crash
AnimDebugDraw: Prevent multi-threaded access to shared map collection.
|
2018-11-12 10:47:01 -08:00 |
|
John Conklin II
|
9d404a6cf3
|
Merge pull request #14379 from Cristo86/gles_use_tbo_no_ssbo
case 19562: GLES - Use TBO instead of SSBO and make shaders use it when it is not gl45 (master)
|
2018-11-12 10:45:52 -08:00 |
|
John Conklin II
|
33da88f174
|
Merge pull request #14351 from luiscuenca/tweakTransitAnimations
Tweak transit animations
|
2018-11-12 10:39:56 -08:00 |
|
Ryan Huffman
|
5e6d0c0f94
|
Merge pull request #14376 from thoys/feat/create/localGlobalToggle
[CreateApp] Local/World toggle
|
2018-11-12 10:37:55 -08:00 |
|
Roxanne Skelly
|
e895021652
|
Merge branch 'master' of https://github.com/highfidelity/hifi into Case19808
|
2018-11-12 10:02:16 -08:00 |
|
Brad Hefta-Gaub
|
22dd958582
|
Merge pull request #14297 from jherico/feature/vcpkg
Case 19807: Switch to vcpkg for many dependencies on all non-mobile platforms
|
2018-11-12 09:52:02 -08:00 |
|
NissimHadar
|
ae28de119f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into MAC
|
2018-11-12 08:27:17 -08:00 |
|
John Conklin II
|
dc4b967ff5
|
Merge pull request #14331 from SimonWalton-HiFi/large-avatars-bad-position
Clamp avatar-joint translations that hit the compressed-format limit
|
2018-11-11 16:27:56 -08:00 |
|
Seth Alves
|
500b2b7adf
|
Merge pull request #14381 from zfox23/MS19803_retry
Actually fix MS19803: Replace missing imports
|
2018-11-09 16:38:26 -08:00 |
|
Jeff Clinton
|
12b833d121
|
Merge pull request #14167 from ElderOrb/FB18859
Make material entities to be presented in avatarapp
|
2018-11-09 15:32:27 -08:00 |
|
Zach Fox
|
8d325d8dd9
|
Actually fix MS19803: Replace missing imports
|
2018-11-09 15:02:57 -08:00 |
|
Howard Stearns
|
64bf7ba833
|
Merge pull request #14380 from zfox23/MS19803_securityQml
MS19803: Remove extra "as" in Security.qml
|
2018-11-09 14:29:54 -08:00 |
|
Roxanne Skelly
|
cd4e56e7d5
|
Case 19808 - Change MARKET and WALLET in tray notifier to be INVENTORY
along with other appropriate messaging changes.
|
2018-11-09 14:26:20 -08:00 |
|
Jeff Clinton
|
ee9154a801
|
Merge pull request #14341 from sethalves/fix-mouse-equip
only equip an entity to a hand-controller joint if the hand-controllers are in use, else use avatar hand
|
2018-11-09 12:54:36 -08:00 |
|
Jeff Clinton
|
b9c11aad7b
|
Merge pull request #14259 from SamGondelman/webLock
Case 18986: Enable interaction with locked web entity
|
2018-11-09 12:21:13 -08:00 |
|