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
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
David Rowe
eb01ba9812
Merge branch 'master' into 20681
2015-09-23 09:42:56 -07:00
Brad Hefta-Gaub
02e1de3ba3
more warnings fixes
2015-09-22 21:35:13 -07:00
Brad Hefta-Gaub
9436d2922f
more warnings fixes
2015-09-22 21:18:04 -07:00
Anthony J. Thibault
d04f4d4b2b
Added shared DebugDraw singleton.
2015-09-22 19:57:23 -07:00
Thijs Wenker
617f048883
Added JS interface to change audio listening position / orientation in Interface
...
- MyAvatar.audioListenerMode change using: MyAvatar.FROM_HEAD , MyAvatar.FROM_CAMERA , MyAvatar.CUSTOM
- MyAvatar.customListenPosition and MyAvatar.customListenOrientation are for manual listening positions
2015-09-22 13:40:33 +02:00
Brad Hefta-Gaub
dc9c774eb5
merge model part quads and triangles together to reduce the number of draw calls
2015-09-21 13:09:43 -07:00
David Rowe
812ab9b7c6
Merge branch 'master' into 20681
...
Conflicts:
libraries/entities/src/EntityItemProperties.cpp
2015-09-18 16:44:04 -07:00
Brad Hefta-Gaub
4e2cb00ec3
first cut at only returning type specific properties in getEntityProperties
2015-09-17 17:33:53 -07:00
David Rowe
12e2cf3ce9
Emit in all directions from a point or the surface of a spheroid
2015-09-17 17:14:35 -07:00
Stephen Birarda
302fd923b8
Merge branch 'master' of https://github.com/highfidelity/hifi into phrc
2015-09-14 11:21:37 -07:00
Stephen Birarda
f7f54010f5
fixes for portable hrc class on win
2015-09-14 11:21:25 -07:00
Stephen Birarda
2737e74432
fix includes for portable hrc
2015-09-14 11:21:18 -07:00
Stephen Birarda
9b926f6f04
add an hrc with proper resolution for < VC2015
2015-09-14 11:21:08 -07:00
Seth Alves
93dc0714f7
quiet compiler
2015-09-12 10:10:53 -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
Andrew Meadows
94b0074165
Merge pull request #5765 from ctrlaltdavid/20669-tidy
...
Move cubic interpolation method to shared library
2015-09-11 16:58:22 -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
Brad Davis
e458eb7ae9
Merge pull request #5734 from sethalves/octree-shared-pointers
...
octree uses shared pointers
2015-09-11 16:00:04 -07:00
Brad Hefta-Gaub
5c6d8da97b
Revert "Make sure all entity script callbacks happen on the Entities script engine thread"
2015-09-11 11:55:36 -07:00
Brad Davis
244795b629
Merge branch 'homer' into temp
...
Conflicts:
interface/src/Application.cpp
2015-09-11 11:21:29 -07:00
Brad Davis
3bc9e8c98d
Fixing some entity race condition crashes
2015-09-10 20:43:41 -07:00
Brad Hefta-Gaub
8eacdbf1c4
first cut at making sure entity scripts are called on the entities script engine thread
2015-09-10 13:02:02 -07:00
David Rowe
016f3964ed
Fix typo
2015-09-10 10:03:27 -07:00
David Rowe
fa959c4554
Move cubic interpolation method to shared library
2015-09-10 08:53:16 -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
Seth Alves
9c4fdfd653
merge from upstream
2015-09-08 18:01:07 -07:00
Seth Alves
31fcd55d47
octree uses shared pointers
2015-09-08 11:59:48 -07:00
Stephen Birarda
ed19987b7d
resolve conflicts on merge with upstream/master
2015-09-04 12:31:46 -06:00
Anthony J. Thibault
df28c7bf1a
Merge branch 'master' into ajt/new-anim-system
2015-09-04 09:27:02 -07:00
