David Kelly
44e2a52a2e
Merge branch 'dk/startScreaming' into dk/codecInAgentAvatar
2016-10-06 15:24:21 -07:00
Chris Collins
73e29c03ab
Merge pull request #8728 from huffman/feat/unequip-using-grab
...
Trigger unequip at a more lenient angle and with the secondary trigger
2016-10-06 10:30:54 -07:00
David Kelly
73aafaf518
Add simple sound to avatars
...
For now I just used the piano1.wav that howard suggested long ago
for another project. We use Agent.playAvatarSound, and tell the
mixer to mix audio for each avatar by setting
Agent.setIsListeningToAudioStream to true.
2016-10-05 18:12:58 -07:00
Ryan Huffman
8343cfd687
Add grip to unequip
2016-10-04 16:34:18 -07:00
Ryan Huffman
289cd6ba2b
Adjust hand controller unequip rotation threshold
2016-10-04 16:34:18 -07:00
howard-stearns
cdd658d4dd
report results
2016-10-04 11:31:49 -07:00
howard-stearns
1c73b3c043
Merge branch 'domain-check' of https://github.com/highfidelity/hifi into summon-crowd
2016-10-04 10:40:48 -07:00
howard-stearns
5ea4d48e36
poll for ready, and include physics in definition of ready, based on #8723
2016-10-04 10:23:10 -07:00
howard-stearns
8388e1044a
cleanup to use script-driven cache cleaning
2016-10-03 14:09:52 -07:00
howard-stearns
e55d4f97b3
Merge branch 'davidkelly-dk/testScriptRelocation' into domain-check
2016-10-03 13:10:50 -07:00
howard-stearns
654461e97a
Merge branch 'tribble-rez' of https://github.com/howard-stearns/hifi into howard-stearns-tribble-rez
2016-10-03 13:06:50 -07:00
howard-stearns
43c29500bf
ac script to provide an on-demand crowd, and an interface script to summon
...
it
2016-10-03 12:03:23 -07:00
David Kelly
70a63417cf
point to tribbles.js on aws
...
For now, anyways. Just temporary until dev is complete.
2016-10-03 11:40:50 -07:00
Howard Stearns
ee801f4cc2
initial domain-check script
2016-10-03 10:29:33 -07:00
Howard Stearns
76d9d4c635
fix canRez logic in tribble script: only need canRezTemp, and fail hard rather than retry
2016-10-03 10:16:06 -07:00
Brad Hefta-Gaub
546d4ff986
remove mic and window resize notifications
2016-10-02 09:10:12 -07:00
Seth Alves
785e187a27
edit.js uses notification.js to indicate errors instead of a modal dialog. in HMD, notification messages no longer jitter around
2016-09-21 11:39:25 -07:00
Brad Hefta-Gaub
2b01c60a55
Merge pull request #8615 from davidkelly/dk/1264
...
Make the equip sphere emissive
2016-09-19 16:33:55 -07:00
Anthony J. Thibault
aefe224215
Fix for jittery far-grab at low update rates
...
Clamp the blendFactor used to smooth out the motion of the far-grabbed object.
This prevents the newTargetPosition from over shooting it's goal.
2016-09-19 10:51:46 -07:00
David Kelly
22d80914e2
whitespace
2016-09-16 14:17:44 -07:00
David Kelly
ade17e6456
PR feedback
2016-09-16 14:15:14 -07:00
David Kelly
2ddd46f30b
Switch to the cool looking model instead
2016-09-16 10:56:59 -07:00
David Kelly
1acfe017e1
Make the equip sphere emissive
...
maybe this will make it visible in low ambient light situations?
2016-09-15 17:12:35 -07:00
Chris Collins
84ffda5281
Merge pull request #8608 from huffman/fix/particle_explorer
...
Fix eventBridgeLoader path in particle explorer
2016-09-15 16:51:41 -07:00
Ryan Huffman
6a32ef29dc
Fix eventBridgeLoader path in particle explorer
2016-09-15 13:07:00 -07:00
howard-stearns
03a8af76e3
don't do hand-controller edit object-selection when pointed at a HUD
...
element
2016-09-14 12:02:33 -07:00
Seth Alves
e5e9bb0052
Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments
2016-09-14 11:28:10 -07:00
David Rowe
fa0aeb4563
Display render info values only when valid provided
2016-09-13 13:03:47 +12:00
David Rowe
d61e4c5c11
Display textures size in MB
2016-09-13 10:52:19 +12:00
David Rowe
fe8b3b4d0d
Merge branch 'master' into 21040
2016-09-13 09:12:47 +12:00
David Rowe
44282499c5
New glyph for "has transparent"
2016-09-10 14:37:09 +12:00
David Rowe
a06f49f791
Fix footer entities count not being updated when change filter value
2016-09-10 11:14:23 +12:00
David Rowe
487cb7d893
Use findInFrustum in entities list and filter results per search radius
2016-09-09 18:58:38 +12:00
Brad Hefta-Gaub
b56ad737d4
Merge pull request #8567 from hyperlogic/feature/tablet-ui-foundation
...
Web Entities Virtual Keyboard + Event Bridge support
2016-09-08 18:36:46 -07:00
Seth Alves
8c45c115b8
Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments
2016-09-08 17:02:40 -07:00
Seth Alves
ecb0669972
try to keep far grab from getting stuck if the entity is brought very near to the grab-point
2016-09-08 17:02:29 -07:00
Seth Alves
0f98c51d89
distance-grabbed things collide with static entities
2016-09-08 16:13:22 -07:00
Clément Brisset
4437b1b5d6
Merge pull request #8573 from Atlante45/master
...
Fix toolBar.js relative path
2016-09-08 14:22:18 -07:00
Seth Alves
9e99cc1f78
fix mod.js
2016-09-08 07:35:52 -07:00
David Rowe
28cfca993f
Add and wire up "search in view" JavaScript API stub
2016-09-08 14:58:48 +12:00
David Rowe
a4b5f5395d
Add "in view" button
2016-09-08 12:56:41 +12:00
Seth Alves
9c96ffc9cb
don't show grab-point spheres if controller poses aren't valid
2016-09-07 16:31:02 -07:00
David Rowe
7d6ab77c16
Merge branch 'master' into 21040
2016-09-08 11:30:19 +12:00
Seth Alves
746d0cd91c
get various hand lasers to all line up with grab-point sphere
2016-09-07 16:10:37 -07:00
Seth Alves
b45181ea92
don't back up pick-ray from hand
2016-09-07 13:32:26 -07:00
Anthony J. Thibault
7b4b98971e
Merge branch 'master' into feature/tablet-ui-foundation
2016-09-07 12:49:13 -07:00
Anthony J. Thibault
9f0550ea7e
Raised dpi of WebTablet to fit 480 width keyboard
2016-09-07 10:59:54 -07:00
Seth Alves
332c2127b4
Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments
2016-09-07 09:53:26 -07:00
Anthony J. Thibault
dc0d0c2d5c
Merge branch 'master' into feature/tablet-ui-foundation
2016-09-07 09:49:55 -07:00
Seth Alves
5303488f52
Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments
2016-09-07 09:40:51 -07:00
