NissimHadar
|
e5f3bae746
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2018-10-24 15:51:35 -07:00 |
|
sam gateau
|
36f2b3543c
|
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
|
2018-10-24 15:50:05 -07:00 |
|
David Back
|
a88678fb70
|
fix bad css merge, add particle property debounce
|
2018-10-24 15:07:47 -07:00 |
|
Seth Alves
|
4d34b12f06
|
rather than do checkDevices to find new audio devices every 2 seconds, do each check 2 seconds after the previous one has completed. This is done to avoid swamping the thread pool when the check takes a long time
|
2018-10-24 14:00:23 -07:00 |
|
Simon Walton
|
b6f259fc42
|
Fix incorrect merge-resolution
|
2018-10-24 13:17:45 -07:00 |
|
luiscuenca
|
b8cd5045c7
|
Extra joints on soft entities keep their local transform
|
2018-10-24 12:54:09 -07:00 |
|
Howard Stearns
|
1ff50bc05e
|
updates notification applies to assets, and there is no wallet activity
notification
|
2018-10-24 12:45:17 -07:00 |
|
SamGondelman
|
a3c42363cc
|
please for the love of god
|
2018-10-24 12:43:01 -07:00 |
|
David Back
|
5c1972e3f4
|
fix fallback properties
|
2018-10-24 12:40:44 -07:00 |
|
Simon Walton
|
e22e0ecb04
|
Merge branch 'master' into avatar-mixer-improvements
|
2018-10-24 10:39:23 -09:00 |
|
Howard Stearns
|
e1e9b78427
|
filter priced items from marketplace
|
2018-10-24 12:22:03 -07:00 |
|
Howard Stearns
|
993cb0cfa0
|
restore separation of inventory vs proofs.
|
2018-10-24 12:00:17 -07:00 |
|
David Back
|
b3e0d51260
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor
|
2018-10-24 11:48:56 -07:00 |
|
Howard Stearns
|
8ee6a0ceff
|
disable priced items
|
2018-10-24 11:37:02 -07:00 |
|
David Back
|
5729d35c48
|
Merge pull request #14198 from dback2/entityListTypeFilter
Entity list type filter and X to clear search
|
2018-10-24 11:27:50 -07:00 |
|
Luis Cuenca
|
fac9188dfb
|
Merge pull request #14187 from luiscuenca/transitAddAnimation
Add animations to Avatar Transit
|
2018-10-24 10:51:21 -07:00 |
|
Howard Stearns
|
ce20b82408
|
fix view this item in my purchases
|
2018-10-24 10:41:14 -07:00 |
|
David Back
|
073040d1fc
|
Merge branch 'master' into entityListTypeFilter
|
2018-10-24 10:39:30 -07:00 |
|
Ryan Huffman
|
6221b9ee59
|
Merge pull request #14149 from thoys/feat/create/entityList-autoScroll
MS19054: [CreateApp/EntityList] auto scroll
|
2018-10-24 10:36:21 -07:00 |
|
Howard Stearns
|
e61dd7dbc1
|
Merge pull request #14253 from roxanneskelly/Case19446
Case 19446 - Update via Sandbox Popup -- opens Old Interface
|
2018-10-24 10:02:13 -07:00 |
|
Brad Hefta-Gaub
|
f8e38e98e1
|
Merge pull request #14214 from huffman/feat/edit-defaults
Update default entity properties in Create
|
2018-10-24 10:00:46 -07:00 |
|
Brad Hefta-Gaub
|
5e27a5930e
|
Merge pull request #14186 from thoys/feat/create/entityList-contextMenu
MS19056: [CreateApp/Entity List] Context Menu
|
2018-10-24 09:58:32 -07:00 |
|
Howard Stearns
|
c1cb41875a
|
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
|
2018-10-24 09:56:37 -07:00 |
|
Brad Hefta-Gaub
|
01d41da574
|
Merge pull request #14268 from gcalero/dont_show_stats
Don't show stats in release builds
|
2018-10-24 09:50:10 -07:00 |
|
Thijs Wenker
|
5f35a32480
|
remove duplicate calls to refresh footer
|
2018-10-24 17:58:07 +02:00 |
|
Thijs Wenker
|
8e1cfb5a06
|
fix double click selection
|
2018-10-24 17:58:07 +02:00 |
|
Thijs Wenker
|
776b8b8fc7
|
CR and style fixes
|
2018-10-24 17:58:06 +02:00 |
|
Thijs Wenker
|
27e0c85b01
|
entity list auto scroll
|
2018-10-24 17:58:06 +02:00 |
|
Gabriel Calero
|
28c062b842
|
Don't show stats in release builds
|
2018-10-24 11:57:59 -03:00 |
|
unknown
|
c7ba386be1
|
darn prints somehow slipping past me
|
2018-10-23 20:56:53 -07:00 |
|
unknown
|
06aff231a3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor
|
2018-10-23 20:19:06 -07:00 |
|
David Back
|
2b9dcd0875
|
fix particle properties and keylight direction, remove columns, fix orderings, fix sliders
|
2018-10-23 18:38:05 -07:00 |
|
Howard Stearns
|
7707d92a95
|
connect wiring on purchases
|
2018-10-23 16:07:35 -07:00 |
|
Simon Walton
|
0a78eeaf1a
|
Merge branch 'master' into avatar-mixer-improvements
|
2018-10-23 15:56:56 -07:00 |
|
Zach Fox
|
d1556ae4e8
|
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
|
2018-10-23 15:51:34 -07:00 |
|
Zach Fox
|
8395132830
|
Attempt to resolve final warnings
|
2018-10-23 15:45:29 -07:00 |
|
NissimHadar
|
a9186f0122
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2018-10-23 15:39:46 -07:00 |
|
John Conklin II
|
daa13b3706
|
Merge pull request #14193 from misslivirose/rc75-tutorial
Tutorial: bug 18725 & New Menu Content
|
2018-10-23 15:21:29 -07:00 |
|
John Conklin II
|
e21e7d30d7
|
Merge pull request #14126 from amantley/squattyPottyFix
Sit State for the seated user in HMD: Squatty Potty Fix
|
2018-10-23 15:20:49 -07:00 |
|
Kerry Ivan Kurian
|
3cf000a71b
|
Merge pull request #14232 from kkurian/log-resource-requests-2
Display resource-access events in marketplace item tester
|
2018-10-23 15:18:30 -07:00 |
|
John Conklin II
|
7019439356
|
Merge pull request #14260 from SamGondelman/resourceCrash
Fix ResourceCache crash on shutdown
|
2018-10-23 15:03:55 -07:00 |
|
Stephen Birarda
|
b789fa96f8
|
Merge pull request #14192 from Atlante45/fix/traits-race
Prevent race on internal client traits members
|
2018-10-23 14:53:11 -07:00 |
|
Roxanne Skelly
|
10ee5ac5b4
|
URL protocol returns the protocol string with the ':' attached
(how did this work before?!)
|
2018-10-23 14:46:13 -07:00 |
|
Brad Hefta-Gaub
|
04d251c321
|
Merge pull request #14249 from wayne-chen/mergedInterstitialBugFixes
Merged interstitial bug fixes
|
2018-10-23 14:30:55 -07:00 |
|
Stephen Birarda
|
061f86e550
|
Merge pull request #14051 from birarda/feat/improve-sock-addr-belongs
consider all node sockets in sockAddrBelongsToNode
|
2018-10-23 14:21:42 -07:00 |
|
Alexia Mandeville
|
68ab5475fe
|
Remove duplicate display crash options
|
2018-10-23 14:13:09 -07:00 |
|
sam gateau
|
4565422876
|
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
|
2018-10-23 14:02:15 -07:00 |
|
Kerry Ivan Kurian
|
e7d1c2873a
|
Merge branch 'master' into log-resource-requests-2
|
2018-10-23 13:46:59 -07:00 |
|
Thijs Wenker
|
4e9f9b3edf
|
comply with copy/paste update
|
2018-10-23 22:42:56 +02:00 |
|
Thijs Wenker
|
3fa4ee0e1d
|
enable duplicate copy cut paste functionality of context menu
|
2018-10-23 22:42:55 +02:00 |
|