David Rowe
e6473fc8b9
Merge branch 'master' into 20639
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Menu.h
tests/ui/src/main.cpp
2015-08-11 12:34:28 -07:00
Brad Hefta-Gaub
b726769f15
Merge pull request #5402 from highfidelity/plugins
...
New plugins architecture
2015-08-11 11:11:27 -07:00
Seth Alves
cbe38d5fa5
Merge pull request #5533 from ctrlaltdavid/20637
...
CR for 20637 - Add WebWindow setPosition() method
2015-08-11 11:03:14 -07:00
Brad Hefta-Gaub
35d6528d08
Merge pull request #5550 from jherico/marge
...
PLUGINS - Cleaning up HMD tools
2015-08-11 10:46:59 -07:00
David Rowe
84feaeb703
Merge branch 'master' into 20639
2015-08-11 10:33:17 -07:00
Bradley Austin Davis
7694c1c0a6
Cleaning up HMD tools
2015-08-10 21:39:36 -07:00
Brad Davis
19d31938d3
Merge remote-tracking branch 'upstream/master' into plugins
2015-08-10 21:25:35 -07:00
David Rowe
2c1ba9b6b1
Fix avatar lean forwards and sideways per HMD movements
2015-08-10 21:25:18 -07:00
David Rowe
f7dc5480b7
Fix #include path for OSX/Linux
2015-08-10 20:20:51 -07:00
David Rowe
80e296edd0
Merge branch 'master' into 20639
2015-08-10 19:25:12 -07:00
David Rowe
8b326414ac
Start eye tracker streaming such that don't block Interface
...
Start method is called in a separate thread.
2015-08-10 19:19:29 -07:00
Bradley Austin Davis
61ecee93b8
Fix mis-positioning of QML elements when moving from retina to non-retina display
2015-08-10 15:18:49 -07:00
Seth Alves
74287c3cf5
Merge pull request #5482 from ericrius1/polyLineInProgress
...
Added PolyLine Entity and painting scripts to demonstrate its functionality (WARNING: protocol change) Test this please
2015-08-10 14:57:52 -07:00
David Rowe
81d8edae5f
Add missing 5 point calibration
2015-08-10 13:23:14 -07:00
David Rowe
e7beb544f6
Log successfully loading eye tracker calibration
2015-08-10 13:22:46 -07:00
David Rowe
658434e020
Automatically save and restore eye tracker calibration
...
Automatically saves and restores just a single calibration so that user
doesn't have to manually save or load, which isn't very convenient to do
with an HMD on.
2015-08-10 13:20:42 -07:00
David Rowe
4f3c4a5312
Tidy up handling of eye tracker streaming
2015-08-10 12:52:47 -07:00
Howard Stearns
88505c180d
Merge branch 'master' of https://github.com/highfidelity/hifi into restore-eye-joint-rotations
2015-08-10 12:34:59 -07:00
Howard Stearns
964d04d24f
Restore correct space for eye joint rotations.
...
Also, do not correct for camera position on my avatar. (That will be done by zero or one receivers.)
2015-08-10 12:34:01 -07:00
ericrius1
0f7c21ddd7
rearranged entity props and added check in setNormals to avoid uninitialized binormal values
2015-08-10 11:55:47 -07:00
Stephen Birarda
5e3d3fc06b
fix for indentation in BandwidthDialog
2015-08-10 10:03:53 -07:00
Thijs Wenker
6ee6785977
Merge branch 'master' of https://github.com/worklist/hifi into 20638
2015-08-10 11:15:17 +02:00
Brad Davis
57408c4338
Automatically show HMD tools when switching an HMD plugin
2015-08-09 12:14:29 -07:00
Brad Davis
5515b9d8ee
Decouple Application and plugin definitions, cleanup container usage
2015-08-08 17:51:16 -07:00
Bradley Austin Davis
2878950dbe
Fix crash on startup on mac
2015-08-08 15:26:38 -07:00
Brad Davis
751db23bc8
Fixing naming, and improving viewport handling
2015-08-08 14:19:43 -07:00
Brad Davis
639a0822fe
Fixing aspect ratio
2015-08-08 14:08:41 -07:00
Brad Davis
ba498e8f33
Fixing plugin construction after removing OVR dependency from interface
2015-08-08 14:02:26 -07:00
Brad Davis
ccc4a59992
Cleanup and PR comments
2015-08-08 13:54:37 -07:00
Brad Davis
4b5c71e16d
Merge fixes
2015-08-08 13:37:46 -07:00
Brad Davis
caf93d1aff
Merge branch 'master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/Menu.h
2015-08-08 13:18:13 -07:00
David Rowe
051a398fa2
Merge branch 'master' into 20639
2015-08-07 18:26:56 -07:00
David Rowe
90637272c5
Add WebWindow setPosition() method
2015-08-07 17:38:41 -07:00
Andrew Meadows
331c8c0967
Merge pull request #5503 from AlexanderOtavka/panel-attachable-improvements
...
Improvements to FloatingUIPanels.
2015-08-07 17:21:51 -07:00
David Rowe
b54c2526c1
Fix rendering own look-at vectors in HMD mode
...
Vectors now originate at user's physical eyeballs rather than at user
avatar's eye separation.
2015-08-07 16:13:25 -07:00
Andrew Meadows
c0d287f48d
Merge pull request #5527 from ZappoMan/lod
...
change LOD dialog to no longer reset when you close the dialog box
2015-08-07 16:10:24 -07:00
Andrew Meadows
48c5a227a7
Merge pull request #5528 from ZappoMan/removeBrokenShadows
...
remove shadow menu items
2015-08-07 16:09:00 -07:00
Bradley Austin Davis
fb2c84484e
Merge remote-tracking branch 'upstream/master' into plugins
2015-08-07 15:26:43 -07:00
David Rowe
3995c4476d
Add temporary debug info for tracking down invalid scale value assert
2015-08-07 14:38:43 -07:00
Seth Alves
b1e69537f3
Merge pull request #5524 from howard-stearns/cleanup-jointstate
...
Clean Up JointState
2015-08-07 13:50:02 -07:00
Thijs Wenker
d10ae4a68d
Merge branch 'master' of https://github.com/worklist/hifi into 20638
2015-08-07 21:43:32 +02:00
Thijs Wenker
25266b986c
added basic implementation of WebSocket class ( https://developer.mozilla.org/en-US/docs/Web/API/WebSocket ) using QWebSocket
2015-08-07 21:43:14 +02:00
David Rowe
b70c1a4960
Merge branch 'master' into 20639
2015-08-07 12:33:13 -07:00
David Rowe
ea03067a02
When eye tracking data is lot for > N seconds handle as "not tracking"
...
Revert to default look-at behaviour and saccades until tracking resumes.
2015-08-07 12:23:43 -07:00
David Rowe
e2bf5cad3e
Resume eye tracking at start-up if was running at shut-down
2015-08-07 11:59:11 -07:00
Zander Otavka
743e73874f
Add back the anchor to panel transform names.
...
position -> anchorPosition
rotation -> anchorRotation
scale -> anchorScale
2015-08-07 11:38:33 -07:00
ZappoMan
87f609b9af
remove shadow menu items, left in the dead code for now, until we have a plan for replacing shadows
2015-08-07 11:26:07 -07:00
Ryan Huffman
41e68b1c52
Disable back-face culling when rendering BillboardOverlay
2015-08-07 10:59:54 -07:00
Sam Gateau
0e3e0d05f1
Introducing the Normal fitting algorithm for better normal in the deferred buffer
2015-08-07 10:59:51 -07:00
ZappoMan
8441868e74
change LOD dialog to no longer reset when you close the dialog box
2015-08-07 10:32:03 -07:00
ericrius1
3910cb0d69
Merge branch 'master' into polyLineInProgress
2015-08-07 10:12:02 -07:00
Zander Otavka
f9630942aa
Small tweaks to improve code readability.
2015-08-07 09:31:21 -07:00
Zander Otavka
a46cc4e1c3
Fix issue with offsetRotation being applied twice.
2015-08-07 09:30:45 -07:00
Zander Otavka
09bb61e4d8
Add backwards compatibility for Image3DOverlays.
...
Using "billboard" to create an Image3DOverlay is deprecated. Instead,
use "image3d" or, even better, use overlayManager.js.
2015-08-07 02:45:05 -07:00
Zander Otavka
3356bf31ac
Refactor billboarding into Billboardable class.
2015-08-07 02:34:56 -07:00
Zander Otavka
3dcfa84a87
Fix billboarding behavior.
...
Billboards now always face the camera position. Also, OverlayPanels can
be set to face the avatar.
2015-08-07 01:38:33 -07:00
David Rowe
e37fd956ed
Fix look-at target position getting stuck when avatar moves out of range
2015-08-06 22:51:25 -07:00
Zander Otavka
0b4be8fca2
Improve transforms for panels and attachables.
...
Add offsetScale to PanelAttachable for scaling all the contents of a
panel properly. Also reduce the number of transform operations per
second while rendering a PanelAttachable Overlay.
2015-08-06 21:46:55 -07:00
David Rowe
738c5658fa
Guard against NaNs in eye tracker look-at position
2015-08-06 20:46:51 -07:00
Howard Stearns
a840a17106
Change name originalRotation defaultRotation.
2015-08-06 19:45:58 -07:00
Zander Otavka
6e8c154c42
Undo registering PropertyBinding as a meta type.
2015-08-06 18:54:08 -07:00
Zander Otavka
fa24df765d
Register OverlayPanel binding map as a meta type.
2015-08-06 18:07:59 -07:00
Zander Otavka
f870f19837
Make transforms cascade down the pannel chain.
2015-08-06 17:29:37 -07:00
David Rowe
427b8b973c
Fix excluding saccades when doing eye tracking
2015-08-06 17:20:03 -07:00
Zander Otavka
2aacd17843
Make OverlayPanel PanelAttachable.
2015-08-06 16:58:03 -07:00
Howard Stearns
42cc34cd64
JointState has our own copy of any ivars we want from FBXJoint, instead of keeping a reference to the fbx.
2015-08-06 16:54:09 -07:00
David Rowe
551c00dc23
Fix look-at position calculation when in HMD display
...
Calculate look-at target from camera position and orientation.
Render own look-at vectors from camera eye positions.
Draw other avatar's look-at vectors from their eyeballs.
With and without eye trackers.
2015-08-06 16:41:06 -07:00
Zander Otavka
be4e827281
Merge: master -> panel-attachable-improvements.
2015-08-06 16:29:38 -07:00
Zander Otavka
c7639537d0
Use implicit copy constructor for PanelAttachable.
2015-08-06 16:13:21 -07:00
Zander Otavka
497713b020
Rename a few more confusing names.
...
setTransforms -> applyTransformTo
attachedPanel -> parentPanel
2015-08-06 15:45:07 -07:00
Ryan Huffman
dd2c0be2d2
Add check in BillboardOverlay::render to make sure _texture is valid
2015-08-06 15:43:02 -07:00
Ryan Huffman
8ebf34e93f
Fix BillboardOverlay breaking when changing url
2015-08-06 15:15:11 -07:00
Brad Hefta-Gaub
0947bf2cd0
Merge pull request #5517 from samcake/punk
...
Improving the quality of the normal encoding in the Deferred Buffer
2015-08-06 15:13:08 -07:00
Sam Gondelman
4c7c2e9390
fixing more connexion problems
2015-08-06 15:06:05 -07:00
Sam Gondelman
54f64b62eb
Merge remote-tracking branch 'upstream/plugins' into sam/input-plugins
2015-08-06 14:45:26 -07:00
Zander Otavka
b94be926f8
Mass renaming to be more logical/concise.
...
FloatingUIPanel -> OverlayPanel
anchorPosition -> position
offsetRotation -> rotation
facingRotation -> offsetRotation
floatingUIExample.js -> overlayPanelExample.js
2015-08-06 14:23:04 -07:00
Ryan Huffman
cefb7be51d
Disable back-face culling when rendering BillboardOverlay
2015-08-06 14:09:32 -07:00
Bradley Austin Davis
985bdb2190
Fixing merge
2015-08-06 11:52:38 -07:00
Zander Otavka
6165e7e6ca
Improve cross-thread support for panel children.
2015-08-06 11:40:49 -07:00
Bradley Austin Davis
7e60aee1bf
Merge branch 'master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/avatar/Head.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/avatar/MyAvatar.h
interface/src/avatar/SkeletonModel.cpp
interface/src/avatar/SkeletonModel.h
interface/src/devices/3DConnexionClient.cpp
interface/src/ui/overlays/Overlays.cpp
2015-08-06 11:03:37 -07:00
Brad Davis
9215ea8894
Merge pull request #5516 from Atlante45/warnings
...
Fix warning and remove unused headers
2015-08-05 19:12:09 -07:00
Sam Gateau
7be736d6de
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2015-08-05 17:17:30 -07:00
Sam Gateau
95682e6270
Introducing the Normal fitting algorithm for better normal in the deferred buffer
2015-08-05 17:17:00 -07:00
Zander Otavka
021dff63b4
Visibility now cascades down panel children.
...
For an overlay to render, it, and all of its ancestor panels, must be
set visible.
2015-08-05 16:57:03 -07:00
David Rowe
d7b42e264e
Merge branch 'master' into 20639
...
Conflicts:
interface/CMakeLists.txt
2015-08-05 16:49:06 -07:00
Atlante45
3dc8bd47ae
Fix warning and remove unused headers
2015-08-05 16:46:44 -07:00
Zander Otavka
865067aad9
Add ability to bind a panel to an entity.
2015-08-05 16:12:46 -07:00
Howard Stearns
ca6d798aa5
Don't try to animate other people's avatars!
2015-08-05 15:59:22 -07:00
Zander Otavka
481624b48c
Re-work panel position and rotation binding.
2015-08-05 14:21:23 -07:00
David Rowe
e8eac7db34
Render look-at vectors and target in first person view
2015-08-05 13:40:57 -07:00
David Rowe
a15943d941
Increase size of look-at target sphere
2015-08-05 13:39:26 -07:00
Sam Gondelman
513c652ab3
merge from master and attempt to fix connexion conflicts
2015-08-05 12:42:39 -07:00
Sam Gondelman
113c4ea28b
exposing palm velocity and angular velocity to js
2015-08-05 12:17:15 -07:00
David Rowe
3be2ddf234
Fix calibration menu item actions
2015-08-05 12:05:04 -07:00
Anthony Thibault
49be7c49b7
Merge pull request #5506 from howard-stearns/smooth-faded-animations
...
Smooth fading of animations in and out.
2015-08-05 12:02:44 -07:00
Andrew Meadows
59f6988e56
Merge pull request #5465 from SamGondelman/connexionFixes
...
Trying to fix/clean up 3DConnexion stuff
2015-08-05 11:16:34 -07:00
Stephen Birarda
052978898e
resolve conflicts on merge with upstream master
2015-08-05 11:16:20 -07:00
Atlante45
dfaa16d15c
Merge branch 'master' of https://github.com/highfidelity/hifi into protocol
2015-08-05 10:39:02 -07:00
Howard Stearns
2f2b59b6b6
Merge branch 'master' of https://github.com/highfidelity/hifi into smooth-faded-animations
2015-08-05 10:05:05 -07:00
Zander Otavka
4965f1adda
Fix a facingRotation issue for PanelAttachable.
2015-08-05 09:20:55 -07:00
Howard Stearns
6ea06ffc3c
Merge pull request #5504 from sethalves/rig
...
set-hand-position in rig
2015-08-05 09:05:29 -07:00
Philip Rosedale
df60453344
Merge pull request #5462 from ctrlaltdavid/20574
...
CR for 20574 - Use single file robot model as fallback for full avatar models
2015-08-05 08:55:00 -07:00
Philip Rosedale
06710618d1
Merge pull request #5463 from ctrlaltdavid/20640
...
CR for 20640 - Add DDE option to couple eyelids
2015-08-05 08:47:28 -07:00
David Rowe
0c174e27c3
Merge branch 'master' into 20639
2015-08-04 18:36:53 -07:00
David Rowe
fae26d901c
Add menu option to render look-at targets
2015-08-04 18:34:56 -07:00
David Rowe
c771574578
Add 5 point eye tracker calibration option
2015-08-04 18:02:34 -07:00
Howard Stearns
731bcba956
Merge branch 'master' of https://github.com/highfidelity/hifi into smooth-faded-animations
2015-08-04 17:27:23 -07:00
Howard Stearns
61198a658c
Smooth fading of animations in and out.
...
Also, turn on the secret rig animations from Javascript with MyAvatar.setEnableRigAnimations(true). (persists)
2015-08-04 17:04:15 -07:00
David Rowe
72c4ab33a1
Handle eye calibration errors
2015-08-04 16:54:21 -07:00
David Rowe
11ec5f5ddf
Don't display duplicate error message box
2015-08-04 16:46:48 -07:00
Sam Gateau
d2360d1406
Merge branch 'core' of https://github.com/highfidelity/hifi into punk
2015-08-04 16:31:33 -07:00
Sam Gateau
fc0ee28b84
FIx the mirror rendering bugs by replacing the prvious technique by a simple true mirror during the final blit for both rear view mirror and full screen mirror, not working for HMD
2015-08-04 16:31:20 -07:00
Bradley Austin Davis
4f759ee46a
Merge remote-tracking branch 'upstream/master' into core
2015-08-04 16:26:16 -07:00
Seth Alves
c3fc1d5391
Merge branch 'master' of github.com:highfidelity/hifi into rig
2015-08-04 16:13:58 -07:00
Seth Alves
9af6b00403
Merge pull request #5500 from SamGondelman/controlBug
...
Possible fix for infrequent inability to move on Windows startup
2015-08-04 16:13:47 -07:00
Seth Alves
9171033f21
Merge branch 'master' of github.com:highfidelity/hifi into rig
2015-08-04 16:06:38 -07:00
David Rowe
b5fbfc645f
Tidy eye tracker interface
2015-08-04 15:57:19 -07:00
Seth Alves
a218f0de83
Merge pull request #5483 from AndrewMeadows/caesium
...
remove legacy shapes and friends
2015-08-04 15:40:20 -07:00
SamGondelman
52be44d621
uninitialized value
2015-08-04 14:50:38 -07:00
David Rowe
fefddb631f
Add 1 and 3 point eye tracker calibration
2015-08-04 14:46:03 -07:00
Zander Otavka
22453aa3ce
Improve inner workings of overlay API.
...
More stuff is known to the C++, and a panel object in JavaScript can be
gotten by ID from another thread.
2015-08-04 14:22:21 -07:00
Zander Otavka
055133b82e
Refactor inheritance for billboard overlays.
...
BillboardOverlays is now Image3DOverlay. Billboard3DOverlay is the base
class for both Image3DOverlay and Text3DOverlay, and it is
PanelAttachable.
2015-08-04 14:22:21 -07:00
Zander Otavka
c0838f4e58
Bring text closer to it's background.
2015-08-04 14:22:21 -07:00
Zander Otavka
28050a2ac9
Fix PanelAttachable transformations.
...
Apply the offsetPosition of the PanelAttachable after the facingRotation
of the FloatingUIPanel, not before.
2015-08-04 14:22:21 -07:00
Zander Otavka
be558eb62e
Make Text3DOverlay a PanelAttachable.
2015-08-04 14:22:20 -07:00
Sam Gateau
34183b9ddf
COmmenting the remove of the glLIneWidth and demoving dead code
2015-08-04 12:36:35 -07:00
Sam Gateau
d07ab353fc
remove glLineWidth completely because it s not available anymore for wide lines in core
2015-08-04 11:57:20 -07:00
Stephen Birarda
52b1b647a2
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
2015-08-04 10:51:23 -07:00
Bradley Austin Davis
3c76c0d4b6
Merge remote-tracking branch 'upstream/master' into core
2015-08-04 10:23:54 -07:00
Thijs Wenker
4bf6f8ed77
ModelOverlay causes a crash in the Model class. This is because ModelOverlay doesn't give a valid rig to the Model.
2015-08-04 14:47:13 +02:00
Bradley Austin Davis
29c9e6e45e
Updating plugins to core profile
2015-08-04 00:33:03 -07:00
Bradley Austin Davis
0edd7fd3c4
Merge fix
2015-08-04 00:32:38 -07:00
Bradley Austin Davis
53ccbfc4fa
Merge branch 'core' into plugins
2015-08-03 22:25:50 -07:00
Bradley Austin Davis
ed5f70039f
Merge branch 'master' into core
2015-08-03 22:18:38 -07:00
David Rowe
b71ad31812
Merge branch 'master' into 20639
2015-08-03 20:53:12 -07:00
Ryan Huffman
027adf73bb
Merge branch 'master' of github.com:highfidelity/hifi into asset-server
2015-08-03 16:41:24 -07:00
Sam Gondelman
95232920f1
trying to fix mac linking errors
2015-08-03 16:35:34 -07:00
Sam Gondelman
c9780338ae
merge from master
2015-08-03 16:27:45 -07:00
Ryan Huffman
fc9cd836ce
Update AssetScriptingInterface
2015-08-03 16:25:37 -07:00
Ryan Huffman
4e1b52a022
Add thread for AssetClient
2015-08-03 16:25:07 -07:00
ericrius1
12770edbe1
Merge branch 'master' into polyLineInProgress
2015-08-03 15:52:26 -07:00
Eric Levin
3f5f75d6d2
Merge pull request #5430 from AlexanderOtavka/floating-ui
...
Improvements to overlays.
2015-08-03 14:35:52 -07:00
Andrew Meadows
b00d47d62e
merge master into cleanup of legacy shapes
2015-08-03 11:19:29 -07:00
Andrew Meadows
acfc907704
Merge pull request #5438 from howard-stearns/rig
...
Rig: Bottleneck animation management through a Rig class
2015-08-03 11:14:21 -07:00
David Rowe
7749b912ea
Merge branch 'master' into 20639
2015-08-03 09:55:35 -07:00
David Rowe
e300eb27c0
Fix libs directory path
2015-08-03 09:55:14 -07:00
ericrius1
b2753507dc
cleanup of comments and dead code
2015-08-03 09:35:47 -07:00
ericrius1
f50c482451
Merge branch 'master' into polyLineInProgress
2015-08-03 08:46:01 -07:00
ericrius1
47bc8f50ab
cleaning
2015-08-03 08:45:14 -07:00
Brad Davis
8ac33453b5
Fix v-sync functionality
2015-08-01 22:10:47 -07:00
Brad Davis
5c07a7d85b
Merge remote-tracking branch 'upstream/master' into plugins
2015-08-01 21:58:05 -07:00
Brad Davis
180f912924
Merge remote-tracking branch 'upstream/master' into core
...
Conflicts:
interface/src/ui/overlays/Circle3DOverlay.cpp
libraries/gpu/src/gpu/Format.h
libraries/render-utils/src/GeometryCache.cpp
libraries/render-utils/src/Model.cpp
libraries/render-utils/src/text/Font.cpp
2015-08-01 20:01:59 -07:00
ZappoMan
771ce6dca3
remove QUAD_STRIP from Circle3DOverlay
2015-08-01 17:20:48 -07:00
Brad Davis
b84eef93c9
Core profile shader work and test code
2015-08-01 14:43:52 -07:00
Sam Gondelman
647bb2b9ce
removing unnecessary weak link
2015-08-01 11:41:29 -07:00
Sam Gondelman
8d77afaa94
more work on cleaning up connexion
2015-08-01 11:41:29 -07:00
Sam Gondelman
01c4e17236
trying to fix connexion linker errors, general style fixes, renamed some files
2015-08-01 11:41:29 -07:00
Howard Stearns
2713115336
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-31 18:05:47 -07:00
SamGondelman
8908c7c141
working on windows crash
2015-07-31 17:55:59 -07:00
Stephen Birarda
41c6220731
resolve conflicts on merge with upstream/master
2015-07-31 17:27:23 -07:00
SamGondelman
e8daee013e
windows finds framework
2015-07-31 16:27:10 -07:00
Brad Davis
1e44495f7c
Initialize the GL widget with the 4.1 core profile
2015-07-31 16:21:47 -07:00
Seth Alves
bbee001366
Merge pull request #5470 from birarda/master
...
fix for unique_ptr<char> allocations
2015-07-31 15:09:18 -07:00
Stephen Birarda
12ad60a6b5
add a missed char[] in OctreePacketProcessor
2015-07-31 14:48:54 -07:00
Andrew Meadows
661a916ebd
merge rig into cleanup (removal of legacy shapes)
...
Conflicts:
interface/src/avatar/Avatar.h
tests/physics/src/ShapeColliderTests.cpp
tests/physics/src/ShapeColliderTests.h
2015-07-31 13:40:51 -07:00
ZappoMan
3d9b0f1be5
set focus on enter hmd
2015-07-31 13:23:35 -07:00
Zander Otavka
7973c2d469
Fix compile issue on Linux and Windows.
...
Shoutout to Andrew for help finding the missing #include.
2015-07-31 11:26:04 -07:00
Zander Otavka
9bd72e5769
Tweak PanelAttachable::setTransforms.
...
Use reference instead of pointer, and make it virtual.
2015-07-31 11:26:04 -07:00
Zander Otavka
bc5ef8eb11
Clean up C++ relating to panels.
2015-07-31 11:26:04 -07:00
Zander Otavka
da2afca391
Expose overlay type checking to JavaScript.
2015-07-31 11:26:04 -07:00
Zander Otavka
1d37df4775
Improve and optimize panel transformations.
2015-07-31 11:26:04 -07:00
Zander Otavka
e5b8701215
Add toggle event for address bar.
2015-07-31 11:26:04 -07:00
Zander Otavka
1655dea2c3
Fix BillboardOverlay first person render bug.
2015-07-31 11:26:04 -07:00
Zander Otavka
0524155349
Expose face tracking to the script engine.
2015-07-31 11:26:04 -07:00
Zander Otavka
c77a91eb63
Expose address bar toggling to scripts.
2015-07-31 11:26:04 -07:00
Zander Otavka
c4cb6fba74
Improve BillboardOverlay::findRayIntersection.
2015-07-31 11:26:03 -07:00
Zander Otavka
377a1a54ae
Add abstraction layer for Overlays.h.
...
`examples/libraries/overlayUtils.js` allows you to manage overlays in an
object oriented manner. Instead of:
var billboard = Overlays.addOverlay("billboard", { visible: false });
...
Overlays.editOverlay(billboard, { visible: true });
...
Overlays.deleteOverlay(billboard);
You can now do:
var billboard = new BillboardOverlay({ visible: false });
...
billboard.visible = true;
...
billboard.destroy();
2015-07-31 11:26:03 -07:00
Zander Otavka
ed7fc07ab1
Fix cloning bug for BillboardOverlay.
2015-07-31 11:26:03 -07:00
Zander Otavka
173a79867c
Extend Overlays API to allow for 3D UI panels.
...
Currently, only BillboardOverlays can be added to a panel, but more
types of overlays will be supported in the future.
2015-07-31 11:26:03 -07:00
Zander Otavka
dff6b0a456
Fix isFacingAvatar property on BillboardOverlay.
2015-07-31 11:26:03 -07:00
Brad Davis
155f88e267
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/devices/OculusManager.cpp
interface/src/devices/TV3DManager.cpp
interface/src/devices/TV3DManager.h
libraries/gpu/src/gpu/GPUConfig.h
2015-07-31 10:28:06 -07:00
Howard Stearns
b685378ab0
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-31 10:08:30 -07:00
Seth Alves
c1f777e18f
move setHandPosition from SkeletonModel to AvatarRig. Tell Rig::initJointStates joint-indexes for hands and elbows and shoulders
2015-07-30 18:39:01 -07:00
SamGondelman
25e75bcc79
WIP: trying to fix windows not finding framework
2015-07-30 18:11:24 -07:00
Bradley Austin Davis
f3e701e0d5
Don't allow leaving VR mode to target the rift
2015-07-30 17:40:02 -07:00
Bradley Austin Davis
ac0ec0a458
Ensure the app moves back to a non-rift screen if the saved geometry is bad
2015-07-30 17:09:08 -07:00
Brad Davis
352ae24fab
Removing unused function
2015-07-30 15:35:04 -07:00
Brad Davis
948d5dab0c
Cleaning up diff
2015-07-30 15:30:05 -07:00
Sam Gondelman
a01a4f929f
removing unnecessary weak link
2015-07-30 15:14:51 -07:00
Sam Gateau
14f4c9c6c0
REmove more of the unnecessary GLBacken .h and GPUCOnfig.h include, The gpu::Context is now completely agnostic of the True Backend
2015-07-30 15:07:36 -07:00
Anthony J. Thibault
7a10b31dd9
Clear translation on root joint.
...
Also, delete/rename all instances of updateJointState except for the one in Rig
and derived classes.
2015-07-30 15:04:27 -07:00
Sam Gondelman
b8f7d4b8c8
more work on cleaning up connexion
2015-07-30 13:19:05 -07:00
Brad Davis
ba58e95f53
Fix 3dconnextion usage
2015-07-30 13:06:43 -07:00
Brad Davis
f7a2513f26
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Menu.cpp
interface/src/Menu.h
interface/src/avatar/MyAvatar.h
tests/ui/src/main.cpp
2015-07-30 12:55:22 -07:00
Bradley Austin Davis
fccb07dc93
Tweaking timing of geometry restoration
2015-07-30 12:44:47 -07:00
Howard Stearns
5e3bebcd86
Merge pull request #12 from hyperlogic/ajt/head-model-fix
...
Re-added neck and eye procedural animation to FaceModel.
2015-07-30 12:32:17 -07:00
Anthony J. Thibault
314434e068
Re-added neck and eye procedural animation to FaceModel.
...
This is only used in the case of split head/body avatars.
2015-07-30 12:27:28 -07:00
Bradley Austin Davis
a260be9a4d
HMDTools dialog restoration phase 2, electric boogaloo
2015-07-30 12:25:21 -07:00
Sam Gondelman
b19376ef6e
trying to fix connexion linker errors, general style fixes, renamed some files
2015-07-30 12:17:36 -07:00
Brad Davis
5878a4661c
Restoring HMD tools dialog, phase 1
2015-07-30 11:35:55 -07:00