Stephen Birarda
14ff6a06b4
require a valid access token and expiry to attempt refresh
2017-05-24 13:16:26 -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
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
Howard Stearns
b46ff07d65
Merge pull request #10527 from davidkelly/dk/4756
...
Should fix crash in general setting dialog
2017-05-23 18:08:13 -07:00
Stephen Birarda
5865cbbdde
Merge pull request #10535 from seefo/master
...
DS HTTP auth will no longer accept any password if the assigned password is blank
2017-05-23 17:36:05 -07:00
seefo
cb831733a1
Added warning if trying to change DS HTTP password to blank string
2017-05-23 17:07:37 -07:00
Brad Hefta-Gaub
eca045714b
Merge pull request #10532 from ctrlaltdavid/21344
...
Display spinner in Web controls when they're loading an HTTP page
2017-05-23 16:39:17 -07:00
Brad Hefta-Gaub
e38381b0ef
Merge pull request #10523 from birarda/bug/null-identity-packet-uuid
...
ensure AvatarMixerClientData AvatarData has session ID
2017-05-23 15:24:58 -07:00
Liv
b2bbf21fb0
style fixes
2017-05-23 15:21:21 -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
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
seefo
8a8f971186
empty passwords will no longer allow any password to pass DS HTTP auth
2017-05-23 12:01:00 -07:00
samcake
542ec3dc46
More clean up per review request
2017-05-23 11:36:06 -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
Clément Brisset
ed86ca3e55
Merge pull request #10522 from birarda/bug/version-number-jumps
...
remove version difference from update dialog
2017-05-23 10:28:50 -07: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 Thibault
a7b9fbb461
Merge pull request #10513 from hyperlogic/feature/faster-ik-iterations
...
IK tuning and bug fixes
2017-05-23 10:00:03 -07:00
Thijs Wenker
962d95ca46
add more precision to attachment scale in attachment dialog
2017-05-23 18:16:08 +02:00
Anthony J. Thibault
06c26f029a
Merge branch 'master' into feature/faster-ik-iterations
2017-05-23 09:10:17 -07:00
David Kelly
1c71d2e6b1
don't create prefs for pucks if vive not supported
2017-05-23 09:05:14 -07:00
Thijs Wenker
712aff7ad6
base scale attachment on the natural dimensions
2017-05-23 17:53:08 +02: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
David Rowe
bc4af86b57
Display spinner in Web controls when they're loading an HTTP page
2017-05-23 15:40:35 +12: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
David Kelly
ae54f9c80a
Should fix crash in general setting dialog
2017-05-22 16:25:21 -07: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
Stephen Birarda
841f8cb86b
make sure AvatarData objects have the node session ID
2017-05-22 15:33:57 -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
b0962865b2
Code review
2017-05-23 09:57:53 +12:00
