amer cerkic
|
72200618d9
|
cleanup of my debugging items
|
2019-02-14 16:38:15 -08:00 |
|
amer cerkic
|
7037e14d09
|
merging from upstream
|
2019-02-14 16:31:04 -08:00 |
|
amer cerkic
|
8d522d9ce7
|
fixed issues with pause/resume and start/stop. still issues with input after resume
|
2019-02-14 14:48:56 -08:00 |
|
Brad Davis
|
292602afd7
|
Resolving more master differences
|
2019-02-14 12:55:28 -08:00 |
|
Brad Davis
|
0f4d1f073b
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-14 12:49:56 -08:00 |
|
Andrew Meadows
|
efe2767f3f
|
Merge pull request #14913 from SamGondelman/pal
Case 21147, Case 20944: Fix setTextures (pal, etc.)
|
2019-02-13 17:50:08 -08:00 |
|
Andrew Meadows
|
72b5fa1968
|
Merge pull request #14857 from Atlante45/fix/ess-parenting
Case 15420: Fix ESS sometimes not getting the parents/children of entities with scripts.
|
2019-02-13 17:26:57 -08:00 |
|
SamGondelman
|
9e002c59d4
|
fix pal
|
2019-02-13 15:24:55 -08:00 |
|
Shannon Romano
|
8a07e2b31a
|
Merge pull request #14895 from ctrlaltdavid/M21132
Case 21132: Add "Avatar Script" classification to relevant JSDoc APIs
|
2019-02-13 10:35:00 -08:00 |
|
Shannon Romano
|
1330b108d6
|
Merge pull request #14890 from sabrina-shanman/gltf_mat-support
(case 20980) Add support for Roughness/Metallic in GLTF models
|
2019-02-13 08:16:00 -08:00 |
|
sabrina-shanman
|
08ef9b6f84
|
Remove unused duplicate ColorChannel enum
|
2019-02-12 16:44:37 -08:00 |
|
Sam Gateau
|
a4b4f201c1
|
Merge pull request #14910 from danteruiz/feature/quest
Quest re-enable IK.
|
2019-02-12 16:41:31 -08:00 |
|
sabrina-shanman
|
b2e3b87ef4
|
Add two missing CMake includes
|
2019-02-12 16:24:13 -08:00 |
|
Anthony Thibault
|
5db764f5df
|
Merge pull request #14908 from hyperlogic/bugfix/bug-eyes
Revert "Pack all non-instanced traits"
|
2019-02-12 16:23:19 -08:00 |
|
sabrina-shanman
|
b2af6d1374
|
Have only one ColorChannel enum as header in image library
|
2019-02-12 16:14:41 -08:00 |
|
Dante Ruiz
|
3103ae6ca7
|
reenable ik
|
2019-02-12 16:09:47 -08:00 |
|
Brad Davis
|
4dd853ddbc
|
Cleanup from master
|
2019-02-12 15:14:50 -08:00 |
|
Brad Davis
|
db121957d2
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-12 15:00:03 -08:00 |
|
Shannon Romano
|
ee83c69d3e
|
Merge pull request #14899 from samcake/brownBis
Case 21146: Adding support for MSAA textures and framebuffer to gpu lib and backends.
|
2019-02-12 13:54:09 -08:00 |
|
Anthony Thibault
|
eee41bc41e
|
Revert "Pack all non-instanced traits"
This reverts commit 5b7d7b8833.
|
2019-02-12 13:46:21 -08:00 |
|
sabrina-shanman
|
1b2cb94b0c
|
Fix not changing input to processImage in TextureBaker.cpp
|
2019-02-12 13:21:21 -08:00 |
|
John Conklin II
|
1761df7ccd
|
Merge pull request #14875 from jherico/feature/quest_custom_plugins
Case 20882: Support custom display / input plugin lists and small tweaks
|
2019-02-12 12:52:07 -08:00 |
|
Sam Gateau
|
a10cf9b620
|
Merge pull request #14883 from amerhifi/feature/quest
case:21032 Fixing Lifecycle of the android app
|
2019-02-12 12:32:38 -08:00 |
|
sabrina-shanman
|
2b355e9d52
|
Re-name ColorChannelMapping to ColorChannel and put versions in two specific libraries rather than shared
|
2019-02-12 11:56:44 -08:00 |
|
Brad Davis
|
a6f23f48d6
|
Merge branch 'feature/quest_custom_plugins' into feature/quest
|
2019-02-12 09:53:12 -08:00 |
|
Sam Gateau
|
0c2c581c64
|
Add the gles backend MS texture ad framebuffer support
|
2019-02-11 22:52:35 -08:00 |
|
Sam Gateau
|
afb6c838eb
|
REverting all the changes from the brown branch not used
|
2019-02-11 20:13:37 -08:00 |
|
Sam Gateau
|
9ad783135c
|
Bringing back brownBis to just msaa support
|
2019-02-11 19:42:05 -08:00 |
|
Sam Gateau
|
8a4f7fe2b6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2019-02-11 18:57:33 -08:00 |
|
sabrina-shanman
|
2c5446dfb5
|
Merge branch 'master' into gltf_mat-support
|
2019-02-11 17:46:23 -08:00 |
|
Jeff Clinton
|
123c2301da
|
Merge pull request #14858 from SamGondelman/fst
Case 21046: Fix Subsurface Scattering and ResourceCache "extra" bug
|
2019-02-11 17:40:44 -08:00 |
|
sabrina-shanman
|
e16e968e98
|
Merge branch 'fst' of github.com:SamGondelman/hifi into gltf_mat-support
|
2019-02-11 16:23:15 -08:00 |
|
Brad Davis
|
b896e2577b
|
Fix QML file selectors
|
2019-02-11 16:17:06 -08:00 |
|
SamGondelman
|
d96b0534ab
|
fix resource texture crash
|
2019-02-11 16:12:13 -08:00 |
|
SamGondelman
|
4202685a4b
|
Merge remote-tracking branch 'upstream/master' into fst
|
2019-02-11 16:07:36 -08:00 |
|
Brad Davis
|
e534270f9a
|
Merge remote-tracking branch 'upstream/master' into feature/quest_custom_plugins
|
2019-02-11 15:41:32 -08:00 |
|
David Rowe
|
8e0ff9b4de
|
Fix up some "Client Entity" JSDoc API classifications
|
2019-02-12 11:50:09 +13:00 |
|
David Rowe
|
5428bb19dc
|
Add "Avatar Script" JSDoc API classification
|
2019-02-12 11:49:49 +13:00 |
|
raveenajain
|
cfc13de39d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into glb_files
|
2019-02-11 10:25:46 -08:00 |
|
amerhifi
|
e6366eaf02
|
consolidated the OculusAcitivity into OCulusMobilieAcitivity to reduce amount of back and forth between super and base as well as remove reduntant calls to native. Moved setcontentView on the native callback becuase it was blocking QtActivity from finishing its initialization
|
2019-02-11 09:46:06 -08:00 |
|
sabrina-shanman
|
0fda6bd3e0
|
Merge 'samuel/fst' into gltf_mat-support
|
2019-02-11 09:28:29 -08:00 |
|
sabrina-shanman
|
5840f272ed
|
Store mapped single channel texture with alpha of 255 just to be safe
|
2019-02-11 09:07:45 -08:00 |
|
sabrina-shanman
|
f7d7136b3e
|
Do not have hash specialization just for ColorChannelMapping
|
2019-02-11 09:06:26 -08:00 |
|
sabrina-shanman
|
0f291612c3
|
Fix invalid processImage calls in TextureBaker.cpp
|
2019-02-11 09:04:41 -08:00 |
|
SamGondelman
|
20841a0eea
|
fix skybox loading I think and pull in sabrina's ktx caching fix
|
2019-02-09 16:42:34 -08:00 |
|
Brad Hefta-Gaub
|
a23f436a9f
|
Merge pull request #14880 from kencooke/audio-meter-improvements
Case 21091: Improved audio metering
|
2019-02-08 19:08:31 -08:00 |
|
sabrina-shanman
|
23806ed67d
|
Add support for GLTF roughness/metallic
|
2019-02-08 18:54:40 -08:00 |
|
raveenajain
|
709f784fea
|
:}
|
2019-02-08 16:51:18 -08:00 |
|
raveenajain
|
43a1c78402
|
Merge branch 'master' into glb_files
|
2019-02-08 15:59:01 -08:00 |
|
Anthony Thibault
|
88bb2c9bda
|
Merge pull request #14884 from hyperlogic/bug-fix/pack-all-traits-in-client-traits-handler
Pack all non-instanced avatar traits
|
2019-02-08 15:40:50 -08:00 |
|