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
|
1b8bd016fe
|
Merge branch 'master' of github.com:highfidelity/hifi into arm-pucks
|
2017-05-26 17:03:05 +01: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 |
|
David Rowe
|
8a659955cc
|
Delete old script
|
2017-05-26 13:02:26 +12:00 |
|
David Rowe
|
b1280ff810
|
Implement start/stop and reset button actions
|
2017-05-26 13:02:05 +12:00 |
|
David Rowe
|
f25a9dcede
|
Add entities to capture stopwatch button clicks
|
2017-05-26 13:01:19 +12: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 |
|
Andrew Meadows
|
971855e6bf
|
add asserts to catch dangling pointers sooner
|
2017-05-25 14:29:14 -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
|
ce52494650
|
Merge branch 'master' of github.com:highfidelity/hifi into head-puck
|
2017-05-25 22:13:18 +01: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 |
|
Andrew Meadows
|
c22e4ef883
|
rename method to clarify where it is called
|
2017-05-25 13:48:19 -07:00 |
|
Andrew Meadows
|
3bd0c111d7
|
verify empty ShapeManager in Application dtor
|
2017-05-25 13:47:40 -07:00 |
|
Andrew Meadows
|
5378cbead6
|
make ObjectMotionState dtor virtual
|
2017-05-25 13:47:03 -07:00 |
|
Dante Ruiz
|
8538c700b5
|
saving head work
|
2017-05-25 21:41:41 +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 |
|
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 |
|
seefo
|
967148e3bf
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2017-05-25 09:32:34 -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 |
|