Seth Alves
17b5ade9c0
allow moving distantly grabbed objects with head
2015-12-03 16:45:46 -08:00
Seth Alves
a600df5ea6
try a different method of exagerating hand motion onto distanly held object
2015-12-03 16:04:39 -08:00
Clément Brisset
d6a2a2550b
Merge pull request #6526 from imgntn/butterfly
...
Update model for butterflies.js
2015-12-03 15:25:55 -08:00
Clément Brisset
686673795f
Merge pull request #6539 from imgntn/solidtoys
...
Fix Solidity of some Single Toy Creators
2015-12-03 15:17:02 -08:00
samcake
902b6b8ea1
Merge pull request #6506 from jherico/maggie
...
OpenGL class cleanup
2015-12-03 13:55:29 -08:00
Brad Davis
cc80dfb9e1
Fixing case on gl surface format helper
2015-12-03 13:08:26 -08:00
James B. Pollack
fbca1c9754
another toy
2015-12-03 11:12:28 -08:00
James B. Pollack
cf5c8c08e2
update toys to be inverted while held
2015-12-03 11:10:22 -08:00
Howard Stearns
65334659ae
Merge pull request #6535 from ZappoMan/rightClickMenu
...
change camera cycle and context menu to hydra 0 buttons
2015-12-03 09:24:31 -08:00
Brad Hefta-Gaub
c0bd54e8a2
change hydra secondary thumb to 0 button
2015-12-03 09:06:18 -08:00
Ryan Downe Karpf
0e11c0980e
Merge pull request #6531 from ericrius1/toyboxSounds
...
Made ping pong gun have restitution of 0
2015-12-03 08:19:08 -08:00
Brad Hefta-Gaub
b122586ea5
remove camera cycle and context menu from standard mapping
2015-12-03 08:08:04 -08:00
ericrius1
dec4cd012e
made ping pong gun have restitution of 0
2015-12-02 18:26:09 -08:00
Andrew Meadows
744da64c50
Merge pull request #6527 from ZappoMan/debugEntitiesSending
...
Add some debugging stats to entity server
2015-12-02 15:51:47 -08:00
Andrew Meadows
144983d345
Merge pull request #6528 from hyperlogic/tony/non-uniform-scale-model-entity-fix
...
Fix for model entities with non-uniform scaled mesh
2015-12-02 15:14:38 -08:00
Brad Hefta-Gaub
4497d21aec
remove nodes that disconnect from out viewer stats
2015-12-02 14:51:48 -08:00
Brad Hefta-Gaub
1e51a90204
add edit times and entity ids to the viewer stats
2015-12-02 14:43:00 -08:00
Anthony Thibault
e0ca1c0f4c
Merge pull request #6496 from PhilipRosedale/master
...
Improved audio-driven mouth shapes
2015-12-02 14:20:20 -08:00
Anthony J. Thibault
9c0b4bc2a2
Fix for model entities with non-uniform scaled mesh
...
Logic which extracted rotations from a non-uniformly scaled matrices was sometimes incorrect.
This should fix the roads in Qbit as well as the blocks in toybox.
2015-12-02 14:09:47 -08:00
Ryan Downe Karpf
1d57f4daa8
Merge pull request #6524 from ericrius1/toyboxSounds
...
Removed collision sound for bow and lowered restitution on flashlight and spraycan to avoid multiple bounce sounds
2015-12-02 13:56:36 -08:00
Brad Hefta-Gaub
08ba535c38
add some basic send tracking
2015-12-02 13:43:05 -08:00
James B. Pollack
a9438490fe
update butterfly model
2015-12-02 12:53:19 -08:00
ericrius1
6d953a65dd
changed restitution to 0
2015-12-02 12:09:21 -08:00
ericrius1
0180503447
removed collision sound url
2015-12-02 12:07:38 -08:00
Howard Stearns
38182bfd9d
Merge pull request #6523 from hyperlogic/tony/avatar-reset-improvements
...
MyAvatar::reset() improvements
2015-12-02 11:40:46 -08:00
Brad Hefta-Gaub
33b859df33
Merge pull request #6416 from kencooke/audio-reverb
...
New reverb
2015-12-02 11:22:12 -08:00
Brad Hefta-Gaub
ba0ce5f3b3
Merge pull request #6480 from samcake/controllers
...
Playback: Trying to get the Agent to Master connection more reliable
2015-12-02 11:08:15 -08:00
Ken Cooke
fbd7549430
Better reverb script defaults
2015-12-02 11:05:06 -08:00
samcake
0ae7060316
the correct includes
2015-12-02 10:23:31 -08:00
Anthony J. Thibault
0b05a341a8
MyAvatar::reset() improvements
...
Body should not orient under the HMD body without changing the HMD view point.
It's more predictable and less likely to make you sick.
It also should reset the height of the character to cancel out squatting, if the HMD position is low.
2015-12-02 10:18:02 -08:00
Brad Hefta-Gaub
112cdaf028
Merge pull request #6512 from AndrewMeadows/remove-debug-cruft
...
remove debug option for disabling physics updates
2015-12-02 10:00:29 -08:00
Brad Hefta-Gaub
75a57c3cb8
Merge pull request #6500 from Atlante45/octree_crash
...
Octree crash fix
2015-12-02 09:59:56 -08:00
samcake
62c59c2d28
Merge pull request #6522 from ZappoMan/recording
...
fix PlayRecordingOnAC.js to use new API
2015-12-02 09:58:06 -08:00
samcake
586ed51436
rename AgentPoolCOntroller.js
2015-12-02 09:56:16 -08:00
Brad Hefta-Gaub
b6398a7930
fix PlayRecordingOnAC.js to use new API
2015-12-02 09:51:52 -08:00
samcake
c7b9d7d26e
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-12-02 09:49:03 -08:00
Atlante45
c3e2d920ee
Move timing at the top
2015-12-02 09:45:51 -08:00
Ken Cooke
f005afd7c0
Fix stdint.h includes
2015-12-02 09:33:47 -08:00
Brad Hefta-Gaub
82d6718d8b
Merge pull request #6510 from birarda/es-deadlock
...
fix infinite loop on shutdown in OctreeInboundPacketProcessor
2015-12-02 08:16:28 -08:00
Brad Hefta-Gaub
fd05bd23a0
Merge pull request #6521 from jherico/homer
...
Fixing avatar orientation in recordings
2015-12-01 22:09:45 -08:00
Philip Rosedale
be2f14cae5
Review fix
2015-12-01 21:50:01 -08:00
Brad Davis
9b6ec34f09
Fixing avatar orientation in recordings
2015-12-01 20:51:07 -08:00
Atlante45
0bc914bf19
Don't grab subTree outside lock
2015-12-01 19:33:44 -08:00
Philip Rosedale
e316f8dbb1
Merge pull request #6520 from imgntn/badpistol
...
Make pistol shoot differently and not alter controller mappings
2015-12-01 18:42:28 -08:00
James B. Pollack
e67f372bcf
make pistol shoot differently and not alter controller mappings
2015-12-01 18:24:13 -08:00
samcake
86af28dbab
Fighting for one hour with the ready message being misunderstood by master
2015-12-01 18:18:18 -08:00
Anthony J. Thibault
99065f10fa
Avatar Warning fixes on linux
2015-12-01 18:12:01 -08:00
James B. Pollack
1eca1540c6
Merge pull request #6519 from ericrius1/toyboxSounds
...
added collision sounds to flashlight, spraycan, and bow
2015-12-01 17:08:19 -08:00
James B. Pollack
560efe35f0
Merge pull request #6518 from ericrius1/disableGrabWithPistol
...
Disable grab while attachment version of pistol script is running
2015-12-01 17:07:36 -08:00
Eric Levin
34234da2d1
fixed spacing
2015-12-01 17:05:51 -08:00
