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
ccbae81dad
Merge branch 'master' into HEAD
...
Conflicts:
interface/src/avatar/SkeletonModel.cpp
2015-10-29 10:24:38 -07:00
samcake
e4aab4bd97
Merge branch 'master' of https://github.com/highfidelity/hifi into color
2015-10-28 15:32:13 -07:00
Brad Hefta-Gaub
61e35d7ada
Merge pull request #6203 from sethalves/fix-action-crash
...
adjust locking in EntityItem::getActionDataInternal
2015-10-28 14:02:28 -07:00
Seth Alves
22d6b6df34
make withWriteLock and withTryWriteLock const
2015-10-28 13:49:52 -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
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 Davis
5cbb2562cd
Move GL utilities out to their own library
2015-10-27 15:53:42 -07:00
Atlante45
c8c9118d4d
Improve script engine error logging + some cleanup
2015-10-27 12:11:27 -07:00
samcake
990764d855
Really fixing the MovingAverage class...
2015-10-26 13:29:13 -07:00
samcake
8e2c269cc0
doing the correct conversion for byte to normalize float...
2015-10-26 12:24:20 -07:00
samcake
a8872d065b
MOve the movingAverage class to shared next to SimpleMovingAverage
2015-10-26 11:23:13 -07:00
samcake
ff57b73bd6
Creating the COlorUTils in shared to deal with all the standard color conversions
2015-10-26 10:53:21 -07:00
Brad Hefta-Gaub
856af8c764
fix EntityItemID dependency
2015-10-21 14:33:12 -07:00
Brad Hefta-Gaub
ffd277d4d5
fix EntityItemID dependency
2015-10-21 14:31:17 -07:00
Brad Davis
21a3079a39
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-21 10:05:32 -07:00
Brad Davis
eacd6af032
Get conditional routes working
2015-10-20 16:32:00 -07:00
ericrius1
0373a481f8
Using EntityItemIDs instead of QUuids
2015-10-20 09:22:16 -07:00
Brad Davis
57be59935d
Move controller test to app
2015-10-17 19:13:38 -07:00
Brad Davis
5bac1aae2d
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-16 17:23:30 -07:00
David Rowe
8c22db17cc
Fix reading of QVector<float> from models files - polyline strokeWidths
2015-10-16 15:43:23 -07:00
ericrius1
47c3df7587
Cleaned up spacing
2015-10-12 17:38:52 -07:00
ericrius1
f93b1d3325
Correctly whitelisting entities for ray picking
2015-10-12 17:05:34 -07:00
Brad Davis
f77878ee79
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-12 11:05:28 -07:00
Brad Davis
6f5f6450df
Cleanup CMake files
2015-10-11 00:01:03 -07:00
Brad Davis
80c95cd8eb
Fixing access to second based timestamp
2015-10-10 16:07:26 -07:00
Brad Davis
9e4a7a6226
Working on controller refactoring
2015-10-10 03:05:42 -07:00
Anthony J. Thibault
b5ba621f78
Merge branch 'master' into tony/hmd-rest-detection
2015-10-09 14:36:18 -07:00
Andrew Meadows
7a918eb288
fix variable names in header
2015-10-07 15:25:07 -07:00
Andrew Meadows
464ef2293d
more descriptive variable names
2015-10-07 14:19:15 -07:00
Andrew Meadows
0680be0422
save sixense settings and some UI cleanup
2015-10-07 14:19:15 -07:00
Anthony J. Thibault
2dabe69341
When HMD is at rest, re-center the body under the avatar.
...
This should help the case when a user avatar is stuck in an
uncomfortable pose for a long period of time. If they stop
moving their head, the body should recenter itself and
appear more natural.
Added an AtRestDetector class. That tracks the average and variance
of both position and rotation (quaternion logarithms), then
detects when the variance falls under a threshold.
Also, renamed variables with the straighting prefix to straightening.
2015-10-06 20:37:51 -07:00
Thijs Wenker
f6afb4cb02
Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation
...
Conflicts:
interface/src/scripting/HMDScriptingInterface.h
2015-10-06 19:56:22 +02:00
Atlante45
598aab884e
Make log more readable
2015-10-05 14:59:28 -07:00
Anthony J. Thibault
fc7b6dee84
Merge branch 'master' into transmit-joint-translation
2015-10-02 11:40:33 -07:00
Andrew Meadows
50b2c8ae37
remove warnings in linux
2015-10-02 09:39:34 -07:00
Howard Stearns
53e7d5fd7c
Merge pull request #5975 from AndrewMeadows/cleanup-legacy-constraints
...
remove cruft relating to old verlet avatar skeleton simulation
2015-10-01 16:48:33 -07:00
David Rowe
e56d2d9b43
Add asserts
2015-10-01 15:48:37 -07:00
Andrew Meadows
09ac01a5e7
remove cruft from old verlet avatar simulation
2015-10-01 13:44:50 -07:00
David Rowe
c56ac24602
Improve particle property interpolation
...
Use Bezier interpolation instead of cubic so that values don't overshoot.
2015-09-30 11:37:22 -07:00
Seth Alves
d0a1e206ca
Merge branch 'master' of github.com:highfidelity/hifi into transmit-joint-translation
2015-09-29 13:55:13 -07:00
Seth Alves
ddeed8b4ee
code review
2015-09-29 06:51:24 -07:00
Brad Hefta-Gaub
3e758f3c6b
fix Triangle::getNormal, add normal display to rayPickExample
2015-09-28 09:05:39 -07:00
Brad Hefta-Gaub
ce3da099f6
normalize the surface normal from the triangle, coding standard fix, update example
2015-09-28 08:30:49 -07:00
Brad Hefta-Gaub
430cbcca7e
first cut at adding surface normals to ray intersection
2015-09-27 21:57:50 -07:00
Seth Alves
50dd8eba45
Relay joint translations across network. Apply animation's root-joint translation to avatar.
2015-09-26 11:40:39 -07:00
David Rowe
d063f3488d
Back out fromSpherical code addition
2015-09-24 19:14:26 -07:00
Brad Hefta-Gaub
ba73acf3b4
Merge pull request #5843 from ctrlaltdavid/20681
...
Replace point and vector particle emitter with spheroid emitter
2015-09-24 08:19:49 -07:00
Brad Hefta-Gaub
d14820d3ef
Merge pull request #5880 from thoys/20668
...
Worklist job #20668 - JS: Add option to listen audio from camera
2015-09-23 20:40:32 -07:00
Anthony J. Thibault
a9848cd157
Merge branch 'master' into tony/lean-threshold
2015-09-23 10:54:12 -07:00
