sabrina-shanman
|
86c948f116
|
Convert hfmModel and materialMapping fields in model-baker Baker to getters
|
2019-03-06 15:33:31 -08:00 |
|
sabrina-shanman
|
612cf43c43
|
Use HifiTypes.h in VHACDUtil.cpp
|
2019-03-06 15:22:36 -08:00 |
|
sabrina-shanman
|
2af17015d3
|
Convert serializers and FBX.h to use HifiTypes.h
|
2019-03-06 15:19:01 -08:00 |
|
sabrina-shanman
|
8ff212ac95
|
Move custom draco mesh attributes from FBX.h to HFM.h
|
2019-03-06 15:18:58 -08:00 |
|
sabrina-shanman
|
aef696efe6
|
Add passthrough config to PrepareJointsTask
|
2019-03-06 15:18:26 -08:00 |
|
sabrina-shanman
|
9c9dc553a2
|
Fix binding to temporary when trying to safely get empty model-baker task data
|
2019-03-06 15:18:25 -08:00 |
|
sabrina-shanman
|
4ae0c79130
|
Harden model-baker Engine against random tasks being disabled
|
2019-03-06 15:18:22 -08:00 |
|
sabrina-shanman
|
e4d6d5af89
|
Streamline ModelBaker initialization and URLs
|
2019-03-06 15:18:19 -08:00 |
|
Shannon Romano
|
f9e5ee0185
|
Merge pull request #14970 from danteruiz/quest-no-keyboard
Case 21335: Use old tablet keyboard for quest
|
2019-02-21 10:34:53 -08:00 |
|
Clément Brisset
|
8c642fd98d
|
Merge pull request #14971 from shanzzam/slr_twitter_changes
Changing twitter handle from inc to VR
|
2019-02-21 10:22:08 -08:00 |
|
Anthony Thibault
|
d4a41770d7
|
Merge pull request #14957 from hyperlogic/bug-fix/add-jsdoc-out-dir
Add README.md file to tools/jsdoc/out dir to prevent jsdoc build failures
|
2019-02-21 09:20:13 -08:00 |
|
shanzzam
|
adb6f559dc
|
Changing twitter handle from inc to VR
|
2019-02-20 18:31:32 -08:00 |
|
Dante Ruiz
|
bf8c671cd6
|
keyboard setting
|
2019-02-20 13:38:20 -08:00 |
|
John Conklin II
|
87556059d3
|
Merge pull request #13901 from Cristo86/android_handshake
case 20058: Android - Handshake implementation
|
2019-02-20 13:33:52 -08:00 |
|
Sam Gateau
|
4dbae787cb
|
Merge pull request #14803 from highfidelity/feature/quest
Case 20624: Final merge of Quest Interface application into master
|
2019-02-20 11:53:24 -08:00 |
|
Brad Davis
|
79369a0c83
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-20 10:40:49 -08:00 |
|
Shannon Romano
|
0b7bdb185e
|
Merge pull request #14949 from SamGondelman/wearables
Case 21300, Case 21301: Group cull all entity descendants of avatars
|
2019-02-20 10:29:40 -08:00 |
|
John Conklin II
|
97c7b01005
|
Merge pull request #14965 from danteruiz/stylus-pick-perf
Case 21255: PickManager performance is slow when keyboard mallets are enabled
|
2019-02-20 10:11:33 -08:00 |
|
Brad Davis
|
817c24dd0b
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-20 09:51:03 -08:00 |
|
SamGondelman
|
c8ffb130a3
|
only update sub items on change
|
2019-02-19 17:38:47 -08:00 |
|
Brad Davis
|
122a246d2d
|
Fix typo
|
2019-02-19 17:30:47 -08:00 |
|
Shannon Romano
|
07d084d086
|
Merge pull request #14937 from SamGondelman/pal
Case 21259: Pal textures don't change
|
2019-02-19 17:14:15 -08:00 |
|
Shannon Romano
|
815375fa76
|
Merge pull request #14960 from danteruiz/fix-tablet-clicking
Case 21317: Unable to click icons on tablet when in HMD (0.81.0)
|
2019-02-19 17:11:59 -08:00 |
|
Brad Davis
|
518e480a8b
|
Fix plugin activation
|
2019-02-19 17:00:50 -08:00 |
|
SamGondelman
|
6765268998
|
Merge remote-tracking branch 'upstream/master' into wearables
|
2019-02-19 16:52:00 -08:00 |
|
danteruiz
|
6bdf51a460
|
limit number of include items for mallets
|
2019-02-19 16:25:38 -08:00 |
|
Bradley Austin Davis
|
c912f2f7d7
|
Merge pull request #14964 from amerhifi/feature/quest
fixing compile errors
|
2019-02-19 16:17:18 -08:00 |
|
amer cerkic
|
0d0acd8fb2
|
fixed typo
|
2019-02-19 16:09:16 -08:00 |
|
amer cerkic
|
bf69e6d672
|
fixing compile errors
|
2019-02-19 16:03:02 -08:00 |
|
SamGondelman
|
44e70db4cd
|
WE DID IT FOLKS
|
2019-02-19 15:02:36 -08:00 |
|
danteruiz
|
d1c46e1cdc
|
fixing tablet pointer issues
|
2019-02-19 14:48:17 -08:00 |
|
Dante Ruiz
|
6189aff6b3
|
Merge pull request #14933 from danteruiz/pick-manager-perf
Case 21271: Remove unnessary picks for quest
|
2019-02-19 14:20:56 -08:00 |
|
Brad Davis
|
8eca2a2c9d
|
Fix jenkins build failure
|
2019-02-19 13:09:18 -08:00 |
|
Brad Davis
|
d60dcb99d2
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-19 12:37:30 -08:00 |
|
Brad Davis
|
44851bbf68
|
Quest frame player cleanup
|
2019-02-19 12:37:17 -08:00 |
|
Brad Davis
|
0ddb4ecd7c
|
Allow per-machine customization of which android projects are loaded
|
2019-02-19 12:10:26 -08:00 |
|
SamGondelman
|
2986ca20c5
|
Merge remote-tracking branch 'upstream/master' into pal
|
2019-02-19 11:31:40 -08:00 |
|
John Conklin II
|
051ab61b66
|
Merge pull request #14951 from SamGondelman/ssao
Case 20993: Fix AO
|
2019-02-19 11:19:03 -08:00 |
|
John Conklin II
|
d7a5c0bb4f
|
Merge pull request #14947 from SamGondelman/overlayClick
Case 21291, Case 21292, Case 21293: Working on overlay bugs
|
2019-02-19 11:01:19 -08:00 |
|
John Conklin II
|
1348baecc7
|
Merge pull request #14935 from SamGondelman/matEntity
Case 20920: Move Material Entity logic to render thread
|
2019-02-19 10:59:51 -08:00 |
|
John Conklin II
|
0f8c36156b
|
Merge pull request #14952 from SamGondelman/textColor
Case 21305: Fix text overlay color property
|
2019-02-19 10:58:32 -08:00 |
|
Howard Stearns
|
d7d6ff53ca
|
Merge pull request #14765 from howard-stearns/artist-stocking-inventory
Case 20657: artist stocking inventory
|
2019-02-19 10:46:01 -08:00 |
|
Anthony Thibault
|
9a0163f404
|
Add README.md file to tools/jsdoc/out directory to prevent jsdoc generation failures during build
|
2019-02-19 10:36:35 -08:00 |
|
danteruiz
|
4bbae1230d
|
making requested chantges
|
2019-02-19 10:07:36 -08:00 |
|
Bradley Austin Davis
|
b1a120cdfa
|
Merge pull request #14954 from amerhifi/feature/quest
Feature/quest
|
2019-02-19 09:44:39 -08:00 |
|
Sam Gateau
|
b46c79b113
|
Merge pull request #14942 from SamGondelman/hashLock
Case 21277: Fix avatar deadlock
|
2019-02-19 09:12:02 -08:00 |
|
amer cerkic
|
ae796c2484
|
rerouted the intent back to interfaceActivity since its back and registered in manifest
|
2019-02-19 07:42:35 -08:00 |
|
amer cerkic
|
9a0078a216
|
fixing compile errors.
|
2019-02-19 07:32:05 -08:00 |
|
SamGondelman
|
927e824610
|
fix missing color for text overlays
|
2019-02-18 16:14:07 -08:00 |
|
SamGondelman
|
27f05db825
|
fix ao
|
2019-02-18 01:12:00 -08:00 |
|