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 |
|
Sam Gateau
|
b46c79b113
|
Merge pull request #14942 from SamGondelman/hashLock
Case 21277: Fix avatar deadlock
|
2019-02-19 09:12:02 -08:00 |
|
SamGondelman
|
d50904dd4a
|
fix avatar deadlock
|
2019-02-15 17:08:24 -08:00 |
|
John Conklin II
|
e77cdfc0d2
|
Merge pull request #14936 from sabrina-shanman/bug_gltf_mat-support
(case 21231) Fix GLTF materials
|
2019-02-15 15:43:31 -08:00 |
|
John Conklin II
|
4520236873
|
Merge pull request #14917 from thoys/feat/avatarTools/avatarDoctor
Case 21012: Avatar Doctor
|
2019-02-15 15:43:18 -08:00 |
|
Thijs Wenker
|
e900d3784b
|
fixes
|
2019-02-15 23:58:42 +01:00 |
|
sabrina-shanman
|
bb123cfe3b
|
Fix GLTF materials
|
2019-02-15 14:51:29 -08:00 |
|
John Conklin II
|
3969a0433e
|
Merge pull request #14920 from NissimHadar/21193-updateNitpickReadme
Case 21193: update nitpick readme
|
2019-02-15 14:23:13 -08:00 |
|
John Conklin II
|
09d8221582
|
Merge pull request #14834 from gcalero/connection_failure_dialog
Case 20936: Set message dialog text width so wrap mode takes effect
|
2019-02-15 14:16:02 -08:00 |
|
ingerjm0
|
c8791841de
|
Merge pull request #14918 from ctrlaltdavid/M21128
Case 21128: AccountServices, HifiAbout, and WalletScriptingInterface JSDoc
|
2019-02-15 14:15:13 -08:00 |
|
John Conklin II
|
c7a6902e93
|
Merge pull request #14881 from dback2/avatarExporterTextures
Case 20613: Avatar Exporter v0.2 - copy external textures
|
2019-02-15 14:14:05 -08:00 |
|
Sam Gateau
|
70c085dfab
|
Merge pull request #14928 from jherico/fix/android_release_apk
Fix android release build APK
|
2019-02-15 14:11:51 -08:00 |
|
Roxanne Skelly
|
a82385200e
|
Merge pull request #14906 from roxanneskelly/QmlMarketplace
Qml marketplace - multiple improvements/bugfixes
|
2019-02-15 14:04:47 -08:00 |
|
Andrew Meadows
|
7872da6b97
|
Merge pull request #14915 from samcake/brown
Case 21190: Introducing msaa to forward renderer
|
2019-02-15 13:48:33 -08:00 |
|
John Conklin II
|
b9356e22d8
|
Merge pull request #14927 from huffman/fix/hide-asset-browser
Case 16349: Fix asset browser being hidden in incorrect way on server switch
|
2019-02-15 13:32:27 -08:00 |
|
David Back
|
348ac3167f
|
move failed bone rules call, add get texture directory
|
2019-02-15 12:58:30 -08:00 |
|
Roxanne Skelly
|
1154414a07
|
remove unneeded marketplaceInject.js
|
2019-02-15 12:36:35 -08:00 |
|
Roxanne Skelly
|
6d38dcbfad
|
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
|
2019-02-15 12:33:44 -08:00 |
|
Roxanne Skelly
|
2c4f485079
|
QmlMarketplace invert arrow direction on sort.
|
2019-02-15 12:31:01 -08:00 |
|
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 |
|
Roxanne Skelly
|
fb524f8900
|
Merge branch 'QmlMarketplace' of https://github.com/roxanneskelly/hifi into QmlMarketplace
|
2019-02-15 11:35:06 -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 |
|
Brad Davis
|
a786a832d9
|
Fix android release build APK
|
2019-02-15 11:10:30 -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 |
|
Ryan Huffman
|
ab5c4a927b
|
Fix asset browser being hidden in incorrect way on server switch
|
2019-02-14 22:18:42 -08:00 |
|
Sam Gateau
|
13b5390243
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2019-02-14 21:01:44 -08:00 |
|
David Back
|
41abacbc6f
|
always overwrite, tweak warning
|
2019-02-14 17:51:32 -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 |
|
Sam Gateau
|
34db48d3a3
|
Merging and resolving conflict
|
2019-02-14 17:03:44 -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 |
|
David Back
|
7cffcf2215
|
error handling, warnings for duplicate textures
|
2019-02-14 16:09:48 -08:00 |
|