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
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
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
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
