Commit graph

40127 commits

Author SHA1 Message Date
ericrius1
c59a58a833 changing color of visual component to match sound cartridge 2016-03-09 11:22:47 -08:00
ericrius1
d65dcf7142 no more velocity 2016-03-09 11:11:20 -08:00
ericrius1
41df11f614 spacing 2016-03-09 09:55:15 -08:00
ericrius1
deb2c5af63 parenting visual to sound entity 2016-03-08 18:30:27 -08:00
ericrius1
9edc8aa5aa searching for name 2016-03-08 11:34:00 -08:00
ericrius1
503d2874ab initial vr vj set up 2016-03-08 10:59:01 -08:00
Chris Collins
5078f486b1 Merge pull request #7266 from sethalves/local-messages
allow sending interface-local messsages
2016-03-07 17:21:45 -08:00
Andrew Meadows
dfe0575237 Merge pull request #7260 from imgntn/newponggun
New Ping Pong Gun Model
2016-03-07 15:51:59 -08:00
Andrew Meadows
592d29fc7c Merge pull request #7251 from sethalves/fix-hulls-for-non-default-registration
fix collisions with non-default registration
2016-03-07 15:46:13 -08:00
Seth Alves
ee55721f79 allow sending interface-local messsages 2016-03-07 15:13:24 -08:00
Philip Rosedale
7c765f3d5a Merge pull request #7258 from hyperlogic/tony/better-lean-detection
MyAvatar: use a box instead of a sphere for horizontal re-centering
2016-03-07 15:05:10 -08:00
James B. Pollack
2d554f4b40 Merge pull request #7249 from ericrius1/playaFireworks
Playa fireworks and associated tutorial
2016-03-07 14:32:06 -08:00
ericrius1
ca747bb4e9 fixed dates 2016-03-07 14:29:17 -08:00
James B. Pollack
567039ef82 Update createPingPongGun.js 2016-03-07 14:28:16 -08:00
ericrius1
caca60c039 added headers to tutorial code 2016-03-07 14:09:21 -08:00
Seth Alves
320645de8d Merge pull request #7263 from imgntn/masterlightsfix
Increase brightness of lights in demo
2016-03-07 14:04:20 -08:00
Seth Alves
e8001d0346 Merge pull request #7264 from imgntn/flashlightbrightfix
Make the flashlight brighter
2016-03-07 14:04:02 -08:00
Seth Alves
34a76f1962 Merge pull request #7265 from ctrlaltdavid/fix-treeview
Fix Running Script's tree view
2016-03-07 14:03:50 -08:00
Seth Alves
cc16fca7a6 Merge pull request #7248 from birarda/ac-logs
disable AC child file logging by default
2016-03-07 14:03:23 -08:00
David Rowe
e6b81b31d8 Fix Running Script's tree view 2016-03-08 09:59:00 +13:00
James B. Pollack
9cd0762040 brighter 2016-03-07 12:26:21 -08:00
James B. Pollack
247ebb380b Merge pull request #7253 from hyperlogic/tony/distance-holding-fixes
HandControllerGrab: fixes for distance holding
2016-03-07 12:12:58 -08:00
James B. Pollack
15feb7a414 add falloffRadius to sconce lights in toybox 2016-03-07 12:07:22 -08:00
Chris Collins
7850ca3576 Merge pull request #7227 from hyperlogic/tony/eye-look-at-fixes
Avatar eye look at fixes for HMD and desktop
2016-03-07 11:50:16 -08:00
Seth Alves
40c953e0b9 fix model hulls 2016-03-07 11:40:18 -08:00
James B. Pollack
6d82dcb533 not the targets 2016-03-07 11:38:05 -08:00
Seth Alves
8b8604f9b0 move offset handling for models back to how it was before this PR 2016-03-07 11:32:25 -08:00
Anthony Thibault
2cbb41fd38 MyAvatar: bug fix for forward/backward lean detection 2016-03-07 10:11:22 -08:00
Anthony J. Thibault
aefeff2493 MyAvatar: Use a box instead of a sphere for horizontal re-centering 2016-03-07 09:50:38 -08:00
Anthony Thibault
b096e062e6 Merge pull request #7250 from ZappoMan/smallFix
fix a couple bugs in this script
2016-03-07 09:13:58 -08:00
Brad Hefta-Gaub
3fe89c0cdf Merge pull request #7256 from samcake/orange
Fix the text rendering Bug
2016-03-07 09:11:55 -08:00
Chris Collins
86f60671a7 Merge pull request #7254 from ZappoMan/hackathonMusicPlayer
Music Player
2016-03-07 09:01:58 -08:00
Chris Collins
d03fb797e7 Merge pull request #7252 from sethalves/fix-polyvox-rendering-again
fix polyvox fragment shader
2016-03-07 08:59:22 -08:00
James B. Pollack
830a61b874 update 2016-03-06 15:04:47 -08:00
James B. Pollack
9a860bd31a update ping pong gun model url 2016-03-06 15:01:35 -08:00
Seth Alves
c95d1f68f6 remove debug print 2016-03-06 14:38:03 -08:00
Seth Alves
b6a478d970 Merge branch 'master' of github.com:highfidelity/hifi into fix-hulls-for-non-default-registration 2016-03-06 14:35:38 -08:00
Seth Alves
5c585acd9a offset is included in shape key for models 2016-03-06 14:29:30 -08:00
Seth Alves
dcb720a832 fix polyvox hull when registration changes. 2016-03-06 14:09:45 -08:00
Brad Hefta-Gaub
78b608b970 Merge pull request #7225 from PhilipRosedale/hydraReticle
Hand controller drives mouse, does not take over if set down
2016-03-06 13:33:02 -08:00
Seth Alves
59804a0f54 cleanups 2016-03-06 12:59:41 -08:00
Seth Alves
5241dc5394 this seems to be working now. more cleanups to come 2016-03-06 12:59:33 -08:00
samcake
193b98f24f Gamma correct the text color 2016-03-05 10:59:03 -08:00
samcake
d3b84311c5 FIxing the color 2016-03-05 10:36:45 -08:00
samcake
2d3f0b12f5 Simple fix to the text bug 2016-03-05 10:18:50 -08:00
Seth Alves
f03ddb856b Merge branch 'master' of github.com:highfidelity/hifi into fix-hulls-for-non-default-registration 2016-03-05 09:54:38 -08:00
Seth Alves
8bc2c76a8b change shape-key when registration point changes so shape cache doesn't incorrectly reuse the old shape 2016-03-05 08:01:30 -08:00
Brad Hefta-Gaub
168fd2d72f read playlist URL from userData 2016-03-05 01:07:20 -08:00
Brad Hefta-Gaub
2f92a4cccd first cut at music player 2016-03-05 00:45:25 -08:00
Anthony J. Thibault
076b0b42d7 HandControllerGrab: fixes for distance holding
Because controller poses are in avatar space, there is no need
to apply delta avatar position changes and rotation changes.
2016-03-04 20:36:32 -08:00