Sam Gateau
|
384d4fb959
|
Merge pull request #14809 from highfidelity/commandLineAndroid
case 19113: Recreated changes due to CLA issue in previous pr. Adding args to int…
|
2019-02-14 12:10:08 -08:00 |
|
John Conklin II
|
5e177c31ee
|
Merge pull request #14912 from NissimHadar/21185-protectNitpickFromBadFilename
Case 21185: protect nitpick from bad filename
|
2019-02-14 11:25:36 -08:00 |
|
NissimHadar
|
6752092899
|
Removed unnecessary member variable.
|
2019-02-14 10:38:19 -08:00 |
|
NissimHadar
|
701c18c9eb
|
Correction to recursive scripts.
|
2019-02-14 08:58:09 -08:00 |
|
NissimHadar
|
58c0078188
|
Reversed order of recursive calls.
|
2019-02-13 21:07:25 -08:00 |
|
NissimHadar
|
301b4215e5
|
Fixed gcc warning.
|
2019-02-13 19:13:08 -08:00 |
|
NissimHadar
|
be5f9b211b
|
Add nitpick to production (but not stable) builds
|
2019-02-13 18:09:06 -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 |
|
NissimHadar
|
56483f4884
|
Check that zipped folder name is in correct format.
|
2019-02-13 15:18:07 -08:00 |
|
NissimHadar
|
86aaba016f
|
Narrow filter on zip folder selection.
|
2019-02-13 15:15:46 -08:00 |
|
NissimHadar
|
12c122ce9c
|
Bump up version number.
|
2019-02-13 15:14:36 -08:00 |
|
NissimHadar
|
77b679606f
|
Corrected bug in zip folder name.
|
2019-02-13 15:13: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
|
6ca4a2776e
|
Merge pull request #14903 from NissimHadar/21129-improveNitpickUsability
Case 21129: improve nitpick usability
|
2019-02-13 09:54:53 -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 |
|
NissimHadar
|
9ed1470175
|
Corrected case.
|
2019-02-12 19:10:34 -08:00 |
|
sabrina-shanman
|
efd22172b4
|
Add final missing CMake includes
|
2019-02-12 17:27:04 -08:00 |
|
sabrina-shanman
|
08ef9b6f84
|
Remove unused duplicate ColorChannel enum
|
2019-02-12 16:44:37 -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 |
|
Shannon Romano
|
10e5e9e0c3
|
Merge pull request #14900 from MarkBrosche/avatarAppKeyboardFix
Fixed MS21059: Avatar App Keyboard Raise in Desktop
|
2019-02-12 15:02:28 -08:00 |
|
Shannon Romano
|
7e643fcc19
|
Merge pull request #14893 from SimonWalton-HiFi/inventory-confirmation-message
Adjust Inventory's send-to-trash confirm message
|
2019-02-12 14:04:10 -08:00 |
|
Shannon Romano
|
e8c70cc782
|
Merge pull request #14897 from danteruiz/fix-soft-entity
Case 21142: Wearer and observer disagree on whether a worn item is correctly placed
|
2019-02-12 13:56:47 -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 |
|
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 |
|
danteruiz
|
fdfb9196d3
|
comments explaining horrible code
|
2019-02-12 11:45:08 -08:00 |
|
NissimHadar
|
305ce74659
|
Updated the Windows installation instructions.
|
2019-02-12 11:11:59 -08:00 |
|
NissimHadar
|
0b1034c290
|
Improved wording of error message.
|
2019-02-12 11:11:22 -08:00 |
|
Mark
|
9d81ace243
|
Fixed MS21059: Avatar App Keyboard Raise in Desktop
|
2019-02-12 09:45:51 -08:00 |
|
NissimHadar
|
6225d97357
|
Check for adb and python when needed.
Look for adb and python in PATH.
|
2019-02-12 09:06:04 -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 |
|
danteruiz
|
50dd865bdc
|
fix spatially nestable parent overwrite
|
2019-02-11 16:48:34 -08:00 |
|
Ryan Huffman
|
71669af696
|
Merge pull request #14896 from huffman/fix/particle-effect-url
Case 20502: Fix not being able to type text into particle url field
|
2019-02-11 16:32:26 -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 |
|
Sam Gateau
|
51e7c6a83b
|
Merge pull request #14878 from raveenajain/glb_files
Case 20966: glb files
|
2019-02-11 16:08:33 -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 |
|