Philip Rosedale
a86cd9afa1
Merge branch 'master' of https://github.com/worklist/hifi
2014-05-07 17:00:50 -07:00
Philip Rosedale
c6fa903d6f
Merge pull request #2813 from birarda/stop-sound
...
return an injector from playSound and allow call to stop it
2014-05-07 16:59:00 -07:00
Philip Rosedale
c6b4b7c250
Merge pull request #2811 from AndrewMeadows/inertia
...
prevent avatar from getting trapped in voxel collisions
2014-05-07 16:54:28 -07:00
Philip Rosedale
e6a8c79f9f
Added more arrow controls to move camera when in mirror mode, new guitar chords.
2014-05-07 16:51:22 -07:00
Stephen Birarda
99ee6ae8af
return an injector from playSound and allow user to stop it
2014-05-07 16:26:32 -07:00
Philip Rosedale
4e1eaf8337
Merge pull request #2809 from Atlante45/mute_env
...
Mute environment
2014-05-07 16:18:23 -07:00
Philip Rosedale
a66e49715c
Merge pull request #2812 from birarda/audio-audability
...
tweak audio constants to be less aggresive on cutoff
2014-05-07 16:17:44 -07:00
Andrew Meadows
a11b996a51
cleaner way to achieve the last commit
2014-05-07 16:00:39 -07:00
Andrew Meadows
2d3592e367
avoid resolving penetration twice
2014-05-07 15:58:00 -07:00
Stephen Birarda
5e9036b3fe
tweak audio constants to be less agressive on cutoff
2014-05-07 15:37:41 -07:00
Andrew Meadows
b92bbafc26
prevent avatar from getting trapped in voxels
2014-05-07 15:21:12 -07:00
Atlante45
fd1f6befff
CR
2014-05-07 15:19:32 -07:00
Clément Brisset
c10f400f23
Merge pull request #2810 from ey6es/master
...
Allow adjusting attachment pivots on upload, fixed bug with certain model textures.
2014-05-07 15:16:07 -07:00
Andrzej Kapolka
350fe5bf14
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-07 14:50:49 -07:00
Andrzej Kapolka
03faff359f
Fix for certain models with textures not parented to materials.
2014-05-07 14:48:25 -07:00
Atlante45
31aedb4aa8
fixed overlay not moving on resize in editModels.js
2014-05-07 14:39:26 -07:00
Philip Rosedale
449e3f1410
Merge branch 'master' of https://github.com/worklist/hifi
2014-05-07 14:08:25 -07:00
Atlante45
6308c39aab
Fix for windows
2014-05-07 14:03:30 -07:00
Brad Hefta-Gaub
fec2ba71b5
Merge pull request #2807 from PhilipRosedale/master
...
AirGuitar.js, arrow keys move fwd/back in mirror view
2014-05-07 13:15:35 -07:00
Atlante45
9d2df69bab
Merge branch 'master' of https://github.com/highfidelity/hifi into mute_env
2014-05-07 12:57:51 -07:00
Atlante45
40ed72989c
mute environment packet
2014-05-07 12:57:11 -07:00
Andrzej Kapolka
f11a3bd28b
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-07 12:55:02 -07:00
Andrzej Kapolka
55b677dd02
Provide options for model translation: by default, pivot about mesh bounds'
...
center; allow numeric translation or pivot about joint position.
2014-05-07 12:53:38 -07:00
Andrew Meadows
8ec493e85b
fix bad penetration depth for interior of cube
2014-05-07 12:39:20 -07:00
Andrew Meadows
9fc1c765d3
overhaul of CollisionInfo
...
store Cube info for sphereAACube collisions
2014-05-07 11:40:00 -07:00
Andrew Meadows
6c289b682d
move #include <StreamUtils.h> to cpp file
2014-05-07 11:18:50 -07:00
Philip Rosedale
a6fcf915af
Merge branch 'master' of https://github.com/worklist/hifi
2014-05-07 10:02:10 -07:00
Philip Rosedale
bc60c8ba92
Merge pull request #2806 from ey6es/master
...
Specular map support.
2014-05-07 08:58:29 -07:00
Philip Rosedale
f6aaaad211
removed some unneeded stuff
2014-05-06 22:44:36 -07:00
Philip Rosedale
fc962749c0
Arrow keys adjust distance from camera in mirror mode, air guitar script
2014-05-06 22:41:08 -07:00
Andrzej Kapolka
d0537e7ead
Specular map support.
2014-05-06 17:32:10 -07:00
Philip Rosedale
00d0a81ace
Merge branch 'master' of https://github.com/worklist/hifi
2014-05-06 17:28:08 -07:00
Clément Brisset
72e6ff3649
Merge pull request #2803 from ZappoMan/modelserver
...
Model Server Bug Fixes/Bandwidth improvements
2014-05-06 17:18:25 -07:00
Clément Brisset
d6caa3c32f
Merge pull request #2804 from huffman/19640
...
Code Review for Job #19640
2014-05-06 17:14:34 -07:00
Brad Hefta-Gaub
82f71b248e
Merge pull request #2805 from Atlante45/fix_hydra_move
...
Slow down hydra move
2014-05-06 17:10:14 -07:00
Atlante45
9c9556914e
Slow down hydra move
2014-05-06 17:03:19 -07:00
Brad Hefta-Gaub
439c873a68
Merge pull request #2794 from AndrewMeadows/thermonuclear
...
misc maintenance and bug fixes
2014-05-06 16:51:28 -07:00
Ryan Huffman
f4cb17ba4a
Merge remote-tracking branch 'upstream/master' into 19640
2014-05-06 16:18:25 -07:00
Ryan Huffman
911b8cd623
Update welcome screen
2014-05-06 16:17:40 -07:00
ZappoMan
c3f6cc0ccb
code cleanup for style guide
2014-05-06 15:50:54 -07:00
ZappoMan
91e4a89573
cleanup old references to node which are really elements
2014-05-06 15:47:18 -07:00
Andrzej Kapolka
c38ab1acde
Merge pull request #2802 from ey6es/master
...
Fix for exports from Sketchup.
2014-05-06 15:32:29 -07:00
ZappoMan
cde583452a
make model server not oversend data
2014-05-06 15:31:45 -07:00
Andrzej Kapolka
353b9879b8
Fix for exports from Sketchup.
2014-05-06 15:15:42 -07:00
Andrew Meadows
80ed8e7cf0
disable environment gravity when not set in menu
2014-05-06 14:56:16 -07:00
Philip Rosedale
a03716a152
Merge branch 'master' of https://github.com/worklist/hifi
2014-05-06 14:51:14 -07:00
Clément Brisset
60d17e988d
Merge pull request #2797 from ey6es/master
...
Disabled depth determination based on scale for Faceplus, improved attachment edit UI, fix for attachments' not appearing in rear view mirror head mode.
2014-05-06 14:24:03 -07:00
ZappoMan
cb302563df
Merge branch 'master' of https://github.com/worklist/hifi into modelserver
2014-05-06 14:12:17 -07:00
Brad Hefta-Gaub
0094e8fe4f
Merge pull request #2798 from Atlante45/master
...
EditModels.js
2014-05-06 13:39:38 -07:00
Atlante45
abebb078b0
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-06 13:08:00 -07:00
