Brad Hefta-Gaub
ffa805affb
Merge pull request #6223 from AlessandroSigna/controllers
...
Vive Controller
2015-10-29 14:16:34 -07:00
Brad Davis
036ae62dd3
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-29 14:00:52 -07:00
Andrew Meadows
9bc44d678b
Merge pull request #6228 from ZappoMan/scriptCleanup
...
removed old metavoxel example, since the api is no longer available
2015-10-29 13:26:11 -07:00
Brad Hefta-Gaub
3c11cf2926
Merge pull request #6226 from kencooke/master
...
Workaround for audio having channels swapped under Qt 5.5.1
2015-10-29 13:25:41 -07:00
Andrew Meadows
fa96349155
Merge pull request #6229 from birarda/sleep-dt-loop
...
guard timeElapsed for simulateKinematicMotion to max 1s
2015-10-29 13:23:57 -07:00
AlessandroSigna
ffd2b39874
Fix vive controller - update to new input plugin register
2015-10-29 13:18:37 -07:00
Ken Cooke
1eabb924f1
Fixed the logic to be correct
2015-10-29 12:53:47 -07:00
Stephen Birarda
fb55f0becb
guard timeElapsed for simulateKinematicMotion to max 1s
2015-10-29 12:50:34 -07:00
Brad Hefta-Gaub
dd8295b908
Merge pull request #6225 from ZappoMan/controllers
...
Controllers merged from master
2015-10-29 12:39:35 -07:00
Andrew Meadows
0c5b4115ed
Merge pull request #6221 from huffman/physics-substep-fix
...
Physics substep fix
2015-10-29 12:39:15 -07:00
Brad Hefta-Gaub
1c2973f17d
removed old metavoxel example, since the api is no longer available
2015-10-29 12:34:24 -07:00
Brad Hefta-Gaub
1f53e425eb
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-10-29 12:28:28 -07:00
Brad Davis
f21633e368
Merge pull request #6222 from ZappoMan/hardwareChanged
...
Handle input plugin register/remove when activated/deactivated by menus
2015-10-29 12:24:17 -07:00
Ken Cooke
4d576d7aaf
Fix typo
2015-10-29 12:23:36 -07:00
Ken Cooke
143b9c663f
Quick fix for audio having channels swapped under Qt 5.5.1.
2015-10-29 12:21:28 -07:00
Brad Hefta-Gaub
851460b2bd
fix build buster for SDL2 missing builds
2015-10-29 11:26:11 -07:00
Brad Hefta-Gaub
3d37a1d249
fix Controller.Hardware when input plugins are deactived
2015-10-29 11:06:20 -07:00
Brad Hefta-Gaub
ed87ae3d5a
remove some debugging
2015-10-29 10:57:30 -07:00
Brad Hefta-Gaub
bab2a7d80f
Merge branch 'controllers' of https://github.com/highfidelity/hifi into hardwareChanged
...
Conflicts:
libraries/input-plugins/src/input-plugins/SixenseManager.cpp
libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp
2015-10-29 10:56:01 -07:00
Brad Hefta-Gaub
3bbba99e2b
Merge pull request #6178 from samcake/color
...
Refactor the KeyLIght properties in their own group
2015-10-29 10:44:44 -07:00
samcake
517387621a
Fixing the keyLIght Direction ui for edit.js and fix the case for D to d
2015-10-29 10:40:28 -07:00
Brad Davis
ccbae81dad
Merge branch 'master' into HEAD
...
Conflicts:
interface/src/avatar/SkeletonModel.cpp
2015-10-29 10:24:38 -07:00
Eric Levin
42fb683085
Merge pull request #6184 from imgntn/toybox_sounds
...
Add Arcade Game Sound To Toybox
2015-10-29 10:24:23 -07:00
Eric Levin
53f588ddc1
Merge pull request #6188 from imgntn/toybox_reset_buttons
...
Add Reset Buttons for Basketballs and Targets to Toybox
2015-10-29 10:24:12 -07:00
Ryan Huffman
49877c2dff
Move _hasOutgoingChanges in onSubStep to previous location
2015-10-29 10:19:18 -07:00
Seth Alves
ac1055c3e0
Merge pull request #6214 from howard-stearns/goToPosition
...
Don't go to wrong position on startup/teleport.
2015-10-29 10:15:26 -07:00
samcake
025422792d
Fixing the keyLIght Direction ui for edit.js
2015-10-29 10:13:28 -07:00
Seth Alves
10717dc364
Merge pull request #6154 from howard-stearns/safe-avatar-list-access
...
Safe avatar list access
2015-10-29 10:12:34 -07:00
Brad Hefta-Gaub
a3cd032a41
register/remove devices when the input plugins are activated/deactivated
2015-10-29 10:06:21 -07:00
Brad Hefta-Gaub
af20c64c84
Merge pull request #6211 from jherico/killDeviceProxy
...
Remove DeviceProxy in favor of InputDevice
2015-10-29 10:04:39 -07:00
Andrew Meadows
d33530f5d0
Merge pull request #6209 from howard-stearns/guard-rendering-of-avatar-collision-hull
...
Don't render avatar's renderBoundingCollisionShapes before data is there
2015-10-29 09:34:26 -07:00
Brad Davis
c4e82a85d9
Remove DeviceProxy in favor of InputDevice
2015-10-29 09:32:56 -07:00
Andrew Meadows
f9012d5051
Merge pull request #6187 from sethalves/fix-actions-ttl
...
fix actions bug
2015-10-29 09:30:21 -07:00
Brad Hefta-Gaub
21decaaf8e
Merge pull request #6218 from ctrlaltdavid/20719
...
20719 Fix audio stats dialog box not being sized properly
2015-10-29 08:16:56 -07:00
Brad Hefta-Gaub
d324771f6b
Merge pull request #6219 from howard-stearns/fix-avatar-draw-mesh-toggle
...
Fix Developer->Avatar->Draw Mesh
2015-10-28 23:16:51 -07:00
Howard Stearns
697b9fb60b
Merge pull request #6205 from hyperlogic/tony/eye-lookat-fix
...
Fixes locally rendered eye gaze
2015-10-28 21:39:54 -07:00
Howard Stearns
5b6a8eddf9
Merge pull request #6216 from hyperlogic/tony/bug-eyed-mery-fix
...
FBXReader: More deterministic loading behavior
2015-10-28 21:31:57 -07:00
Howard Stearns
8c395209e8
Fix Developer->Avatar->Draw Mesh
...
MyAvatar::setEnableMeshVisible -> Model::setVisibleInScene sets a flag that no one was looking at any more.
2015-10-28 21:23:35 -07:00
Anthony J. Thibault
5e73af9272
Rig: Removed dt from updateFromEyeParameters()
2015-10-28 18:10:41 -07:00
samcake
fd7582ad31
Merge branch 'master' of https://github.com/highfidelity/hifi into color
2015-10-28 17:58:04 -07:00
Anthony J. Thibault
7367f2a28c
FBXReader: remove debugging logs
2015-10-28 17:55:06 -07:00
Brad Hefta-Gaub
9785c55c58
Merge pull request #6217 from jherico/controllers
...
Fixing controller test link requirements
2015-10-28 17:43:02 -07:00
Brad Davis
d61b3e5790
Fixing controller link requirements
2015-10-28 17:41:52 -07:00
Brad Hefta-Gaub
db3d8c4956
Merge pull request #6213 from Atlante45/master
...
Fix ScriptEngine crash
2015-10-28 17:40:05 -07:00
samcake
630cdb8a9d
Modify the html presentiong the zone enity properties to match the internal new representation
2015-10-28 17:29:06 -07:00
David Rowe
568e5536b8
Control bandwidth stats dialog sizing similarly
2015-10-29 13:18:43 +13:00
David Rowe
4cb5ccab90
Fix audio stats dialog not being sized properly
2015-10-29 13:18:27 +13:00
Atlante45
136747929e
Fix typo
2015-10-28 17:11:46 -07:00
Howard Stearns
ba7d46b556
Merge branch 'master' of https://github.com/highfidelity/hifi into guard-rendering-of-avatar-collision-hull
2015-10-28 16:58:56 -07:00
Anthony J. Thibault
5acb088c46
FBXReader: More deterministic loading behavior
...
This makes iteration over meshes and connections between them deterministic.
[QHash](http://doc.qt.io/qt-5/qhash.html#details ) and QMultiHash do not guarantee consistent iteration order.
This is problematic for the FBXReader because it could result in different behavior each time a model was loaded.
Specifically, This was causing a bug with some avatars that contained multiple-bind poses.
The bind pose returned to the application from the FBXReader would be different on different runs.
This PR doesn't add support for multiple-bind poses, but it does make the choice of which
bind pose is chosen deterministic.
This non-determinism was the cause of the Mery avatar having "bug-eyes" 1/12 times.
2015-10-28 16:57:27 -07:00
