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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Zach Fox
|
be39874999
|
Changes after discussion with Brad
|
2017-05-25 13:01:40 -07:00 |
|
Zach Fox
|
f6195cdb1e
|
Committing checkpoint changes, then testing
|
2017-05-25 13:01:40 -07:00 |
|
Zach Fox
|
0ef507c037
|
Revert 'dynamicChanged' to be a 'misc' physics property
|
2017-05-25 13:01:40 -07:00 |
|
Zach Fox
|
acd85b379f
|
Make this PR a protocol change
|
2017-05-25 13:01:40 -07:00 |
|
Zach Fox
|
4d791211ee
|
Make the changes - big thanks to Andrew!
|
2017-05-25 13:01:40 -07:00 |
|
Atlante45
|
ea870881ee
|
Log warning when we detect a connection loop
|
2017-05-25 12:48:21 -07:00 |
|
samcake
|
6dbbd6c8d0
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-05-25 11:25:46 -07:00 |
|
Atlante45
|
babae456d2
|
Fix infinite loop in fbx reader
|
2017-05-25 10:42:33 -07:00 |
|
Clément Brisset
|
aa4059eb05
|
Merge pull request #10503 from birarda/bake-textures
update baking tool to enable compression and re-baking
|
2017-05-25 10:38:23 -07:00 |
|
Seth Alves
|
de40604042
|
whitespace
|
2017-05-25 09:54:40 -07:00 |
|
Seth Alves
|
80e641b6d4
|
fix code that was using old raypickInfo.properties field
|
2017-05-25 09:47:02 -07:00 |
|
Brad Davis
|
65c4d31676
|
Merge pull request #10543 from jherico/mip_data_crash
Do not allow divide by zero on assigning mip data
|
2017-05-25 09:30:27 -07:00 |
|
seefo
|
da41b5dc00
|
Focus is now changed when adding a new list item in DS settings
|
2017-05-25 09:20:04 -07:00 |
|
Brad Hefta-Gaub
|
a0484c5f0b
|
Merge pull request #10544 from birarda/bug/refresh-access-token
require a valid access token and expiry to attempt token refresh
|
2017-05-25 08:35:18 -07:00 |
|
Brad Hefta-Gaub
|
ca87b792de
|
Merge pull request #10531 from Atlante45/fix/current-address
Never store an address with an empty host
|
2017-05-25 08:33:16 -07:00 |
|
Brad Hefta-Gaub
|
23af6294ab
|
Merge pull request #10521 from sethalves/fix-locked-in-motion
if something is locked but in motion, make it kinematic rather than static
|
2017-05-25 08:32:30 -07:00 |
|
Brad Hefta-Gaub
|
5af95c8fdf
|
Merge pull request #10476 from sethalves/fix-imported-children-querybox
fix up queryAACubes before sending imported entities to server
|
2017-05-25 08:29:23 -07:00 |
|
Brad Hefta-Gaub
|
756e00e9a9
|
Merge pull request #10502 from kencooke/audio-noisegate-new
Advanced noise gate
|
2017-05-25 08:21:49 -07:00 |
|
volansystech
|
cab6f3f7c3
|
Solve Jitteriness while scrolling.
|
2017-05-25 17:28:19 +05:30 |
|
volansystech
|
aab80629ea
|
Merge branch 'master' into Wl-21298
|
2017-05-25 15:44:17 +05:30 |
|
Sam Cake
|
3eb95d2d19
|
cleaning the commented code
|
2017-05-25 01:16:45 -07:00 |
|
Atlante45
|
05f69ade32
|
Never store an address with an empty host
|
2017-05-24 17:39:27 -07:00 |
|
samcake
|
575d4abdf7
|
bad include fixed maybe
|
2017-05-24 17:25:21 -07:00 |
|