SamGondelman
|
c8ffb130a3
|
only update sub items on change
|
2019-02-19 17:38:47 -08:00 |
|
SamGondelman
|
6765268998
|
Merge remote-tracking branch 'upstream/master' into wearables
|
2019-02-19 16:52:00 -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 |
|
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 |
|
danteruiz
|
4bbae1230d
|
making requested chantges
|
2019-02-19 10:07:36 -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
|
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 |
|
SamGondelman
|
06ac2b291b
|
attachments and wearables cull with avatar parent
|
2019-02-17 17:52:10 -08:00 |
|
SamGondelman
|
935d827421
|
try to cull wearables with avatars
|
2019-02-17 02:10:25 -08:00 |
|
SamGondelman
|
1163cbea70
|
improving web surface interaction and tablet hiding
|
2019-02-16 22:03:55 -08:00 |
|
SamGondelman
|
85421cd6ee
|
speed up stylus picks
|
2019-02-16 21:16:46 -08:00 |
|
SamGondelman
|
7677e3bf44
|
just in case
|
2019-02-16 20:41:57 -08:00 |
|
SamGondelman
|
71653f95d7
|
working on overlay bugs
|
2019-02-16 20:08:36 -08:00 |
|
Sam Gondelman
|
c8ab7ac37f
|
fix bad copy
|
2019-02-16 18:08:05 -08:00 |
|
SamGondelman
|
d50904dd4a
|
fix avatar deadlock
|
2019-02-15 17:08:24 -08:00 |
|
SamGondelman
|
3e3bd2ffd8
|
fix transform properties not changing
|
2019-02-15 16:57:29 -08:00 |
|
Howard Stearns
|
e9b323a807
|
fix HFC symbol location at checkout, and the display of unavailable items
|
2019-02-15 16:56:31 -08:00 |
|
SamGondelman
|
6bf1545285
|
fix build error
|
2019-02-15 16:44:28 -08:00 |
|
danteruiz
|
b00746c096
|
Trim picks in use during quest:
|
2019-02-15 16:24:17 -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 |
|
Howard Stearns
|
f16eb1c029
|
Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory
|
2019-02-15 15:15:13 -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 |
|
SamGondelman
|
3df231f1e0
|
it's working!
|
2019-02-15 14:43:22 -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 |
|
SamGondelman
|
c92b82e744
|
merge with master
|
2019-02-15 12:43: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 |
|
SamGondelman
|
87ab255115
|
finish moving materials to rendering
|
2019-02-15 11:49:20 -08: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 |
|