Thijs Wenker
|
74ce98a075
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarDoctor
|
2019-02-15 20:57:20 +01:00 |
|
Thijs Wenker
|
556a55ff16
|
Better scale and texture checks
|
2019-02-15 20:55:27 +01:00 |
|
Sam Gateau
|
6edf7e7907
|
Merge pull request #14931 from jherico/fix/vive_crash
Case 21230: Fix crash in vive and interleaved stereo plugins
|
2019-02-15 11:41:03 -08:00 |
|
John Conklin II
|
7008330641
|
Merge pull request #14921 from NissimHadar/fixMacError
Compilation error on Qt 5.12
|
2019-02-15 11:28:55 -08:00 |
|
David Back
|
158e255319
|
Merge pull request #14902 from huffman/fix/duplicating-grabbed-entities
Case 21029: Fix duplicating non-dynamic grabbed entities in edit.js
|
2019-02-15 11:25:42 -08:00 |
|
John Conklin II
|
5f0db88a20
|
Merge pull request #14914 from raveenajain/gltf_tangents
Case 21165: tangent attribute
|
2019-02-15 11:24:21 -08:00 |
|
Sam Gateau
|
5e9eeccb95
|
Merge pull request #14930 from NissimHadar/fixCMake
Case 21241: Fix CMake problem for ubuntu build of nitpick
|
2019-02-15 11:23:58 -08:00 |
|
Sam Gondelman
|
9aa99f24f0
|
Merge pull request #14905 from SamGondelman/materialMapping
Case 20242: FST materialMapping supports our material JSON format
|
2019-02-15 11:21:51 -08:00 |
|
Clément Brisset
|
3c60aaff96
|
Merge pull request #14922 from AndrewMeadows/avoid-entity-update-storm
Case 21232: avoid entity update storm from entity-server
|
2019-02-15 11:01:08 -08:00 |
|
Brad Davis
|
5483971855
|
Fix crash in vive and interleaved stereo plugins
|
2019-02-15 10:46:08 -08:00 |
|
David Back
|
af25a7bf6e
|
Merge pull request #14919 from dback2/selectAllClearAll
Case 19930: Entity List - add select/clear all to entity type dropdown
|
2019-02-15 10:12:30 -08:00 |
|
NissimHadar
|
b77f40d300
|
Revert due to stable build problem on Ubuntu.
|
2019-02-15 09:52:57 -08:00 |
|
Anthony Thibault
|
702f1c8e74
|
Merge pull request #14925 from hyperlogic/bug-fix/revert-anim-pose-optimization
Revert anim pose optimization
|
2019-02-15 09:42:27 -08:00 |
|
Simon Walton
|
748747da2d
|
Merge pull request #14864 from SimonWalton-HiFi/pal-sort-loudness-persist
Case 19724: If sorting PAL by loudness re-sort upon loudness updates
|
2019-02-15 09:24:34 -08:00 |
|
NissimHadar
|
8b2d9c36af
|
Adding client profile combo.
|
2019-02-15 08:39:29 -08:00 |
|
Shannon Romano
|
f267043953
|
Merge pull request #14838 from SamGondelman/billboardMode
Case 20962: Billboard mode improvements
|
2019-02-14 17:44:48 -08:00 |
|
David Back
|
e944e284a6
|
design feedback
|
2019-02-14 17:37:58 -08:00 |
|
Shannon Romano
|
3b5b077a3e
|
Merge pull request #14887 from AndrewMeadows/shape-garbage-collector
Case 21066: restore shape caching in ShapeManager
|
2019-02-14 17:33:33 -08:00 |
|
David Back
|
f6baa2432a
|
design feedback
|
2019-02-14 17:27:05 -08:00 |
|
Anthony Thibault
|
a3407b96b0
|
Merge branch 'master' into bug-fix/revert-anim-pose-optimization
|
2019-02-14 16:56:17 -08:00 |
|
Sam Gateau
|
6168001ad4
|
Merge pull request #14909 from AndrewMeadows/update-collision-group-after-grab-80
Case 21159: fixes for more grab bugs
|
2019-02-14 16:52:03 -08:00 |
|
David Back
|
46ff3a8405
|
add select/clear all buttons to entity type dropdown
|
2019-02-14 16:16:33 -08:00 |
|
Anthony Thibault
|
39b4eaac34
|
Revert "AnimPose operator* optimizations"
This reverts commit 569bef50fd.
|
2019-02-14 16:13:00 -08:00 |
|
Anthony Thibault
|
f0e163b4df
|
Revert "AnimPose::inverse() optimization"
This reverts commit 5c7e81584c.
|
2019-02-14 16:10:26 -08:00 |
|
Ryan Huffman
|
e800a6e030
|
Update hard-coded vec3 zero with Vec3.ZERO
|
2019-02-14 15:56:17 -08:00 |
|
Simon Walton
|
75901a1e37
|
Merge pull request #14853 from SimonWalton-HiFi/installer-removes
Case 20496: Windows (NSIS) installer shouldn't remove unselected component upon reinstall
|
2019-02-14 15:41:25 -08:00 |
|
Andrew Meadows
|
b94655260d
|
don't traverse for fullUpdate on changed view
|
2019-02-14 14:54:10 -08:00 |
|
Shannon Romano
|
453c081d9b
|
Merge pull request #14901 from huffman/fix/dropdown-close-on-click
Case 19999: Update edit.js to auto close dropdowns when clicking outside
|
2019-02-14 14:48:03 -08:00 |
|
raveenajain
|
01def37efd
|
spacing
|
2019-02-14 14:22:43 -08:00 |
|
NissimHadar
|
a1e289cc1c
|
Compilation error on Qt 5.12
|
2019-02-14 14:17:29 -08:00 |
|
Bradley Austin Davis
|
d45d87031d
|
Merge pull request #14782 from SamGondelman/NOverlaysFinal
Case 20723, Case 20334: Internally, replace all overlays with local entities
|
2019-02-14 13:49:47 -08:00 |
|
Sam Gateau
|
969c62d0df
|
Merge pull request #14907 from danteruiz/fix-qml-crash-on-mac
Case 21157: Fix Desktop.qml crash on local mac build
|
2019-02-14 12:15:50 -08:00 |
|
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 |
|
raveenajain
|
e825be566d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_tangents
|
2019-02-14 11:45:53 -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 |
|
SamGondelman
|
dd0d7f0118
|
merge with master
|
2019-02-14 09:57:13 -08:00 |
|
Thijs Wenker
|
3026fd625a
|
Avatar Doctor
|
2019-02-14 18:52:50 +01: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
|
13ece79476
|
merge with master
|
2019-02-13 16:30:22 -08:00 |
|
SamGondelman
|
3f8bfc5475
|
CR and fix deadlock
|
2019-02-13 16:19:39 -08:00 |
|
raveenajain
|
a967d7a1bc
|
tangent attribute
|
2019-02-13 15:59:55 -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 |
|