Brad Davis
|
817c24dd0b
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-20 09:51:03 -08:00 |
|
Brad Davis
|
122a246d2d
|
Fix typo
|
2019-02-19 17:30:47 -08:00 |
|
Shannon Romano
|
07d084d086
|
Merge pull request #14937 from SamGondelman/pal
Case 21259: Pal textures don't change
|
2019-02-19 17:14:15 -08:00 |
|
Brad Davis
|
518e480a8b
|
Fix plugin activation
|
2019-02-19 17:00:50 -08:00 |
|
danteruiz
|
d1c46e1cdc
|
fixing tablet pointer issues
|
2019-02-19 14:48:17 -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 |
|
Brad Davis
|
d60dcb99d2
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-19 12:37:30 -08:00 |
|
SamGondelman
|
2986ca20c5
|
Merge remote-tracking branch 'upstream/master' into pal
|
2019-02-19 11:31:40 -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 |
|
SamGondelman
|
927e824610
|
fix missing color for text overlays
|
2019-02-18 16:14:07 -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
|
71653f95d7
|
working on overlay bugs
|
2019-02-16 20:08:36 -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 |
|
danteruiz
|
b00746c096
|
Trim picks in use during quest:
|
2019-02-15 16:24:17 -08:00 |
|
SamGondelman
|
0f33d696d2
|
trying to fix pal colors
|
2019-02-15 16:12:36 -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 |
|
SamGondelman
|
3df231f1e0
|
it's working!
|
2019-02-15 14:43:22 -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 |
|
Brad Davis
|
578bc4fc89
|
Suppress logspam with missing Controller in QML
|
2019-02-15 14:15:24 -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 |
|
Brad Davis
|
78be935e1a
|
Consolidating differences from master
|
2019-02-15 14:12:37 -08:00 |
|
Brad Davis
|
4409e59682
|
Add per-android-app preprocessor macros
|
2019-02-15 14:11:26 -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 |
|
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 |
|
SamGondelman
|
c92b82e744
|
merge with master
|
2019-02-15 12:43:30 -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 |
|
Brad Davis
|
a5f84ab51a
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-15 11:37:13 -08:00 |
|
Roxanne Skelly
|
fb524f8900
|
Merge branch 'QmlMarketplace' of https://github.com/roxanneskelly/hifi into QmlMarketplace
|
2019-02-15 11:35:06 -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 |
|
SamGondelman
|
25b31cfc72
|
merge with master
|
2019-02-15 11:08:24 -08:00 |
|
Howard Stearns
|
490ef3542e
|
update for marketplace-in-qml, and make specific to username
|
2019-02-15 10:58:09 -08:00 |
|
Brad Davis
|
0b171ffe13
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-15 10:31:04 -08:00 |
|
Howard Stearns
|
8a6f2b221b
|
Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory
|
2019-02-15 09:47:18 -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 |
|
Howard Stearns
|
30c0dda9ed
|
Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory
|
2019-02-15 09:27:48 -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 |
|
Ryan Huffman
|
ab5c4a927b
|
Fix asset browser being hidden in incorrect way on server switch
|
2019-02-14 22:18:42 -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 |
|
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 |
|
Anthony Thibault
|
a3407b96b0
|
Merge branch 'master' into bug-fix/revert-anim-pose-optimization
|
2019-02-14 16:56:17 -08:00 |
|