Atlante45
b3cdee278a
Different approach for bat positionning
2015-11-09 16:14:18 -08:00
Atlante45
9fa6216dc0
Merge branch 'baseball' of github.com:huffman/hifi into baseball
2015-11-09 15:18:12 -08:00
Ryan Huffman
4ab6536109
Fix Vive dynamic pointer cast compile error on Windows
2015-11-09 15:06:43 -08:00
Stephen Birarda
b42dea4555
Merge branch 'master' of https://github.com/Atlante45/hifi into baseball
2015-11-09 14:38:24 -08:00
Atlante45
767a7a7f1e
Fix warnings on OS X
2015-11-09 14:26:23 -08:00
Thijs Wenker
a58bd4ff05
Merge branch 'master' of https://github.com/worklist/hifi into 20724
2015-11-09 22:37:44 +01:00
Atlante45
6a53021818
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-09 13:23:31 -08:00
Anthony J. Thibault
a0f21228f6
AnimGraph support for start and stop animation from JavaScript
...
Follows the same model as the existing startAnimation and stopAnimation calls.
See kneel.js for an example.
2015-11-09 12:19:01 -08:00
Atlante45
a5c7269096
Use make_shared
2015-11-09 11:30:53 -08:00
samcake
2078c753ae
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-09 09:23:59 -08:00
Seth Alves
f3d26e163d
turn _drawItemStatus into a bitfield, split out bounding boxes and network/physics-sim-ownership. hook Display-Simulation-Ownership menu item to this system
2015-11-07 07:19:27 -08:00
Clément Brisset
2c27d18922
Merge pull request #6282 from jherico/externals
...
Runtime plugins fixes
2015-11-06 19:30:40 -08:00
Brad Davis
6122fa145d
More PR feedback
2015-11-06 17:17:26 -08:00
Brad Davis
37a9538f10
PR feedback, ensure destruction of shared objects
2015-11-06 16:57:31 -08:00
Brad Davis
11733c039f
Allow shared libraries to access core global objects
2015-11-06 16:57:31 -08:00
Atlante45
0a65bb145b
Some more code cleanup
2015-11-06 16:44:28 -08:00
samcake
b1d5a36dc6
removing useless differences
2015-11-06 16:40:46 -08:00
samcake
bc852d8eab
removing useless differences
2015-11-06 16:39:23 -08:00
samcake
5fb2c3ccd1
resolve merge conflict
2015-11-06 16:27:47 -08:00
Brad Davis
7c433f47c0
Breaking up input devices and input plugins classes.
2015-11-06 15:20:00 -08:00
James B. Pollack
8eea7ff67c
Merge pull request #6329 from sethalves/fix-grab-release
...
send to server upon grab release
2015-11-06 14:33:08 -08:00
Atlante45
55c6706f76
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-06 13:31:39 -08:00
AlessandroSigna
fdd4a55057
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-06 12:47:04 -08:00
AlessandroSigna
6d3a79af83
changed the behaviour of Standard.LY input
2015-11-06 12:46:08 -08:00
samcake
703a6bdb95
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-06 12:38:07 -08:00
Clément Brisset
5d80dc0c90
Merge pull request #6324 from sethalves/smooth-hold-action-velocity
...
smooth hold action velocity over 2 frames
2015-11-06 12:25:52 -08:00
Seth Alves
46b7b92b2f
prefix private member variables with _
2015-11-06 11:54:51 -08:00
samcake
a82c2d66ed
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-06 11:53:49 -08:00
Brad Davis
1dc392bb36
Merge pull request #6330 from Atlante45/master
...
// FIXME incredibly evil....
2015-11-06 11:43:33 -08:00
samcake
640845c944
Merge pull request #6328 from jherico/rec2
...
Add recording classes
2015-11-06 11:39:14 -08:00
Brad Davis
0bf29a441f
Add recording classes
2015-11-06 11:14:46 -08:00
Atlante45
c53c0ec53f
Fix double delete on shutdown
2015-11-06 11:13:10 -08:00
samcake
2f9c33dbfb
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-06 09:35:48 -08:00
samcake
46d9a14951
Work in progress, fixing the animation playback
2015-11-06 09:35:20 -08:00
samcake
63106f6991
Merge pull request #6322 from Atlante45/record
...
Recording fixes from Clement.
2015-11-06 09:28:58 -08:00
Seth Alves
4ed8a1e5d1
changes to send an update to entity-server when AvatarActionHold releases an entity
2015-11-06 09:25:53 -08:00
Thijs Wenker
de98a17ada
- rename CameraEntityItem to AnchorEntityItem
2015-11-06 01:58:08 +01:00
Atlante45
ffafd3194e
Recording audio fixes
2015-11-05 16:46:59 -08:00
Atlante45
c1029450d9
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-05 15:14:15 -08:00
Seth Alves
28d4d29bb6
smooth hold action velocity over 2 frames
2015-11-05 15:07:00 -08:00
samcake
2dfbbd2193
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-05 12:16:32 -08:00
Howard Stearns
aef8b7639d
Merge branch 'master' of https://github.com/highfidelity/hifi into away
2015-11-05 11:58:08 -08:00
Anthony J. Thibault
50370479e4
Application.h: coding standard fixes
2015-11-05 11:03:32 -08:00
samcake
bc5e0b7b96
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-05 09:57:11 -08:00
Anthony J. Thibault
d9f4b0218e
Merge branch 'master' into tony/mac-fixes
2015-11-05 08:26:44 -08:00
samcake
00797b4dea
Merge pull request #6314 from jherico/homer
...
Fixing step yaw to move by consistent amounts, be 'tappable'
2015-11-04 23:33:45 -08:00
Brad Davis
86b852231e
Merge pull request #6286 from EdgarPironti/master
...
Spacemouse migration
2015-11-04 19:15:35 -08:00
samcake
f4c610a0f4
Tuning the standard mapping for tbringin vertical axis
2015-11-04 18:21:04 -08:00
Brad Davis
20d1035821
Fixing step yaw to move by consistent amounts, be 'tappable'
2015-11-04 15:54:50 -08:00
Anthony J. Thibault
d46d521d81
Added #else branch to #if 0
2015-11-04 15:10:23 -08:00
Seth Alves
4ab727c47c
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-11-04 13:57:59 -08:00
Thijs Wenker
42cbccc725
fix stretchy HMD view on entity camera
2015-11-04 21:39:22 +01:00
Thijs Wenker
ee218faf5e
Merge branch '20724' of github.com:thoys/hifi into 20724
2015-11-04 21:21:57 +01:00
Anthony J. Thibault
69f1cfbcb9
Fixes for Mac build and crash on startup
...
For some reason the qt code gen is getting confused by the #if 0
in 3DConnextionClient.h, so I added a stub implementation.
In Application.cpp the change of moving idle into paintGL had a sideeffect
of calling OffscreenGlCanvas before it was initialized. To work around this
I added a guard to prevent calling idle before all the gl windows/widgets have
been initialized.
2015-11-04 12:04:34 -08:00
Atlante45
d9cd986db2
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-04 11:26:16 -08:00
Anthony Thibault
275b248547
Merge pull request #6302 from AndrewMeadows/fix-avatar-drift
...
fix slow drift of avatar when wearing HMD
2015-11-04 11:19:45 -08:00
samcake
d4259931b2
Setting the step yaw to 22.5 degrees
2015-11-04 10:57:39 -08:00
samcake
ce5e89ce66
removing the pulsing mechanism in MyAvatar and making a new stadnard.json mapping file
2015-11-04 10:53:53 -08:00
Howard Stearns
7b9245022c
Merge branch 'away' of https://github.com/howard-stearns/hifi into away
2015-11-04 10:46:16 -08:00
U-GAPOS\andrew
9de5721a48
set _hmdFollowVelocity to zero when done following
2015-11-04 10:23:55 -08:00
Seth Alves
f2be71d1a5
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-11-04 09:32:21 -08:00
Seth Alves
270b4b97fc
remove a left-over kludge that was causing the appearence of frame-lag in held objects
2015-11-04 02:26:02 -08:00
EdgarPironti
ade0862948
Spacemouse fixes
2015-11-04 00:49:40 -08:00
EdgarPironti
1ab683643c
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-11-04 00:36:38 -08:00
Brad Davis
439bdbc0e4
Merge pull request #6298 from samcake/controllers
...
Controllers : Removing dead files
2015-11-03 19:57:37 -08:00
EdgarPironti
7adf38f781
Spacemouse migration
2015-11-03 18:22:55 -08:00
EdgarPironti
2a84cadd5d
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-11-03 18:22:29 -08:00
Atlante45
3a545399e3
Remove our idle() from paintGL now that it's in master
2015-11-03 17:56:40 -08:00
Thijs Wenker
d7279e4c88
Support for Camera Entities.
...
- New entity type: camera, with just the basic properties of an entity (position, rotation, name etc.).
- New CameraMode: CameraEntity
- Example script using the new cameraEntity
- Updated edit.js to use the CameraEntities (with button to preview the camera)
2015-11-04 02:51:23 +01:00
Atlante45
55894f2eee
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-03 17:46:24 -08:00
Atlante45
eb990c9c1c
More basebal test code
2015-11-03 17:45:01 -08:00
Howard Stearns
4a54f2052e
Merge branch 'master' of https://github.com/highfidelity/hifi into away
2015-11-03 17:42:38 -08:00
Seth Alves
ffb0317a50
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-11-03 16:53:00 -08:00
Seth Alves
fbaa86426c
re-remove the _nextPosition stuff
2015-11-03 16:52:46 -08:00
Brad Hefta-Gaub
71e4092276
Merge pull request #6283 from hyperlogic/tony/one-update-for-every-render
...
Remove idleTimer and call idle directly from paintGL.
2015-11-03 16:38:43 -08:00
Seth Alves
60824a1fb0
back out some off-brand changes. add parentChanged call
2015-11-03 16:07:28 -08:00
Anthony J. Thibault
31f361d49c
Moved fps timing to beginning of paintGL
...
This should improve accuracy.
However the fps displayed can still sometimes be slightly greater then the
vsync, this is either due to timer accuracy problems or QTimer delay within
OpenGLDisplayPlugin.
2015-11-03 15:51:18 -08:00
samcake
4d62c532f5
Removing dead config files
2015-11-03 15:35:13 -08:00
U-GAPOS\andrew
d544b7a645
fix bug: avatar can't walking when HMD at rest
2015-11-03 13:59:15 -08:00
Andrew Meadows
4215ce5d25
Merge pull request #6212 from howard-stearns/dont-use-other-avatar-sounds
...
Don't play other avatar's collision sounds.
2015-11-03 13:40:27 -08:00
Andrew Meadows
498cec3abd
Merge pull request #6294 from AndrewMeadows/fix-hydra-sans-hmd
...
fix hydra sensor matrix when no HMD is attached
2015-11-03 13:37:03 -08:00
Seth Alves
dba9eb7046
merge from upstream
2015-11-03 13:35:17 -08:00
howard-stearns
a7162eefbe
Add alphaVar for ik.
2015-11-03 13:10:25 -08:00
EdgarPironti
d99838de9c
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-11-03 12:25:19 -08:00
Brad Hefta-Gaub
b366011d22
Merge pull request #6293 from jherico/lisa
...
Disabling billboard rendering, source of the evil black rectangles
2015-11-03 12:13:51 -08:00
Atlante45
0508091130
Rebase fixes
2015-11-03 11:37:57 -08:00
Andrew Meadows
e160e2a7ae
the minimal fix
2015-11-03 11:37:30 -08:00
Brad Davis
4c076d8b12
Disabling billboard rendering, source of the evil black rectangles
2015-11-03 11:34:05 -08:00
Andrew Meadows
12ff9734e0
init _bodySensorMatrix in ctor
2015-11-03 11:26:49 -08:00
Atlante45
52c61f069f
Merge branch 'master' of https://github.com/highfidelity/hifi into vive
2015-11-03 11:21:54 -08:00
Anthony J. Thibault
c139b62217
fps calculation now based on moving average
...
fps stat is now calcualted the same way as simRate and avatarRate are calculated,
based on a moving average that is sampled once a second.
Also, Removed unused constants and renamed Application::checkFPS to Application::ping
2015-11-03 11:19:49 -08:00
Clément Brisset
c63fc8557c
More baseball test code
2015-11-03 11:14:59 -08:00
Clément Brisset
40ce2416e8
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-03 11:13:57 -08:00
Ryan Huffman
03a338dfe6
Merge branch 'baseball' of github.com:birarda/hifi into baseball
2015-11-03 11:13:56 -08:00
Stephen Birarda
8cd41b9383
resolve conflicts on merge with huffman/baseball
2015-11-03 11:13:15 -08:00
Ryan Huffman
55789fed99
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-03 11:11:26 -08:00
Ryan Huffman
67b43cafc1
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-03 11:10:47 -08:00
Ryan Huffman
ccb25f4b63
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-03 11:10:45 -08:00
Ryan Huffman
afffe7f5c6
Merge branch 'master' of github.com:Atlante45/hifi into baseball
2015-11-03 11:10:14 -08:00
Atlante45
f2ff0b40f7
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-11-03 11:06:19 -08:00
Clément Brisset
31d92fd90a
Baseball test code
2015-11-03 11:00:35 -08:00
samcake
78e3f8ebbc
Merge pull request #6281 from AlessandroSigna/master
...
Vive - fix input drifting
2015-11-03 10:19:59 -08:00
Howard Stearns
70b1165393
Merge branch 'master' of https://github.com/highfidelity/hifi into away
2015-11-03 10:01:36 -08:00
James B. Pollack
be33b40ced
Merge pull request #6287 from jherico/homer
...
Removing iviewhmd due to broken production builds
2015-11-02 23:56:26 -08:00
Brad Davis
eeabc9b093
Removing iviewhmd due to broken production builds
2015-11-02 23:49:03 -08:00
EdgarPironti
5d695da630
Do not merge - Spacemouse
2015-11-02 23:31:10 -08:00
EdgarPironti
603405ad61
Do not merge - Spacemouse
2015-11-02 23:29:15 -08:00
Brad Davis
764ecba2a8
Adding diagnostics to track down the 'black rectangles of death'
2015-11-02 21:55:35 -08:00
Howard Stearns
b74ed36883
Fix outro start times, and introduce away states (which are not used in C++ code, but are used in script).
2015-11-02 20:39:31 -08:00
Anthony J. Thibault
0c12bb5a4e
Remove idleTimer and call idle directly from paintGL.
2015-11-02 18:47:18 -08:00
AlessandroSigna
b77945d430
Vive - fix input drifting
...
Conflicts:
libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp
2015-11-02 16:06:17 -08:00
Brad Davis
699a13b2a7
Merge pull request #6275 from ZappoMan/mappingTweaks
...
Mapping tweaks to match Controllers spec
2015-11-02 16:06:08 -08:00
Seth Alves
310a5c9bfb
don't initialize SMI sdk unless we need it
2015-11-02 13:42:12 -08:00
Brad Hefta-Gaub
d359aa3b65
more tweaks
2015-11-02 13:41:16 -08:00
Brad Hefta-Gaub
46bedf7667
more tweaks to hydra mappings
2015-11-02 13:35:49 -08:00
Anthony J. Thibault
2236573a9d
Merge branch 'master' into tony/anim-sync-blend
2015-11-02 12:18:11 -08:00
Stephen Birarda
017cee6961
make shouldRenderLocally do the right thing
2015-11-02 11:59:09 -08:00
U-GAPOS\andrew
a77f888f15
more correct HMD offset correction velocity
2015-11-02 11:29:17 -08:00
U-GAPOS\andrew
a545d770d8
fix bug preventing avatar motion in 2D mode
2015-11-02 11:07:43 -08:00
Andrew Meadows
9799693135
remove extra whitespace
2015-11-02 11:07:41 -08:00
Andrew Meadows
fd557c4e52
route HMD-following through the physics simulation
2015-11-02 11:07:40 -08:00
Brad Hefta-Gaub
b00f572e1a
add mouseClicked inputs vs mouseButton inputs, make right-click work without right button drag
2015-11-02 09:21:15 -08:00
Anthony J. Thibault
e3e759248f
Merge branch 'master' into tony/anim-sync-blend
2015-11-02 08:37:10 -08:00
Brad Hefta-Gaub
70b9aa5ff1
remove right click context menu until we can make it work with camera move better
2015-11-02 07:42:52 -08:00
Howard Stearns
fc63fa6f7b
Update comments, and don't continue through collisions after finding one for our avatar.
2015-11-01 18:55:43 -08:00
Howard Stearns
ea2971a24f
Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds
2015-11-01 17:02:59 -08:00
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
77816d818a
make RY map to jump
2015-10-31 16:00:22 -07: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
Howard Stearns
79f05c63e5
Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds
2015-10-31 11:23:18 -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
Brad Hefta-Gaub
22324eb281
more tweaking of keyboard input routes
2015-10-30 14:55:33 -07:00
Andrew Meadows
f652e983a9
flag kinematic objs when changed in stepSimulation()
2015-10-30 14:53:29 -07:00
Howard Stearns
28246c1951
Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds
2015-10-30 13:21:56 -07:00
Brad Hefta-Gaub
ce7fed2292
fix json
2015-10-30 13:16:31 -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
Anthony Thibault
fcfb44207f
Merge pull request #6097 from howard-stearns/expose-anim-vars
...
Expose animation vars to Javascript
2015-10-30 10:50:42 -07:00
Brad Hefta-Gaub
b2f27054f4
Merge pull request #6239 from AlessandroSigna/controllers
...
ViveController - input mapping
2015-10-30 10:39:26 -07:00
Brad Davis
49e7d42c2c
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-30 10:07:40 -07:00
Brad Davis
fcfab0fc51
Moving SDL2, Sixense and Faceshift to external projects
2015-10-30 00:57:51 -07:00
Brad Hefta-Gaub
70f3156328
make sure CompositeEndpoints properly report readability more axis based keyboard inputs
2015-10-29 22:37:12 -07:00
Brad Hefta-Gaub
8a03383adc
use makeAxis for some keyboard support
2015-10-29 22:19:33 -07:00
Howard Stearns
c2873ef720
Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds
2015-10-29 22:17:31 -07:00
Howard Stearns
792fed0090
We weren't setting type for avatar motion states.
2015-10-29 22:15:26 -07:00
AlessandroSigna
01d3805148
ViveController - mapping of buttons
2015-10-29 18:44:43 -07:00
Anthony J. Thibault
047614b2eb
New left and right grab animations.
2015-10-29 16:18:39 -07:00
Brad Hefta-Gaub
b070306c2c
tweak comfort mode filters
2015-10-29 15:53:17 -07:00
Brad Hefta-Gaub
c962697b18
Merge pull request #6230 from samcake/controllers
...
Controllers : Comfort mode is working through the stanadrd mapping
2015-10-29 14:59:42 -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
AlessandroSigna
ffd2b39874
Fix vive controller - update to new input plugin register
2015-10-29 13:18:37 -07:00
samcake
e902e5e97a
Introduce the concept of loading the default Mapping
2015-10-29 13:05:29 -07:00
samcake
8f908f9877
Adding the stepYaw to the Standard mapping
2015-10-29 12:08:11 -07:00
Anthony J. Thibault
f7b6fab0c3
Merge branch 'master' into tony/anim-sync-blend
2015-10-29 11:35:48 -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
b2a5452f87
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
2015-10-27 16:57:22 -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
Brad Hefta-Gaub
7000350317
Merge branch 'controllers' of https://github.com/highfidelity/hifi into myAvatarPalmTweaks
2015-10-27 14:57:35 -07:00
Andrew Meadows
e35596428c
cleanup comment
2015-10-27 14:43:18 -07:00
Atlante45
32f88f3fb6
Fix for JSConcole
2015-10-27 14:37:39 -07:00
Brad Hefta-Gaub
5a42991e0c
first pass at cleaning up MyAvatars use of PalmData
2015-10-27 13:51:42 -07:00
Andrew Meadows
8b285fd228
recover follow HMD behavior
2015-10-27 13:51:40 -07:00
Andrew Meadows
43aac813da
more prep for shifting avatar during HMD motion
2015-10-27 13:15:38 -07:00
Andrew Meadows
24c2f538a4
keep MyAvatar RigidBody on shape changes
2015-10-27 13:15:38 -07:00
Andrew Meadows
355ebe923d
cleanup and comments
2015-10-27 13:15:38 -07:00
Andrew Meadows
5e59e9595b
fix typo in comments
2015-10-27 13:15:38 -07:00
Andrew Meadows
5f278f9024
name change
2015-10-27 13:15:38 -07:00
Andrew Meadows
a1f1e50431
split CharacterController btw phys and interface
2015-10-27 13:15:38 -07:00
EdgarPironti
596b315286
Fixed standard.json
2015-10-27 11:35:30 -07:00
samcake
a0104884f5
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
2015-10-27 09:59:48 -07:00
samcake
87cf3b237b
Supporting a InHMD action and using it to enable COmfort mode
2015-10-27 09:59:22 -07:00
AlessandroSigna
5bce95189b
fix keyboard mapping (keyboardMouse.js)
2015-10-26 18:14:57 -07:00
Seth Alves
8d0aaed41a
fix bug that was deleting actions with 0 ttl. in js interface, action parameter 'lifetime' is now called 'ttl'
2015-10-26 13:50:21 -07:00
Brad Davis
f38303a9a5
Adding vive default mapping
2015-10-26 10:36:31 -07:00
Howard Stearns
900b07fdee
dead code
2015-10-26 10:00:07 -07:00
Howard Stearns
7b0b77f4d1
getAvatarHash => withAvatarHash
2015-10-23 16:57:27 -07:00
Brad Davis
e8be92cab8
Adding input action event
2015-10-23 13:36:06 -07:00
Brad Hefta-Gaub
f90844449d
fix angular velocity
2015-10-23 13:16:05 -07:00
Brad Hefta-Gaub
4a58eeb810
expose deltaRotation as part of MyAvatar.xxxHandPose
2015-10-23 12:14:33 -07:00
Brad Hefta-Gaub
71dfff7c35
first cut at adding MyAvatar.xxxHandPose
2015-10-23 12:00:40 -07:00
Anthony J. Thibault
8689170415
Removed sync and timescale from AnimBlendLinear node.
...
AnimBlendLinearMove will now be used instead.
2015-10-22 16:40:53 -07:00
Anthony J. Thibault
a66f31bb20
Added AnimBlendLinearMove node
...
AnimBlendLinearMove is now in use by forward, backward and strafe movements.
Tuned rig moving average speeds to be more sensitive.
2015-10-22 16:33:31 -07:00
Brad Davis
a9aea9b477
Working on TestController display
2015-10-22 15:53:19 -07:00
Brad Davis
8c163a52e9
Attempting to fix log graphs
2015-10-22 15:49:58 -07:00
Seth Alves
d86d69aeba
keep track of children. use local position and orientation on the wire.
2015-10-22 15:36:03 -07:00
Howard Stearns
f0a4e25e89
Name change per comments.
2015-10-22 15:25:14 -07:00
Howard Stearns
ecc920199d
Return id suitable for use with remover, per comments.
2015-10-22 15:24:24 -07:00
Howard Stearns
1d0464ede5
Name change and thread checks per comments.
2015-10-22 15:15:10 -07:00
Seth Alves
f6fe503c51
pass avatar parent information through avatar-mixer
2015-10-22 13:44:04 -07:00
Howard Stearns
0d514ad645
Thread-safe avatar list access
2015-10-22 13:02:08 -07:00
Brad Davis
5227c40298
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-22 12:15:41 -07:00
samcake
2ebf862da9
Merge pull request #6148 from jherico/controllerFunctions
...
Fixing controller functions & makeAxis
2015-10-22 11:56:58 -07:00
Brad Davis
7ed9ed8500
Merge pull request #6149 from ZappoMan/exposeMyAvatarHandsToJS
...
make handControllerGrab.js work with new API
2015-10-22 11:40:48 -07:00
Brad Hefta-Gaub
67f2a0c6c8
CR feedback on mappings
2015-10-22 11:39:51 -07:00
Anthony J. Thibault
a9ed033b20
Merge branch 'master' into tony/anim-sync-blend
2015-10-22 11:18:30 -07:00
Seth Alves
264b658132
hook up entities and avatars to SpatialParentFinder
2015-10-22 11:05:48 -07:00
Howard Stearns
a58539be82
Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars
2015-10-22 10:39:54 -07:00
Brad Davis
5d4cbfdacb
Resolving ambiguity between functions and inputs differently
2015-10-22 09:50:24 -07:00
Brad Davis
4938e5ea84
Fixing function based routes, makeAxis
2015-10-22 09:50:23 -07:00
Brad Hefta-Gaub
3e7364608b
make handControllerGrab.js work with new API
2015-10-22 09:17:29 -07:00
Brad Davis
afcec347ff
Wiring yaw action to avatar
2015-10-21 21:35:19 -07:00
Howard Stearns
9fd61907f5
Call back to Javascript asynchronously, so that we don't block and the script's engine doesn't have thread conflicts.
2015-10-21 20:50:07 -07:00
Brad Davis
044a28212d
Wiring step yaw to the avatar
2015-10-21 20:44:38 -07:00
Brad Davis
637654adea
Wiring up step yaw
2015-10-21 18:46:09 -07:00
Anthony J. Thibault
c83af43d0e
Added strafe and backward blending
2015-10-21 17:34:09 -07:00
Brad Hefta-Gaub
68a2985b7a
add tip position as well
2015-10-21 17:14:48 -07:00
Brad Hefta-Gaub
a3900a954b
expose MyAvatar.leftHandePosition and MyAvatar.rightHandPosition to JS
2015-10-21 17:03:54 -07:00
Brad Davis
4a1df286fd
Cleanup of enums and JS names
2015-10-21 15:57:37 -07:00
Brad Davis
b9b03bd842
Working on conditional and filter parsing
2015-10-21 14:40:33 -07:00
Seth Alves
3944d7be0f
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-10-21 13:50:17 -07:00
Seth Alves
c0eccca6d3
relay 'kinematic' mode of a hold to other interfaces
2015-10-21 12:29:26 -07:00
Brad Davis
a124d3b433
Moving to InputEndpoint, fixing build problem
2015-10-20 22:00:16 -07:00
Brad Davis
de57c3b4d6
Merge remote-tracking branch 'upstream/controllers' into controllers
...
Conflicts:
libraries/controllers/src/controllers/UserInputMapper.cpp
2015-10-20 21:59:00 -07:00
samcake
da26d0dee1
Adding the hand poses channels in the controller mapping files
2015-10-20 18:19:44 -07:00
samcake
e0615309bb
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
2015-10-20 17:48:38 -07:00
Brad Davis
cd940325c2
Merge remote-tracking branch 'upstream/controllers' into controllers
2015-10-20 17:48:29 -07:00
Brad Davis
0e419e3fbb
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-20 17:47:37 -07:00
Anthony J. Thibault
41cce4320a
Merge branch 'tony/anim-sync-blend' into test
2015-10-20 17:39:13 -07:00
Howard Stearns
574a51e831
Use cleaner interface.
2015-10-20 17:02:16 -07:00
samcake
da55011c2a
Trying to merge
2015-10-20 16:38:41 -07:00
Anthony J. Thibault
5cd2786c1d
First pass at Rig timeScaling and blending between slow, walk and run.
2015-10-20 16:37:05 -07:00
Brad Davis
eacd6af032
Get conditional routes working
2015-10-20 16:32:00 -07:00
Seth Alves
6cb195b335
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-10-20 15:53:56 -07:00
Andrew Meadows
d02fe784a9
css and cfg filetypes are text in .gitattributes
2015-10-20 13:58:44 -07:00
Howard Stearns
4c6867bb9c
Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars
2015-10-20 12:17:00 -07:00
Seth Alves
bc99ef778c
change how render engine is told about model position changes
2015-10-20 12:04:29 -07:00
Anthony J. Thibault
11f2d29bf8
AnimBlendLinear: bugfixes for sync flag added timeScale
2015-10-20 10:36:37 -07:00
Brad Davis
bea6fdd890
Working on JSON parsing and cleanup
...
Conflicts:
libraries/controllers/src/controllers/Route.cpp
libraries/controllers/src/controllers/ScriptingInterface.cpp
libraries/controllers/src/controllers/StandardController.cpp
libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
2015-10-20 10:20:28 -07:00
Brad Davis
ef6c4f6f66
Working on JSON parsing and cleanup
...
Conflicts:
libraries/controllers/src/controllers/Route.cpp
libraries/controllers/src/controllers/ScriptingInterface.cpp
libraries/controllers/src/controllers/StandardController.cpp
libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
2015-10-20 10:15:36 -07:00
Brad Davis
8d0148a1ca
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-20 10:13:31 -07:00
Andrew Meadows
341bc3666f
Merge pull request #6093 from sethalves/hold-action-changes
...
Hold action changes
2015-10-20 09:19:48 -07:00
Seth Alves
83f69bcb6e
merge from upstream
2015-10-19 19:21:33 -07:00
Brad Hefta-Gaub
9f17f10d6a
fix warning in master
2015-10-19 17:56:38 -07:00
Seth Alves
4feb9dc8c6
prepare for possible future coding standard
2015-10-19 17:46:34 -07:00
Brad Hefta-Gaub
7669f9ed2c
fix several warnings
2015-10-19 17:26:57 -07:00
Seth Alves
41f7ef1e2e
cleanups
2015-10-19 16:53:27 -07:00
Brad Hefta-Gaub
56f625d376
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-19 16:53:25 -07:00
Anthony J. Thibault
0c36180e2f
avatar-animation.json: Adjustment to sidestep endFrame, to prevent stalling at end
2015-10-19 15:49:53 -07:00
Anthony J. Thibault
2b4788929f
AnimBlendLinear: Untested implementation of sync flag.
...
Move accumulateTime into AnimUtil.
2015-10-19 15:49:49 -07:00
Brad Hefta-Gaub
0b2bf8bda8
remove some dead code
2015-10-19 15:23:45 -07:00
Brad Hefta-Gaub
110adc5c22
fix model LOD behavior
2015-10-19 15:21:25 -07:00
Seth Alves
46e5bf0435
take entity-server clock-skew into account when handling action expiration times
2015-10-19 11:59:03 -07:00
Brad Davis
22602fb6f6
Fixing line endings
2015-10-19 10:00:16 -07:00
Brad Davis
a8e707ced2
Correcting update order to fix mouse
2015-10-18 22:46:14 -07:00
Brad Davis
184303d3c9
Using JS mappings for joystick, updating test code
2015-10-18 20:44:32 -07:00
Brad Davis
734a39f962
Breaking up UserInputMapper, restoring some mappings
2015-10-18 18:58:03 -07:00
Seth Alves
a78f2a9577
have avatar make use of SpatiallyNestable
2015-10-18 09:48:46 -07:00
Seth Alves
275e77d29e
remove old-style avatar referentials
2015-10-18 07:51:00 -07:00
Brad Davis
57be59935d
Move controller test to app
2015-10-17 19:13:38 -07:00
samcake
f675035fd1
Merge pull request #6101 from jherico/controllers
...
Hydra controller updates and test code
2015-10-16 17:43:44 -07:00
Brad Davis
5bac1aae2d
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-16 17:23:30 -07:00
Brad Davis
db0fa6b8ed
Update hydra mappings and test code
2015-10-16 17:23:09 -07:00
Howard Stearns
91c2d31118
Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars
2015-10-16 15:51:09 -07:00
Howard Stearns
770282ad88
Javascript methods to getAvatars listing and getAvatar from id.
2015-10-16 15:22:43 -07:00
Seth Alves
aaad1a4a36
Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes
2015-10-16 14:34:21 -07:00
samcake
f0034844e7
Actions working from the Controller layer
2015-10-16 12:24:12 -07:00
Brad Hefta-Gaub
88a66d3c52
Merge pull request #6088 from hyperlogic/tony/regen-english-translation-strings
...
Updated english translation file
2015-10-16 10:59:26 -07:00
Seth Alves
fe709a9397
keep object active in kinematic mode, also
2015-10-16 10:53:33 -07:00
Howard Stearns
f25cc93936
Initial prototype of exposing anim vars to javascript.
2015-10-16 10:48:36 -07:00
Seth Alves
966499b9e5
continually activate (in the bullet sense) a held object
2015-10-16 10:17:17 -07:00
Seth Alves
d2b7e5c4eb
Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes
2015-10-16 09:54:26 -07:00
Ryan Huffman
9ddcfdf94d
Cleanup PacketReceier and ReceivedMessage
2015-10-16 09:21:10 -07:00
Seth Alves
b18bb1e076
Merge pull request #6084 from AndrewMeadows/physics-cleanup
...
move DIRTY_FLAGS out of EntityItem namespace
2015-10-16 07:22:40 -07:00
Seth Alves
359a318568
fold kinematic hold into normal hold (disabled by default, an argument enables)
2015-10-15 20:23:06 -07:00
Seth Alves
0964180f2c
code review
2015-10-15 17:10:47 -07:00
Stephen Birarda
e5825daa57
Merge pull request #6090 from ZappoMan/fixStat
...
Add some additional stats for debugging edit lags
2015-10-15 16:00:29 -07:00
Ryan Huffman
421e2a6c21
Merge pull request #6078 from imgntn/top_tool_tabs
...
Move Edit.js Tool Window Tabs to the Top
2015-10-15 15:40:42 -07:00
James B. Pollack
aee11d4c06
cleanup merge
2015-10-15 15:05:34 -07:00
James B. Pollack
112007e5a9
cleanup
2015-10-15 14:58:05 -07:00
Seth Alves
462918ffcf
cleanups
2015-10-15 14:55:17 -07:00
Seth Alves
487131dde1
cleanups
2015-10-15 14:52:38 -07:00
Seth Alves
36a523478f
Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes
2015-10-15 14:21:30 -07:00
Seth Alves
4903db45b1
give other avatars an anim-skeleton
2015-10-15 14:21:06 -07:00
James B. Pollack
8b57b3c0ff
fix memory leak
2015-10-15 14:13:07 -07:00
Ryan Huffman
7682ab00e3
Add ReceivedMessage and receive progress
2015-10-15 14:09:53 -07:00
Andrew Meadows
3d17c57910
Merge pull request #6083 from sethalves/groundwork-for-hold-action-changes
...
Groundwork for hold action changes
2015-10-15 13:30:02 -07:00
Brad Davis
4f8e2c9f6b
Fix JSON format errors
2015-10-15 13:18:04 -07:00
James B. Pollack
e63ed5cf84
Merge pull request #6087 from thoys/20708
...
CR for Job #20708 - Script Editor Improvements
2015-10-15 12:28:32 -07:00
Brad Davis
80c962a4cc
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-15 12:27:53 -07:00
Brad Hefta-Gaub
923e1ed208
add more processing stats
2015-10-15 12:21:36 -07:00
Seth Alves
a70ba4cd5a
add some accessors
2015-10-15 11:42:53 -07:00
Anthony J. Thibault
605da499c8
Updated english translation file
...
Generated using the following command:
~/code/hifi > lupdate interface -ts interface/i18n/interface_en.ts
Scanning directory 'interface'...
Updating 'interface/i18n/interface_en.ts'...
Found 146 source text(s) (130 new and 16 already existing)
Kept 28 obsolete entries
NOTE: this translation file is far from complete, many menu strings from Menu.h do not show up in this list.
2015-10-15 11:15:06 -07:00
Seth Alves
1d8db13f41
switch to low-entity-server traffic hold
2015-10-15 10:56:47 -07:00
Seth Alves
64c5cde2d2
further unmangle branch split
2015-10-15 10:33:58 -07:00
Seth Alves
a78728c96b
further unmangle branch split
2015-10-15 10:29:25 -07:00
Seth Alves
8195145dc7
further unmangle branch split
2015-10-15 10:13:00 -07:00
Seth Alves
d833fb08d7
further unmangle branch split
2015-10-15 10:03:32 -07:00
Andrew Meadows
2ae62de84e
Merge pull request #6026 from birarda/qt-polling-env
...
set bearer poll timeout env for wlan scan in Qt 5.5
2015-10-15 09:58:32 -07:00
Andrew Meadows
fa17b77d70
move DIRTY_FLAGS out of EntityItem namespace
2015-10-15 09:34:09 -07:00
Seth Alves
c96f7562f2
Merge branch 'master' of github.com:highfidelity/hifi into groundwork-for-hold-action-changes
2015-10-15 09:28:57 -07:00
Seth Alves
7ef5fc9613
remove line that leaked over from other branch
2015-10-15 09:19:47 -07:00
Seth Alves
9f40c7bf8c
fix up AvatarActionHold
2015-10-15 09:13:06 -07:00
Seth Alves
5ebefadda1
remove some debugging
2015-10-15 09:07:35 -07:00
Thijs Wenker
8111432088
Merge branch 'master' of https://github.com/worklist/hifi into JS_Rotation_FIX
2015-10-15 14:50:20 +02:00
James B. Pollack
c8b6fed0e0
Update ToolWindow.cpp
2015-10-14 21:18:17 -07:00
James B. Pollack
84973c590d
Update ToolWindow.h
2015-10-14 21:17:19 -07:00
James B. Pollack
c18aeef6b3
remove redundant call
2015-10-14 17:29:38 -07:00
James B. Pollack
a1e2292e62
remove title bar from docked tool widgets
2015-10-14 17:27:45 -07:00
Clément Brisset
efd106e68c
Merge pull request #6075 from birarda/default-asset-server
...
add a migrator to move assets to ATP
2015-10-14 17:02:10 -07:00
Brad Davis
e39219c2b5
Fixes and PR comments
2015-10-14 16:51:52 -07:00
Brad Davis
0063f9ae1d
Merging old and new controller interfaces
2015-10-14 15:16:54 -07:00
James B. Pollack
536351e9d5
move set tab position to constructor
2015-10-14 15:10:04 -07:00
Anthony J. Thibault
3e7a6fd490
Change to boom offset for 3rd person HMD camera.
...
Previously the boom offset was computed in HMD sensor space instead of
world space, so it did not play well with the vive, or the oculus
if you weren't facing the camera directly.
Now it is computed in world space, and is always behind the character's
position/orientation. This can cause the boom to swing if the character
rotation changes but now the avatar rotation in HMD uses comfort mode.
It's not that disorienting.
2015-10-14 14:43:59 -07:00
Seth Alves
21519c6418
debugging
2015-10-14 14:13:08 -07:00
Seth Alves
5ce39b74fd
debugging
2015-10-14 13:58:19 -07:00
James B. Pollack
d45f48c8cd
fixbug
2015-10-14 13:55:04 -07:00
James B. Pollack
815b263954
convert tabs to spaces
2015-10-14 13:26:19 -07:00
Thijs Wenker
7df5ba01e6
JSConsole:
...
executeCommand works async now
2015-10-14 22:21:51 +02:00
Seth Alves
9937b6a3ef
quiet some debugging
2015-10-14 13:12:11 -07:00
Seth Alves
d72152da87
more locking
2015-10-14 13:01:56 -07:00
Seth Alves
07a4dc3a7f
more lock fixing
2015-10-14 12:49:06 -07:00
Thijs Wenker
9d2ae661e1
removed some XML from start-script button which possible caused an error before
2015-10-14 21:10:52 +02:00
Thijs Wenker
c585647f10
ScriptEditor Improvements:
...
- fixed run icon
2015-10-14 21:00:50 +02:00
Seth Alves
fa2bf2b2d9
tighten up locking in actions
2015-10-14 11:43:03 -07:00
Thijs Wenker
96b6067d88
ScriptEditor Improvements:
...
- Script restart works proper again
- Fixed on and off icon switch
- Replaced regular script output box with fully functional JSConsole!
2015-10-14 20:37:47 +02:00
James Pollack
7a8db803eb
move toolwindow tabs to the top
2015-10-14 19:35:37 +01:00
Thijs Wenker
880d34d483
JSConsole improvements
...
- ability to set Script Engine
- clear function for clearing the output
- only show evaluation output for executeCommand, print() and error output is still being printed
2015-10-14 20:35:15 +02:00
Brad Davis
f051a84dc6
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-14 10:54:32 -07:00
Seth Alves
698a4001a8
Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes
2015-10-14 06:18:02 -07:00
Seth Alves
742cc0f511
rename a function
2015-10-14 06:17:55 -07:00
Thijs Wenker
660bf6b3ea
ScriptEditor: single quotes support and spelling fix
2015-10-14 14:47:29 +02:00
Brad Davis
0c31fb1b1b
Merge pull request #6069 from ZappoMan/controllers
...
Hack in NewControllers into the JS layer of interface to allow testing
2015-10-13 19:08:26 -07:00
Anthony J. Thibault
1c1221597d
Merge branch 'master' into tony/turn-hips-while-moving
2015-10-13 18:38:27 -07:00
Anthony J. Thibault
e484a904a2
Rotate the avatar to align with the HMD while moving
...
MyAvatar: refactored updateFromHMDSensorMatrix() a bit by splitting it into several methods, because
it was getting quite large and becoming hard to follow.
* beginStraighteningLean() - can be called when we would like to trigger a re-centering action.
* shouldBeginStraighteningLean() - contains some of the logic to decide if we should begin a re-centering action.
for now it encapulates the capsule check.
* processStraighteningLean() - performs the actual re-centering calculation.
New code was added to MyAvatar::updateFromHMDSensorMatrix() to trigger re-centering when the avatar speed rises
over a threshold.
Secondly the Rig::computeMotionAnimationState() state machine for animGraph added a state change hysteresis
of 100ms. This hysteresis should help smooth over two issues.
1) When the delta position is 0, because the physics timestep was not evaluated.
2) During re-centering due to desired motion, the avatar velocity can fluctuate causing undesired animation state fluctuation.
2015-10-13 17:36:00 -07:00
Andrew Meadows
073b019458
Merge pull request #6072 from howard-stearns/skip-some-reload-recenter-on-startup
...
Don't reload/recenter some avatar data on startup
2015-10-13 17:08:00 -07:00
Stephen Birarda
d84994d8e0
fix casing for ubuntu include failure
2015-10-13 17:04:45 -07:00
Stephen Birarda
2caa7f6d64
change getUrl to getATPUrl, use in ATPAssetMigrator
2015-10-13 16:56:20 -07:00
Stephen Birarda
574089530a
make sure request is not nullptr before using it
2015-10-13 16:49:12 -07:00
Stephen Birarda
d22c602041
use categorized logging in ATPAssetMigrator
2015-10-13 16:44:13 -07:00
Stephen Birarda
cc93767077
remove some extra spaces
2015-10-13 16:38:00 -07:00
Seth Alves
4402242c3c
allow an action to suppress sending of physics related edits to the entity-server
2015-10-13 16:27:40 -07:00
Brad Hefta-Gaub
8a2e23cae4
CR feedback
2015-10-13 16:20:52 -07:00
Seth Alves
2ecb7e8d29
fix bug that was making action deletes fail
2015-10-13 16:19:12 -07:00
Stephen Birarda
1450305390
fix ATP url scheme constant
2015-10-13 16:13:47 -07:00
Stephen Birarda
fc82ea8541
resolve conflicts on merge with upstream/master
2015-10-13 16:12:54 -07:00
Stephen Birarda
549043f255
add an option to bulk upload assets in ATPAssetMigrator
2015-10-13 15:20:37 -07:00
Seth Alves
4fa85441b8
tweak
2015-10-13 15:14:34 -07:00
Brad Hefta-Gaub
ad96d76921
implement comfort mode hack
2015-10-13 15:06:11 -07:00
Seth Alves
257e3845de
get action type correct
2015-10-13 14:45:20 -07:00
Seth Alves
fcbb107bc0
tweak
2015-10-13 14:13:53 -07:00
Seth Alves
8b72f6e7c6
tweak
2015-10-13 13:50:43 -07:00
Brad Davis
910629c287
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-13 13:32:05 -07:00
Howard Stearns
93e908a592
Don't reload/recenter some avatar data on startup, when we don't necessarilly have all the required data initialized.
2015-10-13 12:15:13 -07:00
Seth Alves
7c52849740
change how hold action works
2015-10-13 11:36:58 -07:00
Stephen Birarda
65976f7891
add saving of entity file to ATPAssetMigrator
2015-10-13 10:51:57 -07:00
Stephen Birarda
cf74cfb50e
add an ATPAssetMigrator for bulk ATP migration
2015-10-13 10:38:52 -07:00
James B. Pollack
8d9bcbd793
Merge pull request #6067 from hyperlogic/tony/remove-middle-mouse-overlay-toggle
...
Remove overlay hiding from middle mouse button.
2015-10-13 10:14:15 -07:00
Brad Hefta-Gaub
8e8ba15aaa
Merge pull request #6065 from sethalves/reorder-sims
...
grab changes
2015-10-13 08:35:38 -07:00
Andrew Meadows
25685f97eb
Merge pull request #6062 from howard-stearns/fix-startup-position-failure
...
fix-startup-position-failure
2015-10-13 08:34:33 -07:00
Ryan Huffman
9a9bdbbc44
hack in mappings to interface
2015-10-12 17:59:58 -07:00
Anthony J. Thibault
6a8ff676ed
Remove overlay hiding from middle mouse button.
...
Because it conflicts with edit.js camera panning.
You can still toggle the overlay via the O key.
2015-10-12 17:33:27 -07:00
Howard Stearns
e8b074c85c
Merge pull request #6031 from AndrewMeadows/ik-moves-hips
...
IK moves hips
2015-10-12 17:03:33 -07:00
Seth Alves
ed9907ce66
do avatar simulation before physics simulation so that physics actions can update based on avatar
2015-10-12 16:23:12 -07:00
Howard Stearns
6cbeb6e7c3
Fix my bug, introduced in PR#6012, in which startup position goto got
...
cancelled out.
2015-10-12 15:40:16 -07:00
Atlante45
cfba5752ce
Change checkbox text
2015-10-12 15:03:37 -07:00
Atlante45
51acf07c15
Factor couple methods in AssetUtils
2015-10-12 15:03:37 -07:00
Atlante45
eea89ba010
CR - Rename method
2015-10-12 14:26:28 -07:00
Andrew Meadows
22786dea7d
cleanup
2015-10-12 13:35:26 -07:00
Atlante45
7b41efcf86
All file types eligible for upload to asset server
2015-10-12 13:35:21 -07:00
Andrew Meadows
e1a5afcff3
re-enable avatar position update when moving HMD
2015-10-12 11:42:03 -07:00
U-GAPOS\andrew
f01847de14
experimental HMD hips tracking
2015-10-12 11:39:54 -07:00
Andrew Meadows
03eaa95258
initial hip translation from IK
...
works for 2D 3rd person but probably not well for HMD
2015-10-12 11:39:54 -07:00
Brad Davis
f77878ee79
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-12 11:05:28 -07:00
Thijs Wenker
309b381bab
Merge branch 'master' of https://github.com/worklist/hifi into JS_Rotation_FIX
2015-10-12 18:51:18 +02:00
Brad Hefta-Gaub
f8956a853b
Merge pull request #6051 from jherico/marge
...
Cleanup CMake files
2015-10-11 16:22:56 -07:00
Brad Davis
d29c7ef267
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-11 16:12:51 -07:00
Brad Hefta-Gaub
0986f86c34
implement StandardController and expose it to JS as Controller.Standard.*
2015-10-11 14:55:07 -07:00
Thijs Wenker
7d3b300037
Fix set avatar rotations from scripts (different tread)
2015-10-11 14:51:12 +02:00
Brad Davis
6f5f6450df
Cleanup CMake files
2015-10-11 00:01:03 -07:00
Brad Davis
52c65b917f
Merge remote-tracking branch 'upstream/master' into controllers
2015-10-10 12:48:49 -07:00
Brad Hefta-Gaub
ded677e90f
Merge branch 'master' of https://github.com/highfidelity/hifi into newControllerInterface
2015-10-10 09:33:55 -07:00
Brad Hefta-Gaub
25481e0a25
Merge pull request #6038 from Atlante45/asset-drop
...
Asset file drop
2015-10-10 09:32:58 -07:00
Brad Hefta-Gaub
63f3156a61
add Controler.Actions
2015-10-09 21:23:19 -07:00
Brad Hefta-Gaub
f55b6115d6
cleanup sanatize name function
2015-10-09 21:11:38 -07:00
Brad Hefta-Gaub
5c5ee8d699
remove debug code
2015-10-09 21:01:44 -07:00
Brad Hefta-Gaub
d3ee9b0f39
more work on exposing device inputs as JavaScript named constants
2015-10-09 20:58:23 -07:00
samcake
297c3c9ed0
Fixing json issues
2015-10-09 17:37:51 -07:00
samcake
c02d33c17c
Adding example mapping files
2015-10-09 17:27:50 -07:00
Brad Davis
184e9a2209
Prototyping controllers
2015-10-09 16:20:55 -07:00
Brad Hefta-Gaub
37f530f97f
first cut at wiring up devices and inputs to JS
2015-10-09 16:15:29 -07:00
Anthony J. Thibault
0c489e3afd
MyAvatar: Rename new instance variable after merge.
2015-10-09 14:46:05 -07:00
Anthony J. Thibault
b5ba621f78
Merge branch 'master' into tony/hmd-rest-detection
2015-10-09 14:36:18 -07:00
Howard Stearns
700835a6d1
Merge branch 'master' of https://github.com/highfidelity/hifi into align-body-to-head-on-reset
2015-10-09 13:13:22 -07:00
Atlante45
ae83dfe041
Move auto-resize to update
2015-10-09 12:23:19 -07:00
Atlante45
e056743621
Check for upload rights
2015-10-09 12:23:19 -07:00
Atlante45
2229f942df
Spawn fbx dropped in front of avatar
2015-10-09 12:23:19 -07:00
Atlante45
a1c154e7be
Fix compile error
2015-10-09 12:23:19 -07:00
Atlante45
b666acdb26
Add fbx upload on drop
2015-10-09 12:23:19 -07:00
Atlante45
2d12b2ba9a
Spacing
2015-10-09 12:23:19 -07:00
Atlante45
327154b0c0
Make _acceptedExtensions static const
2015-10-09 12:23:19 -07:00
Howard Stearns
652376db8a
Kill the stuff we can't do yet.
2015-10-08 21:44:45 -07:00
Stephen Birarda
7987595dcd
set the bearer poll timeout for wlan scan in Qt 5.5
2015-10-08 11:32:10 -07:00
Brad Hefta-Gaub
e1b69a1704
Merge pull request #6022 from jherico/lisa
...
Fix mouse events for entity scripts
2015-10-07 20:43:41 -07:00
Brad Davis
50592a87a6
Fix mouse events for entity scripts
2015-10-07 19:44:08 -07:00
Howard Stearns
bd0d1eaef6
Merge branch 'master' of https://github.com/highfidelity/hifi into align-body-to-head-on-reset
2015-10-07 18:35:52 -07:00
Brad Hefta-Gaub
a86e34f9f9
Merge pull request #6018 from hyperlogic/tony/avatar-mixer-stats-improvements
...
Separated AvatarMixer inbound and outbound bandwidth on stats overlay
2015-10-07 16:04:13 -07:00
Andrew Meadows
ef58238c66
Merge pull request #6017 from ZappoMan/animationGroupSettings
...
fix a bunch of warnings
2015-10-07 15:50:20 -07:00
Brad Hefta-Gaub
ae93c020be
Merge pull request #5994 from Atlante45/display_name
...
Display name in terms of arc size not pixels
2015-10-07 15:40:30 -07:00
Anthony J. Thibault
0cebeb7fe9
Separated AvatarMixer inbound and outbound bandwidth on stats overlay
...
Also, small bug fix to BandwidthRecorder. It would incorrectly
calculate outbound pps if the input pps was 0.
2015-10-07 15:32:10 -07:00
Brad Hefta-Gaub
c6d50af085
Merge pull request #5999 from AndrewMeadows/save-sixense-settings
...
Save hydra calibration settings
2015-10-07 15:27:06 -07:00
Atlante45
fb284448b5
Raise display name not to collide with heads
2015-10-07 15:21:35 -07:00
Atlante45
efeeaa7ea7
Make display names 25% smaller
2015-10-07 15:14:06 -07:00
Atlante45
14a1860670
Do not change keyhole radius
2015-10-07 14:55:18 -07:00
Atlante45
fd6f0213ef
CR
2015-10-07 14:55:18 -07:00
Atlante45
79b280f733
Update getDisplayNamePosition debug
2015-10-07 14:55:18 -07:00
Atlante45
91b46203f3
Don't take keyhole into account
2015-10-07 14:55:17 -07:00
Atlante45
946d289a99
Display name have a arc size instead of pixel size
2015-10-07 14:55:17 -07:00
Brad Hefta-Gaub
bfd014203e
fix a bunch of warnings
2015-10-07 14:48:42 -07:00
Andrew Meadows
0680be0422
save sixense settings and some UI cleanup
2015-10-07 14:19:15 -07:00
Andrew Meadows
039d9a6a98
Merge pull request #6010 from ZappoMan/disableHandMouseByDefault
...
Disable hand mouse by default
2015-10-07 14:15:58 -07:00
Thijs Wenker
ad5a6fac62
- applying of new qApp accessing method.
...
- Some magic constant replacements with Helper "glm::vec3(matrix[3])" -> "extractTranslation(matrix)"
2015-10-07 15:10:40 +02:00
Thijs Wenker
4ab5e0af84
Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation
...
Conflicts:
interface/src/scripting/HMDScriptingInterface.h
2015-10-07 14:48:06 +02:00
Brad Hefta-Gaub
05fd62ac51
Merge pull request #6009 from jherico/homer
...
Enabling programmatic access to the IPD scale
2015-10-07 01:43:10 -07:00
Brad Davis
eff5a4c395
Picking fixes in the HMD
2015-10-06 22:56:48 -07:00
Howard Stearns
1fc305ca6b
Update HMD-derived avatar stuff during reset, update position under head, and remove unused vars.
2015-10-06 20:51:53 -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
Brad Davis
028935f831
Removing deprecated function usage
2015-10-06 20:36:55 -07:00
Brad Hefta-Gaub
6e5847bb1c
make Hand Input Mouse off by default
2015-10-06 19:58:25 -07:00
Brad Davis
bac69c73a8
Fixing bug in application compositor transform
2015-10-06 19:08:44 -07:00
Brad Davis
19fb4e92a6
Enabling programmatic access to the IPD scale
...
Conflicts:
interface/src/Application.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/scripting/HMDScriptingInterface.cpp
interface/src/scripting/HMDScriptingInterface.h
2015-10-06 19:08:17 -07:00
Thijs Wenker
6e52fcb857
Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation
...
Conflicts:
interface/src/scripting/HMDScriptingInterface.h
2015-10-07 03:11:24 +02:00
Brad Hefta-Gaub
02bb372c27
Merge pull request #6008 from AndrewMeadows/ik-targets-use-model-frame
...
IK targets specified in the skeleton's model-frame
2015-10-06 17:34:42 -07:00
Andrew Meadows
224fc55033
put IK targets in skeleton's model-frame
2015-10-06 16:49:29 -07:00
Atlante45
76e0006732
Remove forgotten cursorVisible
2015-10-06 15:58:35 -07:00
Howard Stearns
db955d894f
Align avatar body to head on reset.
2015-10-06 14:52:53 -07:00
Atlante45
8a7871e15b
rebase fix
2015-10-06 14:13:28 -07:00
Atlante45
ed13c02075
Fix rebase
2015-10-06 13:57:51 -07:00
Atlante45
c745050dea
Fix QObject::connect warning
2015-10-06 13:57:51 -07:00
Atlante45
7b25c9d417
More header cleanup
2015-10-06 13:57:50 -07:00
Atlante45
775994f9d0
Fix for 3DConnection
2015-10-06 13:57:49 -07:00
Atlante45
b63df98b8b
More unused
2015-10-06 13:57:49 -07:00
Atlante45
17edd38cb9
Remove unused variables
2015-10-06 13:57:48 -07:00
Atlante45
39e0d0e1dc
Put timers on the stack
2015-10-06 13:56:26 -07:00
Atlante45
e9b7125894
Misc cleanup
2015-10-06 13:56:26 -07:00
Atlante45
5e9425d9eb
Fix view frustum preference
2015-10-06 13:56:25 -07:00
Atlante45
60ebd3a544
Remove unused members (Mostly mouse stuff)
2015-10-06 13:56:25 -07:00
Atlante45
35e2f8cd89
Removed _myAvatar from Application
2015-10-06 13:56:25 -07:00
Atlante45
2fc80e58b6
Fix warning
2015-10-06 13:56:24 -07:00
Atlante45
9827c90851
Rebase fixes
2015-10-06 13:56:24 -07:00
Atlante45
ba5c20b7a6
Header cleanup
2015-10-06 13:56:24 -07:00
Atlante45
9c7a480fda
Remove shadowMatrices/Distances
2015-10-06 13:56:23 -07:00
Atlante45
8c653c70fb
Remove fps throttle from Application
2015-10-06 13:56:23 -07:00
Atlante45
4ccc2bbcd0
Enclose entire functions in ifdef
2015-10-06 13:56:23 -07:00
Atlante45
dde11c5cd1
More unused
2015-10-06 13:56:23 -07:00
Atlante45
34bba28775
More header cleanup
2015-10-06 13:56:22 -07:00
Atlante45
f55f146d1b
More code cleanup
2015-10-06 13:56:22 -07:00
Atlante45
38f23ef79e
Remove Application friend
2015-10-06 13:56:22 -07:00
Atlante45
311edabe51
More header cleanup
2015-10-06 13:56:21 -07:00
Atlante45
765608d0ff
More unused
2015-10-06 13:56:21 -07:00
Atlante45
7da55747f5
Simplify friends window
2015-10-06 13:56:21 -07:00
Atlante45
77a7814854
Move sendPingPackets
2015-10-06 13:56:20 -07:00
Atlante45
e74df484cc
Remove unused methods
2015-10-06 13:56:20 -07:00
Atlante45
a5f31dba5f
Fix startup timer
2015-10-06 13:56:20 -07:00
Atlante45
0aab013a0e
Remove unused members
2015-10-06 13:56:20 -07:00
Atlante45
92e974929c
Move tray icon to MainWindow
2015-10-06 13:56:19 -07:00
Atlante45
0f18db886c
Remove 4 Application static methods
...
- Replace by lambda
- Cleaned up global scope
2015-10-06 13:56:19 -07:00
Atlante45
cf3b33a96b
Replace Application::getInstance() with qApp
2015-10-06 13:56:19 -07:00
Thijs Wenker
4e8fc08458
made the changes as suggested by @hyperlogic
2015-10-06 20:48:51 +02:00
Thijs Wenker
3c6e9378c3
fixes merge issues
2015-10-06 20:20:37 +02:00
Thijs Wenker
953ff6caa7
Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation
...
Conflicts:
interface/src/Application.cpp
interface/src/scripting/HMDScriptingInterface.h
libraries/display-plugins/src/display-plugins/oculus/OculusHelpers.h
2015-10-06 20:06:29 +02:00
