seefo
74f0ac5b78
Merge branch 'master' of https://github.com/highfidelity/hifi
2017-05-26 09:13:20 -07:00
Liv
06a5467b50
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/add-primitive-shapes
2017-05-26 09:10:50 -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
Liv
10408a0fe4
basic circle function to be used as base for torus
2017-05-25 15:32:49 -07:00
Seth Alves
3c90177421
Merge branch 'master' of github.com:highfidelity/hifi into head-controller
2017-05-25 15:14:14 -07:00
Seth Alves
af5ba3a90a
ask display-plugins if they are head-controllers
2017-05-25 15:14:10 -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
Liv
fee26c3976
Remove not yet implemented comment from Cone shape
2017-05-25 13:12:08 -07:00
Liv
ffbe39df0a
Refactor to add optional conical parameter to existing extrude polygon function
2017-05-25 13:06:24 -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
Liv
d3e900e42f
Adding first pass on cone shape
2017-05-25 12:54:49 -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
Liv
417d9ec80b
Surface cylinder option for primitive shape to html
2017-05-25 11:04:25 -07:00
Seth Alves
3823ece153
Merge branch 'master' of github.com:highfidelity/hifi into head-controller
2017-05-25 10:57:46 -07:00
Seth Alves
bdbc6ddcc1
change some code to look at head-controller position rather than hmd position
2017-05-25 10:50:41 -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
Liv
362e08a90d
Add extrudePolygon for cylinder
2017-05-25 10:23:28 -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
volansystech
a2851b5bcb
Put proper comments and indentation.
2017-05-25 18:47:59 +05:30
volansystech
8d51be644d
Merge branch 'master' into 21255
2017-05-25 17:48:48 +05:30
volansystech
1f24e38585
Initial Commit: Switching from Desktop mode to HMD [Oculus Rift] mode automatically when the user wear Oculus Rift.
2017-05-25 14:56:06 +05:30
Sam Cake
3eb95d2d19
cleaning the commented code
2017-05-25 01:16:45 -07:00
Stephen Birarda
d7b3ee9bcb
check for cached ATP assets in right place
2017-05-24 19:22:44 -07:00
Stephen Birarda
a04fc41e17
don't capture strong pointer to stat tracker
2017-05-24 17:54:07 -07:00
Stephen Birarda
c37fd335e1
track the number of local socket changes
2017-05-24 17:41:52 -07:00
Atlante45
05f69ade32
Never store an address with an empty host
2017-05-24 17:39:27 -07:00
Stephen Birarda
48c4db1ca4
nest the download stats so they are cleaner
2017-05-24 17:36:21 -07:00
samcake
575d4abdf7
bad include fixed maybe
2017-05-24 17:25:21 -07:00
Stephen Birarda
3743cd23b4
add detailed download stats for file/http/atp
2017-05-24 17:22:38 -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
Ryan Huffman
3c9205d0b2
Remove invalid comment and unnecessary check from ScriptEngine
...
This removes an invalid comment - waitTillDoneRunning is not only called
from the main thread - and remove a check to make sure thread() is not
null because it should no longer be deleted before ScriptEngine.
2017-05-22 15:46:43 -07:00
samcake
e4f9f2935e
Solving the size evaluation for compressed format
2017-05-22 15:42:18 -07:00
Ryan Huffman
09c98b3ac3
Fix ScriptEngine thread being deleted too early
...
The thread appeared to be deleted before waitTillDoneRunning was
finished. This is a speculative fix. This ensures that the QThread isn't
deleted until after the ScriptEngine is deleted.
2017-05-22 15:31:11 -07:00
David Rowe
9cb990a3aa
Simplify head simulation methods
2017-05-23 09:53:42 +12:00
Brad Davis
a5112ce52a
Merge pull request #10520 from jherico/texture_ping_pong
...
Prevent ping-ponging of texture quality when oversubscribed
2017-05-22 14:52:52 -07:00
seefo
e77e900812
Added refreshing of Account Manager's access token
...
Changed indentention style to match guidelines
2017-05-22 14:46:44 -07:00
David Rowe
9f83ca518f
Merge branch 'master' into 21359
2017-05-23 09:18:10 +12:00
Seth Alves
3825830fac
if something is locked but in motion, make it kinematic rather than static
2017-05-22 14:07:53 -07:00
anshuman64
bfb44693a3
Merge pull request #10482 from ctrlaltdavid/21361
...
Fix AC playback script not logging
2017-05-22 12:58:20 -07:00
samcake
f8c291ee78
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-22 10:56:00 -07:00
Brad Davis
afee753570
Prevent ping-ponging of texture quality when oversubscribed
2017-05-22 09:52:18 -07:00
Sam Cake
1f090d8148
Debugging the size problem and fixing the compression size evaluation
2017-05-22 01:00:34 -07:00
Seth Alves
4142d8c686
actions shouldn't change locked entities
2017-05-21 11:05:18 -07:00
Seth Alves
381de7a1e2
tabs
2017-05-21 08:42:53 -07:00
Atlante45
2928507e48
Fix "Reset Settings" window poping up every time
2017-05-21 08:37:17 -07:00
Seth Alves
c68efc2ed0
treat locked like other properties that affect simulation
2017-05-21 08:29:35 -07:00
Sam Cake
321f74c305
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-20 18:12:58 -07:00
Seth Alves
2512b39848
don't dirty motion-type if lock value isn't actually changing
2017-05-20 14:14:33 -07:00
Seth Alves
8f38ea8c6a
force locked entities to be static in bullet
2017-05-20 11:54:42 -07:00
Seth Alves
a442181859
remove some redundancy
2017-05-20 08:51:44 -07:00
samcake
56e9b1bb37
Adding the populated counter
2017-05-19 18:46:19 -07:00
samcake
c5b5aa93b1
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-19 18:13:42 -07:00
David Rowe
a279d581ae
Fix code order
2017-05-20 12:56:23 +12:00
samcake
c449229850
Cleaned up the counters for memory
2017-05-19 17:52:56 -07:00
Sam Gateau
589bcc19ce
Refining the shader for key and testing removing completely the code dealing with Zone lighting in the ENtityTreeREnderer
2017-05-19 17:50:19 -07:00
David Rowe
768415695d
Tidying
2017-05-20 12:43:47 +12:00
David Rowe
d9baa337d8
Fix call order
2017-05-20 12:41:50 +12:00
Seth Alves
a45b5599c9
Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox
2017-05-19 17:37:03 -07:00
Clément Brisset
6e89f7d2f9
Merge pull request #10512 from Atlante45/fix/running-marker
...
Fix "Reset Settings" window poping up every time
2017-05-19 17:36:00 -07:00
Seth Alves
40c8261111
Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox
2017-05-19 17:14:58 -07:00
Seth Alves
5c94147f40
children collision hulls appear to be in the right place, now
2017-05-19 17:09:42 -07:00
David Rowe
597312ff45
Reinstate missing guards
2017-05-20 12:08:01 +12:00
Clément Brisset
fa3ef25f3e
Merge pull request #10481 from marko8904/new_landing_in_welcome
...
changing the location in welcome to which a user is sent on the first run
2017-05-19 16:45:14 -07:00
Ryan Huffman
53a963726d
Add check for valid mutableData in assignMipData
2017-05-19 16:17:36 -07:00
Ryan Huffman
50f5ae6e77
Fix FileStorage to not close files after they are opened
...
This is particularly an issue with KTX file reading/writing where we do
both concurrently.
2017-05-19 16:17:24 -07:00
Ryan Huffman
d7d4ff1f82
Add notes to KtxStorage::maybeOpenFile
2017-05-19 16:17:08 -07:00
Andrew Meadows
f80e7a3743
less obfuscation
2017-05-19 15:58:54 -07:00
Andrew Meadows
bb4d366c40
use SmartPointer for Zone _model
2017-05-19 15:33:23 -07:00
Seth Alves
67f222cb3f
be more careful about fixing up entities which arrived before their parents
2017-05-19 15:19:16 -07:00
David Rowe
0d6513c7dc
Merge branch 'master' into 21359
2017-05-20 10:11:25 +12:00
Ryan Huffman
26247e8653
Add check for valid mutableData in assignMipData
2017-05-19 15:00:53 -07:00
Seth Alves
386c76545c
be more careful about fixing up entities which arrived before their parents
2017-05-19 14:21:05 -07:00
Seth Alves
54dafa0f83
be more careful about fixing up entities which arrived before their parents
2017-05-19 14:14:00 -07:00
Seth Alves
5c93dbd20d
be more careful about fixing up entities which arrived before their parents
2017-05-19 13:48:29 -07:00
Sam Gateau
36ac623e66
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-19 13:25:36 -07:00
Andrew Meadows
7b879a7964
Model has a Rig rather than a RigPointer
2017-05-19 13:24:16 -07:00
Seth Alves
936d0e2d50
be more careful about fixing up entities which arrived before their parents
2017-05-19 12:13:43 -07:00
Ryan Huffman
64bf5784e6
Fix FileStorage to not close files after they are opened
...
This is particularly an issue with KTX file reading/writing where we do
both concurrently.
2017-05-19 11:16:20 -07:00
Ryan Huffman
c36b85bb05
Add notes to KtxStorage::maybeOpenFile
2017-05-19 11:11:00 -07:00
Seth Alves
735e4b7d05
trying to get child collision hulls to be in the right place after import
2017-05-19 10:59:59 -07:00
Atlante45
c2e2682eff
Fix "Reset Settings" window poping up every time
2017-05-19 10:50:23 -07:00
Seth Alves
7220fe0ad8
set more physics flags dirty when an entity parent is found
2017-05-19 10:40:24 -07:00
Anthony J. Thibault
621d94eb91
removed temp comments
2017-05-19 10:38:16 -07:00
Marko Kudjerski
986d63cdbb
making sure that the first time landing in *welcome domain is updated for dev builds too
2017-05-19 10:17:02 -07:00
Marko Kudjerski
303bb05b3d
changing the location in welcome to which a user is sent on the first run
2017-05-19 10:17:02 -07:00
Seth Alves
77ce8a19cf
call entityChanged after settings flags
2017-05-19 10:11:02 -07:00
Seth Alves
0c12baa258
call entityChanged after settings flags
2017-05-19 09:57:42 -07:00
Seth Alves
99dfd9ded1
Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox
2017-05-19 08:26:02 -07:00
Ken Cooke
746b41e509
Fix typo in comments
2017-05-18 17:30:07 -07:00
Ken Cooke
205b9d4aec
Fix compiler warnings
2017-05-18 16:49:02 -07:00
Anthony J. Thibault
e99001d86c
debug draw ik chains, bug fix for flex coef on tips
...
And opened up hip constraints.
2017-05-18 16:29:55 -07:00
Ryan Huffman
72af4219b8
Merge pull request #10499 from huffman/fix/ktx-progressive-image-size
...
Fix ktx image size in progrssively loaded cubemaps
2017-05-18 15:26:52 -07:00
Andrew Meadows
17b6cf29df
check for valid resource pointer before use
2017-05-18 15:12:59 -07:00
Seth Alves
4007133423
collision hulls are still not always in the right place
2017-05-18 14:59:26 -07:00
Seth Alves
1b0eeb9c2c
try harder to put things in place when their parent entities are discovered
2017-05-18 14:35:39 -07:00
Ken Cooke
18ed3dd6ed
Remove debug code
2017-05-18 14:30:25 -07:00
Ken Cooke
6f2a84a084
Add stand-alone DC blocking filter
2017-05-18 14:26:35 -07:00
Ken Cooke
c1cd26b473
New log-domain noise gate with adaptive threshold
2017-05-18 14:21:56 -07:00
Zach Pomerantz
c5a0a1af2f
Merge pull request #10429 from zzmp/audio/close-device
...
Close audio device when switching outputs
2017-05-18 17:18:53 -04:00
Ken Cooke
106dd6ce6a
Fast fixed-point log2 approximation
2017-05-18 14:15:10 -07:00
Seth Alves
ef556fae9b
when an entity's parent wasn't known and then becomes known, patch up the rigid-body and the render-item bounds
2017-05-18 14:13:33 -07:00
Ken Cooke
cad9eeb8ba
Refactor the peak limiter (output is bit-exact)
2017-05-18 14:13:24 -07:00
David Rowe
3aebe96afe
Merge branch 'master' into 21359
2017-05-19 09:03:11 +12:00
Dante Ruiz
984f9e1ba5
Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter
2017-05-18 21:23:06 +01:00
Dante Ruiz
78f6d2e850
fix low velocity filter
2017-05-18 21:22:42 +01:00
Seth Alves
f35796259b
Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox
2017-05-18 13:20:50 -07:00
Seth Alves
ec02887ae6
attempt to get imported entities into the correct octree-element
2017-05-18 13:20:44 -07:00
Atlante45
a8b1a29a4a
Add support for BC7 compression
2017-05-18 13:11:41 -07:00
Sam Gateau
a9fcdce95a
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-18 13:08:35 -07:00
samcake
9c154122d3
Introdicing the format factor and merging with master becasue of protocol change...
2017-05-18 13:08:13 -07:00
samcake
396924b4a5
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-18 13:06:05 -07:00
Sam Gateau
b8a2b38fd5
Displaying the stack of zone components
2017-05-18 12:54:25 -07:00
Ryan Huffman
6d2d838510
Fix ktx image size in progrssively loaded cubemaps
...
The size being written was the full image size (size of all faces), when
it should have been the face size.
2017-05-18 11:46:14 -07:00
Anthony J. Thibault
87adeb0565
apply flexCoeff to tip of joint chain as well.
2017-05-18 11:26:49 -07:00
Anthony J. Thibault
abe19310da
WIP: checkpoint of ik changes
2017-05-18 11:26:48 -07:00
Andrew Meadows
8d3285f733
verify _rig is valid in Model::deleteGeometry()
2017-05-18 11:11:50 -07:00
David Kelly
c2b140cc03
Merge pull request #10489 from davidkelly/dk/sequenceNumberForAvatarIdentity
...
Switch from timestamp to sequence id for avatar identity
2017-05-18 10:09:42 -07:00
Sam Gateau
d9ad45bf4a
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-18 09:37:04 -07:00
samcake
2c6e10fbe1
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-18 09:21:02 -07:00
Seth Alves
b8567e0550
Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox
2017-05-18 09:10:58 -07:00
Dante Ruiz
90ddc16d09
add calibration data to filters
2017-05-18 17:07:28 +01:00
Brad Hefta-Gaub
fbc32e5ba1
Merge pull request #10485 from samcake/orange
...
Add protections when accessing the mip bytes of a texture when provided from a KtxStorage
2017-05-18 08:47:58 -07:00
Sam Cake
5edcc38eba
Polishing the scope shaders
2017-05-18 01:06:59 -07:00
David Rowe
f6c1fa4213
Merge branch 'master' into 21359
2017-05-18 16:40:20 +12:00
Brad Hefta-Gaub
014fd710de
Merge pull request #10490 from Atlante45/feat/settings-map
...
Enable Map/List storage in the settings
2017-05-17 21:24:04 -07:00
Seth Alves
b05cb4af3b
fix nan
2017-05-17 20:51:34 -07:00
David Rowe
26e390fa89
Tidy code setting head orientation
2017-05-18 13:55:06 +12:00
Zach Pomerantz
e8ab780899
include details in critical variantMap parsing error
2017-05-17 21:32:13 -04:00
samcake
80b6fd65ae
Cleaning up counters and naming schemes...
2017-05-17 18:31:28 -07:00
David Rowe
f00232ab6d
Fix avatar eyelids and blinking in recording playback
...
Reinstates conditions to not calculate eye movements if face / eye
trackers are connected; they're considered connected for recording
playback.
2017-05-18 13:30:29 +12:00
Sam Gateau
966afa1e4a
Adding the drawKeyLight shader
2017-05-17 18:26:49 -07:00
Sam Gateau
3e7795ec11
Adding the drawKeyLight shader
2017-05-17 18:23:47 -07:00
Sam Gateau
79f700e8ce
Adding the drawKeyLight shader
2017-05-17 18:12:48 -07:00
David Rowe
223b1a858b
Fix avatar eye look-at in recording playback
2017-05-18 12:27:31 +12:00
Howard Stearns
95111d24b2
Merge branch 'master' into dk/sequenceNumberForAvatarIdentity
2017-05-17 17:09:47 -07:00
Brad Hefta-Gaub
c07eb3e45e
Merge pull request #10471 from hyperlogic/feature/ik-flex-coeff
...
Flex and weight IK tuning parameters
2017-05-17 16:48:50 -07:00
Seth Alves
0dc355cf86
Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox
2017-05-17 16:43:50 -07:00
Brad Hefta-Gaub
93f3b2df45
Merge pull request #10491 from birarda/bug/bearer-timeout
...
disable the bearer poll timeout
2017-05-17 16:24:17 -07:00
Anthony J. Thibault
0018224fef
moar warning fixes
2017-05-17 16:23:39 -07:00
Andrew Meadows
09433a93ba
Merge pull request #10477 from AndrewMeadows/correct-avatar-mass
...
More correct avatar mass
2017-05-17 16:22:06 -07:00
Brad Hefta-Gaub
0d3f7058ec
Merge pull request #10483 from AndrewMeadows/cap-velocities
...
cap scripted linear and angular velocity inputs
2017-05-17 16:15:42 -07:00
Stephen Birarda
2ac5fbf91d
set wireless scan interval to -1
2017-05-17 15:33:52 -07:00
Anthony J. Thibault
78dd30f656
macosx warning fix
2017-05-17 15:22:39 -07:00
Zach Fox
c5a5cad76d
Merge pull request #10487 from zfox23/removeExtraneousSendIdentity
...
Remove extraneous calls to sendIdentityPacket()
2017-05-17 15:20:09 -07:00
David Kelly
057718bde3
remove clockSkew, reference new version for Avatar packets
2017-05-17 15:14:56 -07:00
David Kelly
689a0b5bad
Switch from timestamp to sequence id for avatar identity
2017-05-17 14:22:36 -07:00
Zach Fox
d4752926b8
First pass - checking performance
2017-05-17 13:51:27 -07:00
samcake
b19b0007c8
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-17 13:02:37 -07:00
samcake
ab3ea65d54
Simply add protections when accessing the mip bytes of a texture when provided from a KtxStorage
2017-05-17 12:36:12 -07:00
Atlante45
0d77977936
Enable Map/List storage in the settings
2017-05-17 12:11:15 -07:00
Seth Alves
9b1fe60b7c
suppress frequest log-spam from constraints.
2017-05-17 11:55:31 -07:00
Seth Alves
8a88b30da7
Merge pull request #10468 from AndrewMeadows/cleanup-actions
...
cleanup Actions and Constraints part-1
2017-05-17 11:33:53 -07:00
Andrew Meadows
82c7188376
Merge pull request #10470 from huffman/fix/ktx-cubemaps
...
Fix progressive loading of KTX cubemaps
2017-05-17 11:23:24 -07:00
Andrew Meadows
97ed719506
cap scripted linear and angular velocity inputs
2017-05-17 10:40:45 -07:00
Sam Gateau
0f250e693d
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-17 09:49:20 -07:00
Seth Alves
8ab676e627
Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox
2017-05-17 09:09:04 -07:00
Dante Ruiz
a18940142e
Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter
2017-05-17 16:23:50 +01:00
Thijs Wenker
278bc610d4
Merge pull request #10466 from misslivirose/feat-find-entities-by-type
...
Add function findEntitiesByType EntityScriptingInterface
2017-05-17 15:06:04 +02:00
Brad Hefta-Gaub
764bfe94f5
Merge pull request #10336 from trentpolack/feature/snap-turn-smoothing-21270
...
Feature/snap turn smoothing 21270
2017-05-16 21:05:38 -07:00
Brad Hefta-Gaub
ee6bed5c1c
Merge pull request #10189 from Atlante45/fix/memory-leak
...
Set max packet per second on the agent
2017-05-16 21:03:05 -07:00
Brad Hefta-Gaub
12aa354ddd
Merge pull request #10474 from ctrlaltdavid/21346
...
Fix recording playback not clearing attachments and nametags
2017-05-16 20:53:17 -07:00
Brad Hefta-Gaub
254c6e9292
Merge pull request #10441 from Atlante45/feat/launch-sandbox
...
Launch the Sandbox as early as possible
2017-05-16 20:52:23 -07:00
Brad Hefta-Gaub
36c7821e1e
Merge pull request #10455 from ZappoMan/TriangleSetOptimizations
...
TriangleSet optimizations - ~80% improvement in Ray picking against models
2017-05-16 20:47:50 -07:00
David Rowe
e69c322fd3
Get UserActivityLogger working in AC scripts
2017-05-17 14:30:32 +12:00
samcake
b466964817
REvisiting the stats counter for the gpu context in the hope of better understanding the gpu texture streaming behavior
2017-05-16 18:21:24 -07:00
Brad Hefta-Gaub
f623a9dc82
Merge pull request #10478 from sethalves/delete-localtree-children
...
clean up children of deleted avatar-entity
2017-05-16 18:14:45 -07:00
Seth Alves
d90843428d
when importing entities, make a queryAACube that takes children into account
2017-05-16 16:54:16 -07:00
Seth Alves
1e4e2cc1b4
when a parent entity is deleted, delete its children in the local tree, rather than waiting for the server to tell us about it
2017-05-16 16:22:40 -07:00
