Wayne Chen
35ca75093a
Merge pull request #5 from danteruiz/update
...
better loading check logic
2018-10-03 10:06:48 -07:00
Dante Ruiz
b28c375ad3
better loading check logic
2018-10-03 09:57:32 -07:00
John Conklin II
9a614d7523
Merge pull request #13977 from dback2/newEntityListView
...
New optimized entity list view
2018-10-03 09:23:11 -07:00
John Conklin II
05609384b7
Merge pull request #14111 from zfox23/newConnectionsQuery
...
Fix MS18608: Use new connections api endpoint
2018-10-03 09:04:58 -07:00
John Conklin II
8bd8d05409
Merge pull request #14118 from luiscuenca/handTouchLMFix
...
Disable Hand Touch when Leap Motion is running
2018-10-03 09:03:43 -07:00
Brad Hefta-Gaub
bb78a8dd5c
Merge pull request #14134 from jherico/fix/fb19088
...
Fix avatar thumbnails
2018-10-03 09:01:33 -07:00
Wayne Chen
2d85f882b8
adding buttons
2018-10-02 17:47:09 -07:00
sam gateau
da6e399161
INtroduce a safe destruction of the TBO defined when using a gpu::Buffer as REsourceBuffer in gl41 backend
2018-10-02 17:15:07 -07:00
Brad Davis
ffbb144a7c
Fix avatar thumbnails
2018-10-02 16:31:24 -07:00
Brad Hefta-Gaub
6b9842d4da
Merge pull request #14131 from Atlante45/feat/deadlock-backtrace
...
Better deadlock crash
2018-10-02 16:03:20 -07:00
sam gateau
680f5f5703
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
2018-10-02 15:25:19 -07:00
David Rowe
2bdd8bfdc7
Update play area and sensor overlay models and raise a little
2018-10-03 11:09:04 +13:00
John Conklin II
658c74a1c6
Merge pull request #14080 from huffman/fix/111-models-not-being-resized
...
Fix models with 1^3 dimensions never being resized
2018-10-02 14:11:45 -07:00
David Rowe
488599dbb0
Update teleport play area FBX model to be visible from below
2018-10-03 09:31:11 +13:00
David Rowe
c0231057f8
Revert foot calc scaling change
2018-10-03 09:28:19 +13:00
sam gateau
5d0f2e3035
And more changes for better syntax and less useless stuff
2018-10-02 13:09:04 -07:00
sam gateau
e5df356774
Fixing warnings from jenkins
2018-10-02 12:38:14 -07:00
Sam Gondelman
cd947f0a66
Merge pull request #14054 from gcalero/android_signup
...
Android signup
2018-10-02 12:37:57 -07:00
Clement
3c4e543b3c
Better deadlock crash
2018-10-02 11:51:15 -07:00
John Conklin II
898ba20f1c
Merge pull request #14068 from hyperlogic/bug-fix/bad-avatar-pointer-static-cast
...
Fix for bad static_pointer_cast on exit.
2018-10-02 11:31:47 -07:00
NissimHadar
71197ca0d1
Use new format of installer.
2018-10-02 11:30:00 -07:00
Dante Ruiz
182c92b951
fix mac issue
2018-10-02 11:24:09 -07:00
John Conklin II
27f75abb3f
Merge pull request #14076 from hyperlogic/bug-fix/better-hands-and-feet-calibration
...
Bug fix for Vive puck calibration of hands and feet
2018-10-02 11:20:12 -07:00
sam gateau
ff24a99032
Unify the the packing of the blendshape offset for simplicity and settle on the name DrawcallUniform
2018-10-02 11:18:20 -07:00
John Conklin II
2cd9e565b0
Merge pull request #14101 from dback2/editHandlePickPlaneImprovements
...
Edit handle pick plane improvements
2018-10-02 10:42:46 -07:00
Roxanne Skelly
35f662d767
Merge branch 'sysTraySetup' of https://github.com/roxanneskelly/hifi into sysTraySetup
2018-10-02 10:02:40 -07:00
Roxanne Skelly
95ef46d77c
fix some coding standards issues
2018-10-02 10:00:42 -07:00
Sam Gondelman
5b6e7b2566
Merge branch 'master' into scriptvec3
2018-10-02 08:58:04 -07:00
Seth Alves
834699fa12
Move grab pseudo-properties (userData) into first-class EntityItemProperties.
2018-10-02 08:54:12 -07:00
NissimHadar
5f4ffd9d82
Merge branch 'master' of https://github.com/highfidelity/hifi into addDailyTests
2018-10-02 07:09:01 -07:00
NissimHadar
719a2140fe
Merge branch 'addDailyTests' of https://github.com/NissimHadar/hifi into addDailyTests
2018-10-02 07:07:16 -07:00
Gabriel Calero
13e2b99dfa
Merge remote-tracking branch 'upstream/master' into android_signup
2018-10-02 09:24:09 -03:00
Sam Gateau
c95c736b1f
FOUnd a working path for gl41
2018-10-01 22:50:29 -07:00
Sam Gateau
d1d4920c35
Check and fixed the shader for nvidia regarding the unpacked variable name, adjust luci.js to be able to move the viewport
2018-10-01 21:35:18 -07:00
David Rowe
f7fd76b316
Merge branch 'master' into M18586
...
# Conflicts:
# interface/src/scripting/HMDScriptingInterface.h
2018-10-02 16:49:16 +13:00
Roxanne Skelly
34a7aff2ef
Differentiate name of Console.app/Sandbox.app depending on client_only
...
build
2018-10-01 20:12:00 -07:00
David Rowe
84a06fbe64
Don't immediately hide occlusion highlights after teleporting
2018-10-02 16:11:01 +13:00
David Rowe
2f3a9412f3
Make highlight occlusion match overlay occlusion
2018-10-02 15:36:18 +13:00
Sam Gateau
c593f00839
Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis
2018-10-01 19:10:18 -07:00
Anthony Thibault
b62ca2b75c
Better configuration, i.e. which puck is associated with which limb.
...
Previously we where incorrectly sorting the pucks along the x axis.
This could cause the order to be wrong if you were not standing along the z axis w.r.t the vive tracked volume.
2018-10-01 18:43:19 -07:00
NissimHadar
f863fabe68
Fix for create MD file.
2018-10-01 18:10:32 -07:00
sam gateau
392e2ff535
trying and failing andad trying and rince and repeat
2018-10-01 17:45:16 -07:00
sabrina-shanman
67dc526ee2
Merge branch 'master' of github.com:highfidelity/hifi into stt_parenting2
2018-10-01 17:17:32 -07:00
Brad Hefta-Gaub
7c9464572a
Merge pull request #14027 from huffman/feat/deprecate-undo-stack
...
Remove UndoStack API
2018-10-01 17:13:48 -07:00
John Conklin II
0ef407a45c
Merge pull request #14116 from sethalves/fix-bad-render-downcasts
...
get asan to not complain about invalid downcasts during transaction.updateItem
2018-10-01 16:57:03 -07:00
John Conklin II
9cbd819a39
Merge pull request #13965 from ctrlaltdavid/M17428-f
...
Mini tablet in palm
2018-10-01 16:56:36 -07:00
John Conklin II
3bbc01477e
Merge pull request #14055 from davidkelly/dk/18147
...
Do not have active buy button on invalidated items
2018-10-01 16:50:53 -07:00
John Conklin II
3ab83731b9
Merge pull request #14087 from sethalves/quiet-asan
...
fix several uninitialized reads
2018-10-01 16:48:54 -07:00
John Conklin II
dd5cd5de82
Merge pull request #14091 from gcalero/fix-case-18465
...
Fix case 18465: redirect to domain after login
2018-10-01 16:48:27 -07:00
Brad Hefta-Gaub
e5d9c0d442
Merge pull request #14083 from sethalves/fix-recording-upload-crash
...
call saveRecordingToAsset callback on correct thread
2018-10-01 16:46:36 -07:00
