Stephen Birarda
8308dbf4a3
Merge pull request #5787 from huffman/cleanup-asset-requests-on-node-kill
...
DO NOT MERGE: Cleanup asset requests on node kill
2015-09-14 13:08:01 -07:00
Ryan Huffman
71456eee5e
Add UploadDialog error for NetworkError
2015-09-14 11:19:47 -07:00
Seth Alves
414d9162ef
change type of MAX_LOG_SIZE rather than cast its only use
2015-09-14 08:47:14 -07:00
Seth Alves
49ee251238
quiet compiler
2015-09-12 09:59:25 -07:00
Seth Alves
e65ef93663
Merge pull request #5778 from jherico/homer
...
Fixing some entity race condition crashes
2015-09-11 17:54:53 -07:00
Howard Stearns
4ffe2d0747
Merge pull request #5786 from AndrewMeadows/ik-with-constraints
...
inverse kinematics works with rotation constraints
2015-09-11 17:34:50 -07:00
Andrew Meadows
9c6060160a
Merge pull request #5784 from howard-stearns/rationalize-rig-settings
...
Rationalize rig settings
2015-09-11 16:56:44 -07:00
Brad Davis
9b81842850
Merge branch 'master' into homer
...
Conflicts:
assignment-client/src/octree/OctreeSendThread.cpp
interface/src/Application.cpp
libraries/entities-renderer/src/EntityTreeRenderer.cpp
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityTree.cpp
libraries/entities/src/EntityTreeElement.cpp
libraries/entities/src/EntityTreeElement.h
libraries/entities/src/EntityTreeHeadlessViewer.cpp
libraries/entities/src/RecurseOctreeToMapOperator.cpp
libraries/octree/src/Octree.h
libraries/physics/src/EntityMotionState.cpp
2015-09-11 16:31:18 -07:00
Andrew Meadows
e85cdad8c7
remove DependencyManager fetch of backpointer
2015-09-11 16:27:50 -07:00
Brad Davis
e458eb7ae9
Merge pull request #5734 from sethalves/octree-shared-pointers
...
octree uses shared pointers
2015-09-11 16:00:04 -07:00
Andrew Meadows
c589f0e58e
fix logic around rendering of hand targets
2015-09-11 13:42:17 -07:00
Andrew Meadows
ebadebbc87
render wireframe sphere for debug finger tip
2015-09-11 13:22:11 -07:00
Andrew Meadows
5296ddade9
remove unused menu item
2015-09-11 13:22:11 -07:00
Andrew Meadows
8d5106b072
improved debug render of hand coordinates
...
also cleaned up includes in Hand.h
2015-09-11 13:22:11 -07:00
Howard Stearns
f8f2a067a1
whitespace
2015-09-11 12:59:07 -07:00
Howard Stearns
02fba12a48
Merge branch 'master' of https://github.com/highfidelity/hifi into rationalize-rig-settings
2015-09-11 11:53:19 -07:00
Howard Stearns
67ce0966d1
Rationalize the rig state setters.
2015-09-11 11:52:20 -07:00
Brad Davis
7fecd3261d
Fixing bad merge
2015-09-11 11:40:57 -07:00
Brad Davis
244795b629
Merge branch 'homer' into temp
...
Conflicts:
interface/src/Application.cpp
2015-09-11 11:21:29 -07:00
Seth Alves
218225e4a5
Merge pull request #5781 from hyperlogic/tony/head-ik
...
Added head target to AnimGraph IK node.
2015-09-11 10:58:53 -07:00
Anthony J. Thibault
7996a02bd8
Added head target to AnimGraph IK node.
...
* In HMD mode head orientation and position is set.
* When not in HMD only orientation is set, position should
default to the underlying pose position.
2015-09-11 09:48:48 -07:00
Stephen Birarda
a286f4e7d0
Merge pull request #5772 from Atlante45/protocol
...
Asset server node JSON stats
2015-09-11 09:35:39 -07:00
Ryan Huffman
9ab603e9a5
Merge pull request #5773 from birarda/master
...
fail asset request if hash does not match
2015-09-11 09:09:56 -07:00
Atlante45
449d6a04d8
CR
2015-09-11 14:21:56 +02:00
Atlante45
42d1ab3745
Remove accidentally added header
2015-09-11 14:21:55 +02:00
Atlante45
5808658958
Make NodeJSONStats reliable
2015-09-11 14:21:53 +02:00
Brad Davis
e9edbb9dd1
Can't promote readlock to writelock
2015-09-10 22:52:40 -07:00
Brad Davis
92eeb564fe
PR comments
2015-09-10 20:57:43 -07:00
Brad Davis
aa989c3687
Fixing some entity race condition crashes
2015-09-10 20:53:17 -07:00
Brad Davis
3bc9e8c98d
Fixing some entity race condition crashes
2015-09-10 20:43:41 -07:00
Howard Stearns
0870c5ed87
Merge pull request #5768 from hyperlogic/tony/ik-and-controllers
...
AnimInverseKinematics and AnimController node
2015-09-10 15:38:53 -07:00
Stephen Birarda
973fd80c1d
fail asset request if hash does not match
2015-09-10 15:24:37 -07:00
David Rowe
4aa553c183
Stop DDE and EyeTracker early but don't destroy until later in shutdown
2015-09-10 14:53:56 -07:00
Anthony J. Thibault
3149baeefc
Merge branch 'master' into tony/ik-and-controllers
2015-09-10 11:04:31 -07:00
Anthony J. Thibault
68076ccf45
updated anim graph url to use ik-avatar.json
2015-09-10 10:57:30 -07:00
Andrew Meadows
35b894872d
Merge pull request #5753 from ctrlaltdavid/20671
...
Terminate DDE earlier during shut-down and always at start-up
2015-09-10 07:46:53 -07:00
David Rowe
fdcfa9657c
Rework and clarify stopping an existing DDE process
2015-09-09 21:06:50 -07:00
Brad Hefta-Gaub
f29bcd8b6a
Merge pull request #5755 from jherico/lisa
...
Fix possible hang when switching out of Oculus mode
2015-09-09 19:24:00 -07:00
Howard Stearns
da6444a776
Start anim graph in the right saved state on startup.
2015-09-09 17:02:55 -07:00
Howard Stearns
bcf16e52af
Merge branch 'master' of https://github.com/highfidelity/hifi into animGraph-cleanup
2015-09-09 16:04:15 -07:00
Howard Stearns
5e8fe29674
Remove unused declaration.
2015-09-09 15:09:06 -07:00
Howard Stearns
c1d68e058e
Reduce interconnection between AnimGraph and SkeletonModel by removing init and having MyAvatar:initAnimGraph go directly to rig (just like destroyAnimGraph does).
2015-09-09 15:02:11 -07:00
Brad Davis
382de2b4aa
Fix possible hang when switching out of Oculus mode
2015-09-09 14:09:01 -07:00
Howard Stearns
ed2ed525b2
Tear down animGraph when turning off the avatar update thread. Otherwise, big time deltas accumulate.
2015-09-09 12:15:48 -07:00
David Rowe
01d7e68dbb
Terminate DDE earlier during shut-down and always at start-up
2015-09-09 11:29:57 -07:00
Howard Stearns
3f5744712f
Remove optional "parent" argument.
...
GenericThread used to accept an optional "parent" argument, defaulting to nullptr.
This was odd, because the moveToThread() in GenericThread::initialize() would
become a no-op if the instance ever inits QObject(someNonNullParentQObject).
(The only clue would be a log message "QObject::moveToThread: Cannot move objects with a parent",
and things would end up in the same thread that created the instance.)
As it turns out, all the subclasses of GenericThread do not init
GenericThread(parent), so things worked as expected.
2015-09-09 11:04:17 -07:00
Howard Stearns
5572840133
Convert isHMD reference.
2015-09-09 10:39:36 -07:00
Howard Stearns
73a5714d66
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-09 10:37:11 -07:00
Howard Stearns
f081631075
Explicit cast.
2015-09-09 10:36:52 -07:00
Howard Stearns
24f1387579
Consistently use brace initialization in class headers.
2015-09-09 10:34:08 -07:00
