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
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
Andrew Meadows
2c276bb13e
Merge pull request #5986 from sethalves/kinematic-grab
...
Kinematic grab
2015-10-06 10:30:06 -07:00
Brad Davis
8090bc8e8d
Revert "Enabling programmatic access to the IPD scale"
2015-10-06 10:16:42 -07:00
Seth Alves
8caa7abca6
assert that deltaTimeStep is always greater than zero
2015-10-06 09:35:54 -07:00
Seth Alves
5abaf38efd
include setVelocity in returned arguments
2015-10-06 09:24:18 -07:00
Seth Alves
18b5b994b4
include setVelocity in returned arguments
2015-10-06 09:23:38 -07:00
Seth Alves
febdb52b26
Merge branch 'master' of github.com:highfidelity/hifi into kinematic-grab
2015-10-06 09:20:13 -07:00
Seth Alves
c3142ab90b
include setVelocity in returned arguments
2015-10-06 09:20:07 -07:00
Seth Alves
91f5a6fec6
make setting of rigid-body velocity controlled by an action argument
2015-10-06 08:08:33 -07:00
Brad Hefta-Gaub
d95fe3ddb7
Merge pull request #5989 from jherico/homer
...
Enabling programmatic access to the IPD scale
2015-10-05 17:22:19 -07:00
Clément Brisset
5eda3095bb
Merge pull request #5998 from birarda/qt-5.5
...
suppress warnings for overriden methods in Xcode 7
2015-10-05 17:00:43 -07:00
Thijs Wenker
dd59527763
Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation
2015-10-06 01:35:29 +02:00
Stephen Birarda
25a1f2dd11
add override to suppress warning for PluginContainerProxy
2015-10-05 15:53:37 -07:00
Stephen Birarda
a2c9d7a4b2
add overrides for Avatar classes in Interface
2015-10-05 15:52:47 -07:00
Anthony Thibault
2a406481d4
Merge pull request #5992 from howard-stearns/reset-on-calibration
...
Reset (as though by apostrophe key) whenever we calibrate the hydra.
2015-10-05 15:19:16 -07:00
Seth Alves
99be44f92d
smooth out vibrating appearance for kinematic hold
2015-10-05 14:58:42 -07:00
Seth Alves
8f924f0be4
merge from upstream
2015-10-05 13:05:37 -07:00
Howard Stearns
844270e306
Reset (as though by apostrophe key) whenever we calibrate the hydra.
2015-10-05 12:44:22 -07:00
Andrew Meadows
1ead20683c
Merge pull request #5976 from sethalves/fix-action-deletes
...
Fix action deletion/addition when more than one interface are involved
2015-10-05 12:31:01 -07:00
Seth Alves
993111d22f
code review
2015-10-05 11:28:59 -07:00
Seth Alves
8c25f2e16c
Merge branch 'master' of github.com:highfidelity/hifi into kinematic-grab
2015-10-05 09:09:01 -07:00
Brad Davis
725ed26ac2
Enabling programmatic access to the IPD scale
2015-10-04 16:55:49 -07:00
Thijs Wenker
8befade007
expose position and orientation of HMD to Javascript.
...
- HMD.orientation
- HMD.position
2015-10-04 15:08:35 +02:00
Seth Alves
6a770a870b
set correct type in kinematic hold
2015-10-02 17:31:45 -07:00
Seth Alves
89c848d8c8
fix up kinematic hold
2015-10-02 17:14:53 -07:00
Howard Stearns
fdba55e56e
Merge pull request #5973 from ctrlaltdavid/20698
...
Fix Reload Content menu item not reloading FST files
2015-10-02 16:43:11 -07:00
Seth Alves
cf8955a8c5
kinematic grab
2015-10-02 15:27:01 -07:00
Brad Hefta-Gaub
255689e24f
add GLEW_STATIC to fix link warnings
2015-10-02 15:08:04 -07:00
Howard Stearns
f6665a4ac6
Merge pull request #5839 from sethalves/transmit-joint-translation
...
WARNING protocol change: Transmit joint translation
2015-10-02 13:37:56 -07:00
Anthony J. Thibault
c0be32d359
Fix for model offset when using Rig Animations.
2015-10-02 11:40:46 -07:00
Anthony J. Thibault
fc7b6dee84
Merge branch 'master' into transmit-joint-translation
2015-10-02 11:40:33 -07:00
Brad Hefta-Gaub
4c556dd43a
Merge pull request #5962 from samcake/calvin
...
Rendering the background elements after opaque and only work on the far pixels
2015-10-02 11:38:45 -07:00
Brad Hefta-Gaub
c6c430ca76
Merge pull request #5977 from jherico/marge
...
Fixing 2D overlay mouse interaction
2015-10-02 11:11:04 -07:00
Anthony J. Thibault
a1b54945d6
Compute the model offset in the rig, using the bind pose of the hips.
2015-10-02 10:34:34 -07:00
Brad Davis
aa8979570c
Working on 2D overlay mouse interaction
2015-10-02 00:35:37 -07:00
samcake
71ad6195f2
Merge branch 'master' of https://github.com/highfidelity/hifi into calvin
2015-10-01 19:25:25 -07:00
Anthony J. Thibault
fa864d29f9
Merge branch 'master' into transmit-joint-translation
2015-10-01 16:55:24 -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
Brad Hefta-Gaub
521aaa0998
Merge pull request #5974 from Atlante45/extra_debug
...
Remove extra debug
2015-10-01 14:42:45 -07:00
Howard Stearns
739545794f
Merge pull request #5944 from AndrewMeadows/ik-repairs-007
...
fix bug: IK attenuates fast underpose animations
2015-10-01 14:27:21 -07:00
Andrew Meadows
09ac01a5e7
remove cruft from old verlet avatar simulation
2015-10-01 13:44:50 -07:00
Atlante45
b37bf2b1b6
Remove extra debug
2015-10-01 13:18:22 -07:00
David Rowe
2fbb436bc5
Fix Reload Content menu item
2015-10-01 12:42:23 -07:00
Brad Hefta-Gaub
066e25bb4a
Merge pull request #5965 from hyperlogic/tony/avatar-lean-bug-fixes
...
Bug fix for deriveBodyFromHMDSensor calculations
2015-09-30 16:54:59 -07:00
Anthony J. Thibault
d993d39718
Bug fix for deriveBodyFromHMDSensor calculations
...
The calculation that determined where the body position relative to the HMD
was incorrect, one of the components was in the wrong coordinate frame.
Now use the skeleton's bind pose to compute the proper avatar offsets for the eyes, neck and hips.
Use these offsets to calculate where the hips should be given a specific hmd position and orientation.
Also, added a bug fix for Rig, which would cause a -1 index deference when an avatar was missing
certain named joints, such as, "LeftEye", "Neck" and "Head".
2015-09-30 16:28:33 -07:00
samcake
6b86f21491
Merge branch 'master' of https://github.com/highfidelity/hifi into calvin
2015-09-30 15:54:39 -07:00
samcake
75e858cd13
Putting together the stencil buffer for opaque vs background and using it for the backgroud render items
2015-09-30 15:54:03 -07:00
Seth Alves
7c6846c260
add lifetime and tag arguments to actions
2015-09-30 13:09:41 -07:00
Brad Hefta-Gaub
76825c2be7
only show hand cursors when menu is enabled
2015-09-30 09:06:45 -07:00
Andrew Meadows
b192d0a9cd
make neck IK target type same as head
2015-09-29 17:39:17 -07:00
Seth Alves
58d98d3ce4
Merge pull request #5932 from howard-stearns/default-animation-and-quieter
...
Set default animation and quiet state logging
2015-09-29 16:12:28 -07:00
Seth Alves
d554eb8db9
avatar collisions are off during a grab
2015-09-29 15:09:25 -07:00
Brad Hefta-Gaub
00c32fc7cd
Merge pull request #5924 from jherico/marge
...
Support for accessing IPD in scripts
2015-09-29 14:24:53 -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
f7b34f63c1
try calling updateMotionBehaviorFromMenu
2015-09-29 13:40:54 -07:00
Howard Stearns
745a59af1c
Default animation is anim graph.
...
Remove state change logging from animation graph state machine.
2015-09-29 12:48:57 -07:00
Eric Levin
e8e9957846
Merge pull request #5911 from ZappoMan/rayIntersectionWork
...
adding surface normals to ray intersection
2015-09-28 17:21:40 -07:00
Brad Davis
7b1c04512a
Adding support for accessing IPD in scripts
2015-09-28 16:24:38 -07:00
Seth Alves
89ab1f626f
Merge pull request #5921 from huffman/import-export-fix
...
Import/Export entities fix
2015-09-28 16:21:18 -07:00
Howard Stearns
2e05ede524
Merge pull request #5920 from hyperlogic/tony/oculus-judder-fix
...
Fix for Oculus timewarp judder introduced by 20d784ba39
2015-09-28 15:57:47 -07:00
Anthony J. Thibault
c51ce79205
Updated comment on MyAvatar::updateFromHMDSensorMatrix()
2015-09-28 15:30:21 -07:00
Seth Alves
4179e4aa74
merge from upstream
2015-09-28 15:28:10 -07:00
Ryan Huffman
1a9cd59339
Fix ClipboardScriptingInterface to call methods on main app thread
2015-09-28 15:05:48 -07:00
Ryan Huffman
dde1c8b42f
Fix use of EntityTree in import/export operations
...
The EntityTree needs to be references by a shared_ptr somewhere.
The EntityTree does not start with a root element by default, which some
operations rely on to work as expected.
2015-09-28 15:05:48 -07:00
Anthony J. Thibault
e32eb38c3b
Fix for Oculus timewarp judder introduced by 20d784ba39
...
Moved myAvatar->updateFromHMDSensorMatrix from Application::update
back into Application::paintGL, so it occurs between
displayPlugin->preRender() and displayPlugin->display().
We should render with the most up-to-date camera position as possible,
and sample it at the same frequency as the display rate.
2015-09-28 14:38:03 -07:00
Howard Stearns
e6b9cbacf7
Merge pull request #5910 from hyperlogic/tony/small-anim-debug-improvements
...
Fix for Head when switching between HMD and Desktop mode
2015-09-28 14:13:03 -07:00
Brad Hefta-Gaub
430cbcca7e
first cut at adding surface normals to ray intersection
2015-09-27 21:57:50 -07:00
Anthony J. Thibault
5a24a020ca
Fix for HMD rotation sticking between 2d & HMD mode
...
The main fix for this was to set the JointState animation priority to 3.0
The secondary fix was only noticed when we changed the animation priority
Basically, the debugRendering was using the JointStates after they were
manipulated by SkeletonModel to 'relax' them toward thier default pose for
IK purposes.
2015-09-27 17:44:54 -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
Thijs Wenker
14fc39ffa3
Added JS access to the variables
...
Stats.audioPacketlossUpstream
Stats.audioPacketlossDownstream
Which contain a floating point with the value between 0.0f and 1.0f which is the percentage of packet loss.
2015-09-26 02:36:01 +02:00
Howard Stearns
a820682816
Merge pull request #5901 from hyperlogic/tony/gangsta-lean
...
Threshold based walking/leaning while in HMD.
2015-09-25 15:51:39 -07:00
Anthony J. Thibault
402573dbf1
Remove unused local
2015-09-25 14:11:33 -07:00
Thijs Wenker
9ed1397a63
Merge branch 'master' of https://github.com/worklist/hifi into 20672
2015-09-25 21:09:38 +02:00
Anthony J. Thibault
fc9b270951
Merge branch 'master' into tony/gangsta-lean
2015-09-25 11:36:58 -07:00
Andrew Meadows
4f0bd08b62
Merge pull request #5900 from ZappoMan/batchOptimizations
...
more work on batch optimzation
2015-09-25 09:00:38 -07:00
Anthony J. Thibault
474c847ef1
Updated constants and units.
2015-09-24 18:00:59 -07:00
Anthony J. Thibault
20d784ba39
Threshold based walking while in HMD.
...
This is a blend of the previous 'sitting' and 'standing' HMD modes.
Basically, when you move your head within a small range (20cm) your
avatar will lean appropriately, however when you cross that threshold
your body will move underneath you, re-centering your head above the body.
While this occurs the avatar should play the appropriate walking animations.
2015-09-24 17:54:32 -07:00
Brad Hefta-Gaub
85b2322acc
more work on batch optimzation
2015-09-24 17:11:14 -07:00
Howard Stearns
266c69fc70
Disable the old-school Rig::inverseKinematics during reset.
2015-09-24 15:33:52 -07:00
Howard Stearns
426ccabba7
Merge branch 'master' of https://github.com/highfidelity/hifi into apostrophe
2015-09-24 14:19:58 -07:00
Andrew Meadows
59da684eb9
make IKTarget::setType() a one-liner
2015-09-24 13:15:03 -07:00
Thijs Wenker
6d4e4af0a5
ability to see Stats in JavaScript + example script which outputs the stats to the console/logviewer
2015-09-24 22:02:22 +02:00
Andrew Meadows
17e3e9394f
allow head translation for 3rd person screenie IK
2015-09-24 12:38:46 -07:00
Brad Hefta-Gaub
2eaeb26b2a
fix GetVersionEx warning
2015-09-24 09:14:51 -07:00
Brad Hefta-Gaub
5e82b9c433
more warning fixes
2015-09-24 08:26:56 -07:00
