Sam Cake
|
d19956f93c
|
Fixing warnings
|
2017-05-31 22:02:47 -07:00 |
|
David Kelly
|
c29091f0b1
|
Merge pull request #10582 from davidkelly/dk/4996
remove extra activity logger call
|
2017-05-31 15:18:17 -07:00 |
|
David Kelly
|
e1700915f7
|
remove extra activity logger call
|
2017-05-31 13:28:57 -07:00 |
|
Howard Stearns
|
b552566bf8
|
Merge pull request #10580 from manapa01/Default-Discoverability-Mode
Changed the DEFAULT_DISCOVERABILITY_MODE to Connections
|
2017-05-31 13:00:15 -07:00 |
|
Seth Alves
|
e80704f3c9
|
Merge pull request #10578 from thoys/fix/grabableDynamic
Edit.js: Fix hidden dynamic property while clone-able is active
|
2017-05-31 12:54:36 -07:00 |
|
Zach Fox
|
8d02a93727
|
Merge pull request #10576 from zfox23/snapshot_AddErrorImage
Add placeholder image when previous snapshot can't be loaded
|
2017-05-31 11:19:32 -07:00 |
|
Thijs Wenker
|
5c5aaf3254
|
Fix hidden dynamic property whenever the item is clone-able / DRYing propertyUpdates
|
2017-05-31 20:18:42 +02:00 |
|
Patrick Manalich
|
7b69a5dbd5
|
Changed the DEFAULT_DISCOVERABILITY_MODE to Connections
|
2017-05-31 10:46:04 -07:00 |
|
Zach Fox
|
0441d8c703
|
Add placeholder image when previous snapshot can't be loaded
|
2017-05-31 10:27:17 -07:00 |
|
Ryan Huffman
|
4a52f4090d
|
Merge pull request #10552 from huffman/fix/multiple-nic-lockup
Fix SendQueue not setting lastReceiverResponse when recv handshake ack
|
2017-05-30 13:05:01 -07:00 |
|
Stephen Birarda
|
9fa900bac8
|
Merge pull request #10568 from thoys/fix-doc-headers
Fix markdown headers
|
2017-05-30 12:29:27 -07:00 |
|
Thijs Wenker
|
68ad8fa981
|
visual headers
|
2017-05-30 21:12:51 +02:00 |
|
Stephen Birarda
|
60125eb1d7
|
Merge pull request #10567 from highfidelity/openssl-win-installer-update
OpenSSL installer update
|
2017-05-30 12:03:20 -07:00 |
|
Thijs Wenker
|
1ea3b2b7f4
|
let headers be headers
|
2017-05-30 21:01:42 +02:00 |
|
Thijs Wenker
|
1339516177
|
OpenSSL installer update
|
2017-05-30 20:56:45 +02:00 |
|
Stephen Birarda
|
41716ec56b
|
Merge pull request #10554 from seefo/master
Moved audio asset processing to a separate thread
|
2017-05-30 10:44:53 -07:00 |
|
Seth Alves
|
250e381ea7
|
Merge pull request #10563 from Atlante45/fix/reset-settings
Fix "retain avatar info"
|
2017-05-30 10:00:55 -07:00 |
|
Seth Alves
|
66415dadc6
|
Merge pull request #10496 from volansystech/Wl-21298
Solve Jitteriness when scrolling the content in HMD mode -> Marketplace using the scrollbar.
|
2017-05-27 08:28:19 -07:00 |
|
Sam Gateau
|
bc44a03e13
|
Merge pull request #10537 from samcake/brown
Fix the flickering and other lighting issues related to zone entities (part 1)
|
2017-05-26 18:22:56 -07:00 |
|
samcake
|
882df7391b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-05-26 16:47:49 -07:00 |
|
Chris Collins
|
fd3b6cdf1a
|
Merge pull request #10564 from birarda/bug/content-loading-always
fix progress bar / stats reference to pending transfer count
|
2017-05-26 15:29:06 -07:00 |
|
Stephen Birarda
|
6c2758e4ea
|
fix reference to pending transfer count for progress/stats
|
2017-05-26 14:37:24 -07:00 |
|
Atlante45
|
ccc7cb638d
|
Fix "retain avatar info"
|
2017-05-26 14:18:29 -07:00 |
|
Stephen Birarda
|
cfbbf3183a
|
Merge pull request #10560 from birarda/bug/zfox-teeth
fix issue with textures with alpha as a mask
|
2017-05-26 13:11:02 -07:00 |
|
seefo
|
1d29610dbb
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2017-05-26 12:49:56 -07:00 |
|
Brad Davis
|
952d3629ec
|
Merge pull request #10559 from jherico/fix_compressed_ktx_loading
Fix compressed KTX loading
|
2017-05-26 12:46:11 -07:00 |
|
Stephen Birarda
|
07440e325f
|
fix force of BC3 instead of BC1a compression
|
2017-05-26 12:04:35 -07:00 |
|
seefo
|
cc57d28ccc
|
Made requested changes to PR10554
|
2017-05-26 11:49:43 -07:00 |
|
Brad Davis
|
f663573f19
|
Fix compressed KTX loading
|
2017-05-26 11:25:15 -07:00 |
|
Anthony Thibault
|
84901ba94b
|
Merge pull request #10542 from druiz17/arm-pucks
Added pucks calibration for upper arm/shoulders
|
2017-05-26 11:17:15 -07:00 |
|
seefo
|
90d5b2a6d4
|
Removed SoundProcessor's dependence on Sound objects
|
2017-05-26 10:32:34 -07:00 |
|
seefo
|
74f0ac5b78
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2017-05-26 09:13:20 -07:00 |
|
Dante Ruiz
|
d317d9236f
|
made requested changes
|
2017-05-26 16:40:21 +01:00 |
|
volansystech
|
8d9cfbdf31
|
Resolve comments of @sethalves . Remove whitespaces.
|
2017-05-26 11:41:35 +05:30 |
|
Clément Brisset
|
efe72e1b85
|
Merge pull request #10530 from Atlante45/fix/default-scripts
Ensure user never loses its running scripts
|
2017-05-25 18:33:11 -07:00 |
|
seefo
|
0e4fbe01dc
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2017-05-25 17:04:03 -07:00 |
|
seefo
|
32b5ac5020
|
Moved audio asset processing to a separate thread
|
2017-05-25 16:10:53 -07:00 |
|
Sam Gateau
|
5b0d2f32b4
|
Merge pull request #10458 from jherico/ktx_validation
Add KTX validation routines
|
2017-05-25 16:02:23 -07:00 |
|
Brad Davis
|
aa5aba428a
|
PR feedback
|
2017-05-25 15:03:39 -07:00 |
|
Seth Alves
|
f474361a7e
|
Merge pull request #10549 from seefo/master
Focus is now changed when adding a new list item in DS settings
|
2017-05-25 14:47:07 -07:00 |
|
Zach Fox
|
6616a85be0
|
Merge pull request #10534 from zfox23/fixCollisionSignalEmission
Fix collision signal emission for static objects
|
2017-05-25 14:43:07 -07:00 |
|
Brad Hefta-Gaub
|
54bca1e53d
|
Merge pull request #10551 from Atlante45/fix/infinite-loop
Prevent Infinite loop in FBXReader
|
2017-05-25 14:25:06 -07:00 |
|
Dante Ruiz
|
cce19f7027
|
removed unnessary code
|
2017-05-25 22:07:51 +01:00 |
|
Dante Ruiz
|
6687b99391
|
Merge branch 'master' of github.com:highfidelity/hifi into arm-pucks
|
2017-05-25 21:59:18 +01:00 |
|
Dante Ruiz
|
108c444cc7
|
clean up code
|
2017-05-25 21:59:06 +01:00 |
|
Ryan Huffman
|
f0c3a0ac28
|
Fix SendQueue not updating lastReceiverResponse when recv handshake ack
|
2017-05-25 13:39:47 -07:00 |
|
Seth Alves
|
a062c964a9
|
Merge pull request #10550 from sethalves/fix-grab-raypick-props-crash
fix code that was using old raypickInfo.properties field
|
2017-05-25 13:27:19 -07:00 |
|
samcake
|
cba913c068
|
Fixing the case when the bound changes without the rest of the properties
|
2017-05-25 13:01:54 -07:00 |
|
Zach Fox
|
f2fab57187
|
Update conditional to handle 'other unowned' case
|
2017-05-25 13:01:40 -07:00 |
|
Zach Fox
|
b86b07c08f
|
Pull out ownership bidding changes
|
2017-05-25 13:01:40 -07:00 |
|