Seth Alves
09f900862b
Merge branch 'master' of github.com:highfidelity/hifi into finglonger
2015-05-15 13:14:06 -07:00
Stephen Birarda
a675b0a891
fix locked link button in settings
2015-05-15 13:10:32 -07:00
Seth Alves
bb3d1a6a58
rays never pick a line entity. some fixes to pointer.js
2015-05-15 13:10:16 -07:00
Atlante45
940363bf2e
Fix activeRendernigThread check
2015-05-15 21:36:37 +02:00
Atlante45
cb02ef9277
Remove warnings
2015-05-15 21:35:47 +02:00
Sam Cake
97b18fcd52
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-05-15 11:29:43 -07:00
Sam Cake
765145b898
Moving the load of the texture and the generation of the cube map irradiance in the same thread
2015-05-15 11:28:59 -07:00
Stephen Birarda
82cb55e602
handle case where account is locked
2015-05-15 11:26:06 -07:00
Andrew Meadows
80f917a960
Merge pull request #4884 from howard-stearns/collision-sound-robustness
...
Collision sound robustness
2015-05-15 11:20:37 -07:00
Stephen Birarda
78fa82515a
use constant IDs for domain buttons
2015-05-15 11:19:44 -07:00
Stephen Birarda
c0473adec9
add button to create new domain ID in settings
2015-05-15 11:18:12 -07:00
Stephen Birarda
bb936657ae
handle domain creation during account connect flow
2015-05-15 11:09:00 -07:00
Howard Stearns
9f7a56e3e5
Ask audio injector to delete itself.
...
Put in null guards.
Tune parameters (including higher threshold).
2015-05-15 11:00:28 -07:00
Howard Stearns
56bc4dc079
Merge branch 'master' of https://github.com/highfidelity/hifi into collision-sound-tuning
2015-05-15 10:56:36 -07:00
Brad Hefta-Gaub
fc4887a61a
Merge pull request #4882 from birarda/master
...
add error log debug for script load fail
2015-05-15 10:40:10 -07:00
Philip Rosedale
2df3f36420
Merge pull request #4880 from sethalves/finglonger
...
laser-poiner script for mouse
2015-05-15 10:39:20 -07:00
Stephen Birarda
e462617a6b
add error log debug for script fail
2015-05-15 10:29:24 -07:00
Howard Stearns
3600a5def8
Merge branch 'master' of https://github.com/highfidelity/hifi into collision-sound-tuning
2015-05-15 10:25:03 -07:00
Stephen Birarda
6419a148d4
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-05-15 10:20:12 -07:00
David Rowe
d3cb6a9334
Fix visibility of binary eyelid control menu item
2015-05-15 09:40:32 -07:00
Seth Alves
1161f33b45
laser-poiner script for mouse
2015-05-14 20:25:29 -07:00
Brad Davis
6797174b97
Fix picking in the HMD
2015-05-14 19:15:47 -07:00
Seth Alves
3471c0a44f
Merge pull request #4878 from PhilipRosedale/hockeygame
...
new paddle models, low friction on field
2015-05-14 18:23:27 -07:00
Philip Rosedale
7be463388b
new paddle models, low friction on field
2015-05-14 18:22:30 -07:00
Philip Rosedale
252631475f
Merge pull request #4877 from ericrius1/hydra
...
added support for both right and left hydras for hydra scripts, and m…
2015-05-14 17:14:48 -07:00
Eric Levin
7a12a4d58e
added support for both right and left hydras for hydra scripts, and made picking accurate
2015-05-14 17:00:40 -07:00
Stephen Birarda
c4f926b25f
hide domain ID + auto network options without account
2015-05-14 16:15:28 -07:00
Sam Cake
ad9834283d
Fixing the magic numbers!
2015-05-14 15:54:40 -07:00
Philip Rosedale
15d2ce6ecc
Merge pull request #4876 from AndrewMeadows/thermonuclear
...
adjust margin for hulls with small dimensions
2015-05-14 15:53:34 -07:00
Stephen Birarda
20940b55ba
handle access token storage via sweet-alert
2015-05-14 15:47:20 -07:00
Philip Rosedale
1318a3d6e9
Merge pull request #4875 from howard-stearns/collision-sound-tuning
...
collision sound tuning
2015-05-14 15:30:34 -07:00
Sam Cake
e3d80088da
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-05-14 15:22:18 -07:00
Sam Cake
40ee78195e
remove magic numbers
2015-05-14 15:21:57 -07:00
Stephen Birarda
5645fdc8b9
send user to token creation page
2015-05-14 15:21:33 -07:00
Howard Stearns
15dd8596ac
Merge branch 'master' of https://github.com/highfidelity/hifi into collision-sound-tuning
2015-05-14 15:17:09 -07:00
Howard Stearns
5accb4d0d2
Remove debug logging.
2015-05-14 15:12:31 -07:00
Philip Rosedale
363f55c0f1
Merge pull request #4872 from ericrius1/hydraHockey
...
added hydraHockeyGrab.js, which constrains moving object to xz plane …
2015-05-14 15:05:44 -07:00
Andrew Meadows
7a47e04b9c
adjust margin for hulls with small dimensions
2015-05-14 14:57:18 -07:00
Howard Stearns
b5a28730ea
Filter out low-penetration continuous contact from all entity collision activity including scripts:
...
We don't want sound for these.
This appears to avoid the Entities.getEntityProperties() deadlock within entity scripts.
Variable names:
energyPercentOfFull => energyFactorOfFull, because the range is 0-1, not 0-100.
COLLISION_SOUND_COMPRESSION => COLLISION_SOUND_COMPRESSION_RANGE (portion of full dynamic range)
Tune constants:
COLLISION_ENERGY_AT_FULL_VOLUME 10 => 1
COLLISION_MINIMUM_VOLUME 0.01 => 0.001
COLLISION_SOUND_COMPRESSION_RANGE 0.5 => 0.95
Refer to SoundCache later, after filtering for collision threshold.
2015-05-14 14:41:32 -07:00
Philip Rosedale
3ee7f30cf5
Merge pull request #4874 from AndrewMeadows/thermonuclear
...
add restitution and friction to entity properties
2015-05-14 14:01:27 -07:00
Stephen Birarda
a668ea7a4c
remove a blank line
2015-05-14 12:53:23 -07:00
Andrew Meadows
53e241fb07
merge upstream/master into andrew/thermonuclear
2015-05-14 12:37:41 -07:00
Andrew Meadows
d28c400cea
add restitution and friction Entity properties
2015-05-14 12:36:59 -07:00
Stephen Birarda
4de006f9b9
handle OAuth access token retrieval
2015-05-14 12:22:23 -07:00
Eric Levin
ebb590e58a
added new hydragrab script which works similarly to mouse grab script, and added header to hydraGrabHockey script
2015-05-14 11:46:52 -07:00
Seth Alves
41d77e6146
Merge pull request #4852 from AndrewMeadows/nova
...
improved distributed simulation ownership negotiation
2015-05-14 11:40:49 -07:00
Eric Levin
3393b60aba
added hydraHockeyGrab.js, which constrains moving object to xz plane and disables rotation
2015-05-14 11:39:04 -07:00
Stephen Birarda
fabe19a92c
ask for OAuth token directly
2015-05-14 11:19:07 -07:00
Stephen Birarda
aff83be768
handle account disconnection from DS settings
2015-05-14 11:03:41 -07:00
Ryan Huffman
0cd60782e7
Add error handling to JSConsole
2015-05-14 11:00:30 -07:00
