Seth Alves
3ac0fef1ea
merge from upstream
2015-11-01 15:22:57 -08:00
Brad Hefta-Gaub
9c23f2551d
Merge pull request #6207 from jherico/pluginSupport
...
Support for runtime plugins (DLLs)
2015-11-01 14:57:13 -08:00
Brad Davis
cfb2fd1523
Support for runtime plugins (DLLs)
2015-11-01 11:12:12 -08:00
Brad Hefta-Gaub
e899229cde
tweaks to how VrMenu is shown
2015-11-01 09:55:30 -08:00
Brad Hefta-Gaub
05dea847be
add Actions.CycleCamera and wire up secondary thumb buttons to Actions.CycleCamera and Actions.ContextMenu
2015-10-31 15:47:40 -07:00
Seth Alves
896ed3927c
merge from upstream
2015-10-30 19:17:43 -07:00
Anthony J. Thibault
085282db4f
Crash fix for AvatarManager when iterating over _avatarHash
...
The main problem is that a null shared pointer was inserted into the _avatarHash
via the AvatarManager::getAvatarBySessionID(). When the sessionID is not present
in the _avatarHash, [QHash](http://doc.qt.io/qt-5/qhash.html#operator-5b-5d ) will *insert*
an empty smart_ptr into the hash.
2015-10-30 16:13:04 -07:00
Andrew Meadows
f652e983a9
flag kinematic objs when changed in stepSimulation()
2015-10-30 14:53:29 -07:00
Brad Hefta-Gaub
8839458d54
Merge pull request #6242 from highfidelity/controllers
...
New Controller interfaces/api
2015-10-30 12:47:51 -07:00
Seth Alves
93503d0a21
make kinematic grab set entities kinematic in bullet and update entity position
2015-10-30 11:03:13 -07:00
samcake
f72146c35d
FIxing the mac build
2015-10-29 14:17:52 -07:00
samcake
d73eafddd1
COmfort mode working with the COntroller system observing the menu state
2015-10-29 13:48:16 -07:00
samcake
e902e5e97a
Introduce the concept of loading the default Mapping
2015-10-29 13:05:29 -07:00
Howard Stearns
3c6d4f9c22
Thread safety per #6154 .
2015-10-29 11:02:24 -07:00
Howard Stearns
6e4d0043c9
Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars
2015-10-29 10:32:12 -07:00
Brad Davis
ccbae81dad
Merge branch 'master' into HEAD
...
Conflicts:
interface/src/avatar/SkeletonModel.cpp
2015-10-29 10:24:38 -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
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
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
Howard Stearns
c47d246987
Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars
2015-10-29 08:27:12 -07:00
Howard Stearns
d79d0bc5c5
Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars
2015-10-29 08:25:41 -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
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
Anthony J. Thibault
5e73af9272
Rig: Removed dt from updateFromEyeParameters()
2015-10-28 18:10:41 -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
howard-stearns
62e56d3f13
Don't go to wrong position on startup/teleport.
...
This fixes one cause of being in the wrong place.
https://app.asana.com/0/32622044445063/61787931469907
2015-10-28 16:44:53 -07:00
Howard Stearns
bc0e14cb71
Don't render avatar's renderBoundingCollisionShapes before the data is there.
...
(Found while trying to repro "Deadlock in AvatarData::nextAttitude() on main thread" https://app.asana.com/0/32622044445063/61023569045356 )
2015-10-28 13:58:44 -07:00
Brad Davis
570b4a32da
Merge pull request #6206 from samcake/controllers
...
Controllers : Add a new kind onf controller to expose ReadOnly state from the application
2015-10-28 13:42:15 -07:00
Brad Davis
3c1a0930da
Merge remote-tracking branch 'upstream/master' into HEAD
...
Conflicts:
interface/src/avatar/MyAvatar.h
libraries/script-engine/src/ScriptEngine.cpp
libraries/script-engine/src/ScriptEngine.h
2015-10-28 13:38:22 -07:00
samcake
bbc6d9f5e7
Fixing typo and review comments
2015-10-28 12:52:21 -07:00
samcake
b37a6f689a
Fixing typo and review comments
2015-10-28 12:51:22 -07:00
samcake
fc15c7cd98
Adding the ApplicationStateDevice to the APplication class and add one entry ythere
2015-10-28 12:15:14 -07:00
Brad Hefta-Gaub
731fab6ffc
Merge pull request #6196 from jherico/gl
...
Move GL utilities to their own library
2015-10-28 12:10:52 -07:00
Brad Hefta-Gaub
c5e22a62e8
Merge pull request #6182 from Atlante45/script-engine
...
Improved ScriptEngine debug messages
2015-10-28 11:27:30 -07:00
Anthony J. Thibault
6ae5c540fd
SkeletonModel: coding standard fix
...
Replaced glm::vec3(0) with glm::vec3().
2015-10-28 11:09:24 -07:00
Howard Stearns
367175b8a6
Reduce lock time.
2015-10-28 10:49:19 -07:00
Andrew Meadows
afec2a9771
fix whitespace
2015-10-28 09:42:55 -07:00
samcake
57aa89d14f
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
2015-10-28 09:24:24 -07:00
samcake
92ca658aae
Trying to get a state controller to work
2015-10-28 09:23:20 -07:00
Anthony J. Thibault
ae8938cadc
Fix for local eye tracking in AnimGraph
...
Also moved Rig::updateAnimations() now occurs after
Rig::updateFromHeadParameters() and Rig::updateFromHandParameters().
This should remove a frame of lag for head and hand IK targets.
Rig::updateFromEyeParameters() occurs after Rig::updateAnimations().
But now the eye JointStates are re-computed, this is the actual
fix for the local eye tracking issue.
2015-10-27 18:30:35 -07:00
Brad Hefta-Gaub
65eae35433
a little more cleanup
2015-10-27 17:09:43 -07:00
samcake
6ec87086bc
Adding the state controller
2015-10-27 16:57:06 -07:00
Brad Hefta-Gaub
d86f1b50a7
more cleanup
2015-10-27 16:37:43 -07:00
Brad Hefta-Gaub
19743c1f39
gak, build busters and more CR feedback
2015-10-27 16:16:03 -07:00
Brad Hefta-Gaub
eb19364129
CR feedback
2015-10-27 15:56:27 -07:00
Brad Hefta-Gaub
133d48ebee
CR feedback
2015-10-27 15:53:48 -07:00
Brad Davis
5cbb2562cd
Move GL utilities out to their own library
2015-10-27 15:53:42 -07:00
