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 |
|
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 |
|
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
|
6687b99391
|
Merge branch 'master' of github.com:highfidelity/hifi into arm-pucks
|
2017-05-25 21:59:18 +01:00 |
|
Andrew Meadows
|
c22e4ef883
|
rename method to clarify where it is called
|
2017-05-25 13:48:19 -07:00 |
|
Andrew Meadows
|
5378cbead6
|
make ObjectMotionState dtor virtual
|
2017-05-25 13:47:03 -07:00 |
|
Ryan Huffman
|
f0c3a0ac28
|
Fix SendQueue not updating lastReceiverResponse when recv handshake ack
|
2017-05-25 13:39:47 -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 |
|
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 |
|
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 |
|
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 |
|
samcake
|
044110e4f3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-05-24 15:40:40 -07:00 |
|
Stephen Birarda
|
9cd11a32e2
|
add a debug log for failed token refresh
|
2017-05-24 13:47:24 -07:00 |
|
Stephen Birarda
|
14ff6a06b4
|
require a valid access token and expiry to attempt refresh
|
2017-05-24 13:16:26 -07:00 |
|
Brad Davis
|
6490c52245
|
Do not allow divide by zero on assigning mip data
|
2017-05-24 13:02:54 -07:00 |
|
Dante Ruiz
|
8cb9bfcc81
|
fixed merge conflict
|
2017-05-24 19:35:41 +01:00 |
|
Dante Ruiz
|
0fdf136251
|
got the shoulders working
|
2017-05-24 19:31:48 +01:00 |
|
Brad Davis
|
191b633081
|
Refactor KTX defines and validation
|
2017-05-24 11:15:34 -07:00 |
|
Sam Gateau
|
f9c6cecb23
|
Merge pull request #10529 from samcake/ambient
Fix compressed texture size evaluation and Cleaning up the texture counters (number and memory) for better reporting
|
2017-05-24 10:48:21 -07:00 |
|
Brad Davis
|
077e56a96f
|
Add KTX validation routines
|
2017-05-24 09:44:56 -07:00 |
|
anshuman64
|
2b63eb9d90
|
Merge pull request #10469 from druiz17/improve-rotation-jitter
Added a LowVelocityFilter to the input system.
|
2017-05-24 08:35:13 -07:00 |
|
Chris Collins
|
f8b92b6666
|
Merge pull request #10536 from misslivirose/fix/check-extension-running-scripts
Fix/check extension running scripts
|
2017-05-23 22:15:50 -07:00 |
|
samcake
|
c256893575
|
some clean up:
|
2017-05-23 18:00:22 -07:00 |
|
Ken Cooke
|
0fe404adbb
|
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noisegate-new
|
2017-05-23 17:31:03 -07:00 |
|
Dante Ruiz
|
ac3c9655ec
|
added arms
|
2017-05-24 01:28:08 +01:00 |
|
Ken Cooke
|
3d67978caa
|
Delete the old noise gate
|
2017-05-23 15:53:38 -07:00 |
|
Stephen Birarda
|
9cdd7cc895
|
fix model check for filenames with periods
|
2017-05-23 15:46:45 -07:00 |
|
Liv
|
b2bbf21fb0
|
style fixes
|
2017-05-23 15:21:21 -07:00 |
|
samcake
|
769655b354
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-05-23 14:45:37 -07:00 |
|
Liv
|
09c7a61599
|
Fix from string equals to contains to account for working formats not correctly detected with suffix
|
2017-05-23 14:42:07 -07:00 |
|
Ken Cooke
|
6b740e855d
|
Optimize the loudness computation
NOTES:
Loudness is now measured post-gating, for improved metering.
Keep original algorithm, since other code depends on loudness behavior.
|
2017-05-23 14:31:24 -07:00 |
|
Stephen Birarda
|
898433f42e
|
force BC3 instead of BC1a compression for alpha textures
|
2017-05-23 14:16:43 -07:00 |
|
samcake
|
f2f4ad28e8
|
removing comments not needed anymore
|
2017-05-23 14:16:42 -07:00 |
|
samcake
|
2be1e36c47
|
fixing the gl41 bug
|
2017-05-23 14:14:45 -07:00 |
|
Seth Alves
|
83b3896c88
|
Merge pull request #10524 from huffman/fix/scriptengine-thread-crash
Fix crash in entity ScriptEngine
|
2017-05-23 14:01:42 -07:00 |
|
Liv
|
86dc478dbb
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fix/check-extension-running-scripts
|
2017-05-23 13:57:41 -07:00 |
|
Liv
|
3340211455
|
Cleanup and better error handling
|
2017-05-23 13:54:38 -07:00 |
|
Liv
|
e9fac38bbb
|
Add function hasValidScriptSuffix and check if script extensions are JavaScript or JSON files
|
2017-05-23 13:08:50 -07:00 |
|
Ken Cooke
|
a6a29786ae
|
Cleanup
|
2017-05-23 12:53:39 -07:00 |
|
Ken Cooke
|
8608695695
|
Remove old noise gate
|
2017-05-23 12:52:29 -07:00 |
|
Ken Cooke
|
175d1be7ca
|
Implement state-machine to detect gate opening/closing. Fixes bugs with mute.
|
2017-05-23 12:32:41 -07:00 |
|
samcake
|
e7b808cbc1
|
Merging with upstream
|
2017-05-23 12:12:31 -07:00 |
|
samcake
|
542ec3dc46
|
More clean up per review request
|
2017-05-23 11:36:06 -07:00 |
|
Ken Cooke
|
850dbd76c9
|
Integrate new noise gate
|
2017-05-23 11:12:36 -07:00 |
|
Clément Brisset
|
499897e271
|
Merge pull request #10533 from thoys/fix/attachment-scale
Attachment Scale fix (Breaks previous set attachment scales)
|
2017-05-23 10:59:54 -07:00 |
|
Ken Cooke
|
986d86ec17
|
Fix nasty preexisting bug in computing numSamples, where sizeof(SAMPLE_SIZE) incorrectly returns 4 instead of 2.
|
2017-05-23 10:29:43 -07:00 |
|
Dante Ruiz
|
0cbdeaa1e8
|
Merge branch 'master' of github.com:highfidelity/hifi into arm-pucks
|
2017-05-23 18:26:58 +01:00 |
|
Dante Ruiz
|
54d63f5155
|
Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter
|
2017-05-23 18:19:38 +01:00 |
|
Anthony J. Thibault
|
06c26f029a
|
Merge branch 'master' into feature/faster-ik-iterations
|
2017-05-23 09:10:17 -07:00 |
|
Thijs Wenker
|
712aff7ad6
|
base scale attachment on the natural dimensions
|
2017-05-23 17:53:08 +02:00 |
|
Ken Cooke
|
71de3d5ca1
|
Instantiate new gate with the correct number of channels
|
2017-05-23 08:40:15 -07:00 |
|
Sam Cake
|
2301954d62
|
fixing the Populated metric
|
2017-05-22 23:40:23 -07:00 |
|
Sam Cake
|
7f9c98a922
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
|
2017-05-22 22:54:43 -07:00 |
|
Chris Collins
|
207c13c3c3
|
Merge pull request #10528 from AndrewMeadows/payload-gets-weak-pointer
MeshPartPayload keeps weak pointer to Model
|
2017-05-22 21:54:40 -07:00 |
|
Chris Collins
|
978eb0dfa9
|
Merge pull request #10492 from ctrlaltdavid/21359
Fix eye behavior in recording playback
|
2017-05-22 21:53:13 -07:00 |
|
Chris Collins
|
b0efb6d956
|
Merge pull request #10525 from seefo/master
Added refreshing of Account Managers access token
|
2017-05-22 21:42:16 -07:00 |
|
Atlante45
|
10eb353126
|
Ensure user never loses its running scripts
|
2017-05-22 18:55:58 -07:00 |
|
Sam Gateau
|
e4a516dcbf
|
Merge pull request #10497 from AndrewMeadows/crashfix-null-rig
fix crash for Zone with 'compoundURL' property
|
2017-05-22 18:18:08 -07:00 |
|
Brad Hefta-Gaub
|
3aeb8ae5e1
|
Merge pull request #10526 from birarda/bug/entity-server-script-whitelist
make server entity scripts respect the script whitelist
|
2017-05-22 17:58:04 -07:00 |
|
Liv
|
1fa3e6bda2
|
Revert "Initial check that the script url has a supported extension, currently JS only"
This reverts commit d50bdd6aa9.
|
2017-05-22 17:47:16 -07:00 |
|
Liv
|
0e6f3e27d3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into check-extension-running-scripts
|
2017-05-22 17:41:28 -07:00 |
|
samcake
|
653abf0ee3
|
brining the new counters to 4.1
|
2017-05-22 17:34:06 -07:00 |
|
Andrew Meadows
|
f7db877b7f
|
payload keeps weak pointer to Model
|
2017-05-22 17:29:15 -07:00 |
|
seefo
|
a638704a8c
|
Modified AccountManager code to better meet style guidelines
|
2017-05-22 17:01:37 -07:00 |
|
Liv
|
d50bdd6aa9
|
Initial check that the script url has a supported extension, currently JS only
|
2017-05-22 16:53:41 -07:00 |
|
samcake
|
e0487f7e04
|
Solving the size evaluation for compressed format
|
2017-05-22 16:51:54 -07:00 |
|
Brad Davis
|
3995f539cf
|
Merge pull request #10500 from Atlante45/feat/bc7
Add BC7 compression support
|
2017-05-22 16:47:27 -07:00 |
|
Dante Ruiz
|
d98e7d5bc6
|
adding left and right arm
|
2017-05-23 00:26:12 +01:00 |
|
Stephen Birarda
|
cecbf43129
|
make server entity scripts respect script whitelist
|
2017-05-22 16:17:01 -07:00 |
|