Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-10 02:20:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
46875 commits 25 branches 0 tags 1.1 GiB
Commit graph

15939 commits

Author SHA1 Message Date
Atlante45
51b45f8f73 Steam invite are facing the current position 2016-08-08 15:39:25 -07:00
Atlante45
aa2ae31aab CR UI fixes 2016-08-08 15:39:25 -07:00
Atlante45
7ec2f98cf2 Join lobby on startup 2016-08-08 15:39:25 -07:00
Atlante45
42c9a695ff Invite friends in HMD 2016-08-08 15:39:25 -07:00
Atlante45
a13950752b Update steam location with discoverability 2016-08-08 15:39:25 -07:00
Atlante45
f0ff975248 UI wiring 2016-08-08 15:39:25 -07:00
Atlante45
205df0cf51 login UI first draft 2016-08-08 15:39:25 -07:00
Atlante45
cea0e182c0 Interface login through steam 2016-08-08 15:39:25 -07:00
David Kelly
c8f3a898d2 First cut of a snapshot uploader 
Will need to test end-to-end shortly, etc...
 2016-08-08 15:27:27 -07:00
SamGondelman
328d3128fa merge from master 2016-08-08 13:30:39 -07:00
Ryan Huffman
fb14628a7e Handle case in entity loading priority function where max dim size is <= 0 2016-08-08 10:39:27 -07:00
Ryan Huffman
d367583426 Clean up priority loading implementation 2016-08-08 08:53:06 -07:00
Ryan Huffman
d48bc96cf9 Add ability to set number of concurrent downloads 2016-08-08 08:53:06 -07:00
Ryan Huffman
4f9be2ae72 Fix camera position not being set for angular loading 2016-08-08 08:53:06 -07:00
Seth Alves
38314b180b Merge branch 'master' of github.com:highfidelity/hifi into fsm-arrows-dont-walk 2016-08-08 06:30:18 -07:00
SamGondelman
771e105fa2 Merge remote-tracking branch 'upstream/master' into loadingFade 2016-08-05 16:52:01 -07:00
elisa-lj11
b1b2ea48b2 Made code more QA; extra browser and download widget close upon download 2016-08-04 17:01:19 -07:00
elisa-lj11
a94a304700 Downloads from Clara.io and uploads to asset server 2016-08-04 16:59:38 -07:00
elisa-lj11
6152fa28b7 Download through QML 
It kind of works, not crashing like before, but the weird ghost
file/type error is still happening with multiple downloads
 2016-08-04 16:58:31 -07:00
elisa-lj11
eab7714d70 working within webview to access url 2016-08-04 16:57:19 -07:00
elisa-lj11
76a847d34f testing for URL bug 2016-08-04 16:53:09 -07:00
elisa-lj11
212e4f9cca making quazip work 2016-08-04 16:48:14 -07:00
elisa-lj11
f277a019bf FileScriptingInterface 
Created new .cpp and .h for the download and unzipping of a model
 2016-08-04 16:46:56 -07:00
elisa-lj11
4f33e1502f starting the zip project 2016-08-04 16:46:56 -07:00
howard-stearns
fed775ff83 simple snapshot confirmation 2016-08-04 15:52:39 -07:00
Ryan Huffman
d775a92dab Update implementation of ConnectionMonitor timeout 2016-08-04 14:45:10 -07:00
Ryan Huffman
a37bcdafda Remove debug logging in ConnectionMonitor 2016-08-04 14:40:41 -07:00
Ryan Huffman
8044910bf2 Add show-address-bar when disconnected from domain 2016-08-04 14:39:53 -07:00
SamGondelman
b6e73e06a2 merge from master 2016-08-04 13:34:38 -07:00
Seth Alves
40a5e4abc8 in full-screen mirror camera mode, arrow keys move camera but don't make the avatar walk 2016-08-03 13:54:25 -07:00
SamGondelman
2eb0c7735f working on fading shape entities 2016-08-03 13:30:05 -07:00
Anthony J. Thibault
75b88b0794 WebEntities now support custom hifi url handling 
WebEntities now use qml/controls/WebView.qml instead of qml/WebEntity.qml.
marketplace urls and hifi urls should work properly in web entities.
 2016-08-03 10:20:15 -07:00
Anthony J. Thibault
0ab15f0dcd fixed one frame lag on webEntity keyboard highlight overlay. 
Also, made overlay not draw in front.
 2016-08-02 15:35:59 -07:00
Howard Stearns
c2d1f08551 Merge pull request #8342 from highfidelity/dk/snapshot 
Snapshot button
 2016-08-02 15:31:50 -07:00
Anthony J. Thibault
6d768d8327 hand controllers send touch events instead of mouse events to web entities 
This gives a much better experience when scrolling web content.
 2016-08-02 15:23:46 -07:00
Seth Alves
79121133df remove unneeded change 2016-08-02 12:00:45 -07:00
Seth Alves
528f417f74 Merge branch 'master' of github.com:highfidelity/hifi into default-when-av-fails 2016-08-02 11:55:17 -07:00
Seth Alves
f91df4997d re-enable falling-back to default avatar if an avatar's url is bad 2016-08-02 11:55:11 -07:00
Seth Alves
75f9626c2d if MyAvatar simulation is cut short (due to no skeleton), still update the head position 2016-08-02 11:50:53 -07:00
Seth Alves
56af36ae64 set head position of other avatars even if they can't be drawn 2016-08-02 11:29:43 -07:00
Seth Alves
229b8d3b5e testing a more explicit fix of the audio failure 2016-08-02 10:46:11 -07:00
Seth Alves
ed4b0b3589 call _skeletonModel.setURL, but leave our copy of _skeletonModelURL alone. This is so that we don't redo this every time we receive an identity packet from the avatar with the bad url. 2016-08-02 09:57:17 -07:00
Anthony J. Thibault
ed7eaebea8 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-02 09:23:18 -07:00
Seth Alves
5a1fe39737 Merge branch 'master' of github.com:highfidelity/hifi into overlay-children 2016-08-01 18:57:32 -07:00
David Kelly
1d7cdff2bc Snapshot button plus script 
Minor change to allow snapshots to not notify (though the old way
with CTRL+S still does).  Added button to do it, saves them to disk.

The plan is for us to add UI to share (or not) the snapshot.  That's
why we are not going through the notifications.  Also, the
script makes sure to hide/unhide hud and overlays.  Next we will upload
the pick to AWS via data-web (if you are logged in), and _then_ make
the share UI.
 2016-08-01 18:21:01 -07:00
Seth Alves
b953e6f0ff when an avatar URL fails, switch to the default 2016-08-01 18:12:30 -07:00
Ryan Huffman
604c8f4a36 Merge pull request #8337 from humbletim/fix-Assets-getMapping 
fix Assets.getMapping(path, callback) to return a value
 2016-08-01 13:32:08 -07:00
Seth Alves
28e0ca2e49 when a parent of a 3d overlay is deleted, delete the overlay 2016-08-01 10:55:34 -07:00
Seth Alves
70becfaff1 avoid some unneeded SpatiallyNestable transform-locks 2016-08-01 08:20:24 -07:00
Seth Alves
6f3146f872 oops, position and rotation are local, by this point 2016-08-01 08:00:51 -07:00
Seth Alves
182829e64c get transform once rather than 3 times 2016-08-01 07:49:57 -07:00
Seth Alves
bddff3341a angry De Morgan 2016-08-01 07:49:22 -07:00
Seth Alves
627048db84 pull missing location properties from overlay 2016-07-31 16:36:14 -07:00
Seth Alves
e4e86c245e 3d overlays can be children of entities or avatars 2016-07-31 14:11:56 -07:00
Anthony Thibault
cf7450beb7 handControllerGrab and web entity input integration 2016-07-29 17:50:45 -07:00
Anthony Thibault
f71a59276c Merge pull request #8317 from hyperlogic/bug-fix/web3doverlay-rendering 
Fix alpha cut-outs and incorrect gamma on web overlays and entities
 2016-07-29 17:44:46 -07:00
SamGondelman
676f4bdfcf misc fixes from particles branch 2016-07-29 15:36:32 -07:00
Brad Hefta-Gaub
e879f22c95 fix behavior with no entity server 2016-07-28 15:15:52 -07:00
Anthony Thibault
ea310bcc43 Web Entities now render correctly as well 2016-07-28 14:11:19 -07:00
Anthony Thibault
be6e401e9a Merge branch 'master' into bug-fix/web3doverlay-rendering 2016-07-28 11:20:35 -07:00
humbletim
3e0ef7d43a make Assets.getMapping(path) actually return the mapping 2016-07-28 10:13:30 -04:00
Bradley Austin Davis
a9740b803f Defer batch execution to the end of the frame generation 2016-07-26 16:13:48 -07:00
Brad Hefta-Gaub
2d199fe3d0 rename function for better clarity 2016-07-26 08:08:44 -07:00
Brad Hefta-Gaub
83dc9ea6bb punish slow scripts and don't send updates while physics is still loading 2016-07-25 21:46:30 -07:00
Anthony J. Thibault
fb84f058d6 Fix alpha cut-outs and incorrect gamma on Web3DOverlays 2016-07-25 15:56:05 -07:00
Brad Hefta-Gaub
4f04dbc926 Merge pull request #8308 from jherico/overlay_multi_edit 
Allow atomic editing of multiple overlays from scripts
 2016-07-23 13:51:51 -07:00
Brad Hefta-Gaub
41e02276e5 Merge pull request #8297 from hyperlogic/feature/fst-anim-graph-override 
Support for animGraphUrl override in FST file.
 2016-07-23 13:42:46 -07:00
Brad Davis
121a0f0f5e Allow atomic editing of multiple overlays from scripts 2016-07-23 11:41:58 -07:00
Ryan Downe Karpf
91714aaca6 Merge pull request #8258 from AlexanderOtavka/edit-model-ui 
Edit model dialog improvements
 2016-07-22 17:11:52 -07:00
James B. Pollack
5202038210 Merge pull request #8282 from hyperlogic/bug-fix/avatar-embedded-in-floor 
Vive HMD fixes to prevent user from becoming embedded in the floor.
 2016-07-22 09:04:40 -07:00
Anthony Thibault
2429b82b5e Support for animGraphUrl override in FST file. 2016-07-21 17:17:08 -07:00
samcake
853f31f6ea Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-20 10:49:27 -07:00
Howard Stearns
0b5cdcef42 Merge pull request #8252 from howard-stearns/suggestions 
suggestions
 2016-07-19 15:46:23 -07:00
Anthony J. Thibault
837b19ed1b fix for pushing avatar into floor when exiting away mode. 
* Removed MyAvatar.reset() access from JavaScript
* Added HMD.centerUI() to JavaScript, which can be used to reset the 3D UI sphere around the current HMD orientation.
* Added MyAvatar.clearIKJOintLimitHistory() which can be used to reset any remembered IK joint limit history.
* Added MyAvatar.centerBody() which can be used to instantly re-orient the avatar's so that the hips and toes
  are facing the same direction as the current HMD orientation.

away.js now uses the above new API's instead of MyAvatar.reset()
 2016-07-19 14:42:24 -07:00
Anthony Thibault
897627ebd6 Merge pull request #8272 from hyperlogic/bug-fix/mac-os-quality-of-life-fixes 
Mac OS X fixes
 2016-07-19 11:18:46 -07:00
samcake
ff132fa712 Gathering the diffusion passes in the SUrfaceGEometryPAss job 2016-07-19 02:11:22 -07:00
samcake
3638a3b9c3 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-18 23:15:21 -07:00
Anthony J. Thibault
7fd40a5d10 MacOS: fix crash when touchscreen device is nullptr. 2016-07-18 17:08:17 -07:00
howard-stearns
abb63139f6 Merge branch 'master' of https://github.com/highfidelity/hifi into suggestions 2016-07-18 16:29:49 -07:00
Seth Alves
2d73b23c56 when deciding on the release velocity of something thrown, don't include a zero velocity caused by seeing the same controller data as last frame 2016-07-18 14:44:41 -07:00
Zander Otavka
d75c2e2a6f Merge branch 'master' into edit-model-ui 2016-07-18 13:11:51 -07:00
samcake
a44aee84ce Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-18 10:16:55 -07:00
samcake
744474982d Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-17 13:28:03 -07:00
Brad Davis
03cb6175ab Support triangle and hexagon shapes, add shape support to overlays. 2016-07-15 22:02:17 -07:00
Howard Stearns
d446e1bcf5 Phone home with suggestions activity usage. 2016-07-15 19:15:58 -07:00
Zander Otavka
71f62c02fc Add basic implementation of customPrompt 
Still missing the warning and diabling of dynamic checkbox when the
static mesh is selected.
 2016-07-15 17:35:55 -07:00
Sam Gondelman
e24b064ccd Merge pull request #8244 from BingShearer/logrolling 
Delete Old Interface Logs If the Sum Size of Those Logs Exceeds Reasonable Size
 2016-07-15 14:14:44 -07:00
Bing Shearer
9ee64d114b Sam's space. 2016-07-15 13:47:36 -07:00
Brad Hefta-Gaub
574aaa9f28 Merge pull request #8248 from jherico/edit_toolbar 
Migrate edit.js toolbar to the new toolbar API
 2016-07-15 12:42:13 -07:00
Brad Hefta-Gaub
7bb31fe075 Merge pull request #8240 from jherico/hand_controller 
Menu & hand controller polish
 2016-07-15 12:36:31 -07:00
samcake
a3f6ed6a89 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-15 09:22:34 -07:00
Brad Davis
ffdaadf13c Make toolbars work even when debugging a script 2016-07-14 17:40:02 -07:00
Brad Hefta-Gaub
45aa78702c Merge pull request #8217 from sethalves/fix-throwing 
fix throwing
 2016-07-14 15:52:41 -07:00
Bing Shearer
4fb9d8801c More coding standard fun! 2016-07-14 13:55:26 -07:00
Bing Shearer
9641ae8cd8 Coding standard fun! 2016-07-14 13:22:43 -07:00
Brad Davis
882139ebcf Allow scripts to override the navigation focus state set by QML dialogs 2016-07-14 12:10:46 -07:00
samcake
3ab56062d4 Address some warnings and syntax issues 2016-07-14 12:06:02 -07:00
Bing Shearer
be0446f9a9 Delete old logs if the sum size of those logs exceeds reasonable size. 2016-07-14 11:36:48 -07:00
Ryan Huffman
e18d664204 Merge pull request #8238 from hyperlogic/bug-fix/jumbo-fish 
Support for scale property on model overlays
 2016-07-14 05:22:56 -07:00
Anthony J. Thibault
789297d849 Remove redundant isValid check. 2016-07-13 17:39:39 -07:00
Anthony Thibault
1d77cec125 Support for scale property on model overlays 
If "scale" property is present but "dimensions" are not, the model is NOT scale to fit.
And the scale of the model's natural dimensions will be affected by the scale properties.

If only the "dimensions" property is present, the model will "scale to fit" the dimensions.

If both properties are present, the model still be "scale to fit" but the dimension will be scaled by the scale factor.

For example:

If a model is loaded that is 2cm tall, is loaded with no "dimensions" or "scale" properties.
It will be displayed as 2cm tall.

    {"scale": 2}

The above properties will result in a model that is 4cm tall.

    {"dimensions": 1}

This will result in a model that is 1cm tall.

    {"scale": 2, "dimensions" 2}

Will result in a model that is 2cm tall.
 2016-07-13 16:09:56 -07:00
Stephen Birarda
345478eb36 add removeButton API to ToolbarScriptingInterface 2016-07-13 15:06:31 -07:00
Stephen Birarda
609900f246 move ignore set handling to NodeList 2016-07-13 15:06:31 -07:00
Stephen Birarda
6b6513d5f9 immediately fade out ignored avatars 2016-07-13 15:06:31 -07:00
Stephen Birarda
bb68e777e6 add a scripting interface to ignore users 2016-07-13 15:06:31 -07:00
Brad Hefta-Gaub
487aacde3c Merge pull request #8216 from huffman/feat/improved-domain-loading 
Update max request limit and number of processing threads
 2016-07-13 14:47:24 -07:00
Brad Hefta-Gaub
f8910d475e Merge pull request #8225 from ZappoMan/codecPlugins 
Audio codec plugins
 2016-07-13 14:47:03 -07:00
samcake
8acc18ae8b Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-13 11:42:07 -07:00
Ryan Huffman
fcd59ea94f Update target number of processing threads to be based on system 2016-07-12 17:44:23 -07:00
Brad Davis
6336362d40 Fixing decoration inflation 2016-07-12 17:23:13 -07:00
Brad Hefta-Gaub
9fcecb6277 Merge pull request #8204 from hyperlogic/bug-fix/avatar-url-and-model-name-access-from-js 
Fix MyAvatar name and url accessors.
 2016-07-12 15:30:06 -07:00
Brad Hefta-Gaub
b8d79ec263 Merge pull request #8179 from SamGondelman/snapshotFix3 
Various snapshot improvements
 2016-07-12 15:28:51 -07:00
Brad Hefta-Gaub
819cab4aab Merge pull request #8158 from sethalves/raypick-avatars 
Raypick avatars
 2016-07-12 15:27:30 -07:00
Brad Hefta-Gaub
84dfe1b0e9 Merge pull request #8219 from jherico/circles 
Support alpha and color gradients in circle overlays
 2016-07-12 15:25:49 -07:00
Seth Alves
0dd2171b75 remove commented-out code 2016-07-12 11:57:57 -07:00
Seth Alves
6c14ef3392 added a comment 2016-07-12 11:56:57 -07:00
samcake
5d4b55eeea Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-12 09:19:28 -07:00
samcake
ba7590712a BRinging the intermediate render textures in the pipeline as varyings and not throug the singletonn anymore 2016-07-11 18:33:57 -07:00
Seth Alves
85cc5f8956 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-07-11 18:02:18 -07:00
Seth Alves
62abe43996 Merge branch 'master' of github.com:highfidelity/hifi into fix-throwing 2016-07-11 17:06:52 -07:00
Seth Alves
84c5bef487 back to ignore more recent 3 frames. don't have released entities collide with myAvatar until 0.25 seconds after release 2016-07-11 17:02:11 -07:00
Seth Alves
0d0e0925e5 try skipping 2 rather than 3 2016-07-11 16:00:55 -07:00
Seth Alves
1ef26d39eb blah 2016-07-11 15:31:15 -07:00
Seth Alves
b0f1492ac7 ignore 3 frames for current velocity rather than just 1 2016-07-11 15:08:00 -07:00
Brad Hefta-Gaub
bcee128de0 Merge pull request #6959 from Triplelexx/20769 
CR for Job #20769 - Touchscreen camera input for Interface
 2016-07-11 14:24:52 -07:00
Seth Alves
9c17890035 try not including the most recent sample in the smoothed velocity 2016-07-11 14:18:28 -07:00
Seth Alves
53a366d4e8 measure velocity over 6 frames 2016-07-11 13:25:00 -07:00
Brad Hefta-Gaub
f3f72f3c93 Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins 2016-07-11 13:15:27 -07:00
Seth Alves
c034879b74 Merge branch 'master' of github.com:highfidelity/hifi into fix-throwing 2016-07-11 11:12:20 -07:00
Seth Alves
7295e5c101 experimenting 2016-07-11 10:22:44 -07:00
Seth Alves
52a7c8e032 Merge branch 'feature/grab-script-polish' of github.com:hyperlogic/hifi into refresh-feature/grab-script-polish 2016-07-11 10:09:07 -07:00
Seth Alves
eac144f354 experimenting 2016-07-11 09:52:24 -07:00
Seth Alves
1cf57b27a9 Merge branch 'master' of github.com:highfidelity/hifi into fix-throwing 2016-07-11 08:57:11 -07:00
Brad Davis
2c72037e81 Fixing warnings 2016-07-09 20:43:31 -07:00
Brad Davis
31948bce2d Support alpha and color gradients in circle overlays 2016-07-09 20:43:30 -07:00
Seth Alves
5c69e55475 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-07-08 17:43:52 -07:00
Clément Brisset
f7b3155178 Merge pull request #8213 from birarda/long-script-name 
Interface changes for new Marketplace
 2016-07-08 16:57:25 -07:00
Seth Alves
051616d7c3 experimenting 2016-07-08 16:16:06 -07:00
Stephen Birarda
11aafc0f48 use endsWith for scriptURL check 2016-07-08 16:00:06 -07:00
Stephen Birarda
43967dc9a6 handle running of non .svo.json JSON files from mp CDN 2016-07-08 15:47:56 -07:00
Ryan Huffman
489d2e4ca5 Update max request limit and number of processing threads 2016-07-08 15:33:11 -07:00
Stephen Birarda
5bce924eda keep signature for askToLoadScript 2016-07-08 14:34:42 -07:00
Anthony J. Thibault
9242147394 Merge branch 'master' into feature/grab-script-polish 2016-07-08 13:40:01 -07:00
Brad Hefta-Gaub
d78eb19e44 Merge pull request #8194 from jherico/glow_lines 
Support for glowing 3D line overlays
 2016-07-08 12:50:35 -07:00
Anthony J. Thibault
1ec3472230 Model overlay dimensions fixes 
At the moment model overlays will ALWAYS scale to fit their dimensions
Update handControllerGrab to account for this behavior.
 2016-07-08 11:36:43 -07:00
Stephen Birarda
216e47b29a hide the long URL prefix of scripts from marketplace 2016-07-08 09:43:11 -07:00
Brad Davis
829a871d6f Merge pull request #8208 from SamGondelman/qmlFixes 
Fixed issues in Browser.qml and UpdateDialog.qml
 2016-07-07 19:51:37 -07:00
Seth Alves
11542aeca2 pick against avatar's capsule and then against the T-pose mesh 2016-07-07 16:36:25 -07:00
SamGondelman
99fc472d77 fixed errors in Browser.qml and UpdateDialog.qml 2016-07-07 14:06:57 -07:00
Brad Davis
828be94089 Fix rendering of overlay spheres with alpha 2016-07-07 14:04:59 -07:00
Brad Davis
8ca3630cfa Support glow effect in 3D line overlays 2016-07-07 13:36:48 -07:00
Anthony J. Thibault
aba6924dc7 Fix MyAvatar name and url accessors to JS. 
Q_INVOKABLE does not support returning references.
MyAvatar.getFullAvatarURLFromPreferences() now returns a QUrl instead of a reference.
MyAvatar.getFullAvatarModelName() now returns a QString instead of reference.

This should fix the JS API for these methods, they will now receive a JS string instead of undefined.
 2016-07-07 13:33:36 -07:00
Seth Alves
6786a07ac2 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-07-07 09:53:24 -07:00
Brad Hefta-Gaub
ac2d3e1cc7 Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins 2016-07-07 09:47:19 -07:00
Brad Hefta-Gaub
41a74f7652 Merge pull request #8193 from huffman/fix/model-overlay-dims 
Fix model overlays not correctly scaling
 2016-07-06 16:17:22 -07:00
Anthony J. Thibault
a07970f053 Fix for one-frame glitch when changing dimensions of a model entity. 
This was due to Model::setScaleToFit being called on the script thread instead of the main thread.
 2016-07-06 14:09:55 -07:00
Brad Hefta-Gaub
9333c7dcca Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins 2016-07-06 13:26:19 -07:00
SamGondelman
890b22426c added folder selection dialog on first snapshot 2016-07-06 12:15:34 -07:00
Ryan Huffman
7d803b7513 Fix model overlays not correctly scaling 2016-07-06 11:54:39 -07:00
SamGondelman
79864df08e didn't mean to do that 2016-07-05 18:53:39 -07:00
SamGondelman
b3513b543c fixed snapshot path setting 2016-07-05 18:23:59 -07:00
SamGondelman
04184ee1fb added snapshot notification in desktop mode 2016-07-05 17:21:57 -07:00
Brad Davis
d6250d4c5a Fix export entities by region 2016-07-05 10:37:53 -07:00
Seth Alves
5ab82cd7c8 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-07-02 15:11:59 -07:00
Stephen Birarda
e784d7c400 Merge pull request #8170 from huffman/fix/multiple-sessions 
Fix multiple sessions being created for some users
 2016-07-01 16:41:56 -07:00
howard-stearns
71c44f4f93 Merge branch 'master' of https://github.com/highfidelity/hifi into button-state 2016-07-01 13:05:32 -07:00
SamGondelman
218b26b521 removed snapshot share dialog, ctrl s shouldn't leave you moving 2016-07-01 10:58:55 -07:00
Sam Gondelman
a39376e490 Merge pull request #8174 from jherico/overlay_lighting 
Don't render wire geometry with lighting effects
 2016-07-01 10:03:19 -07:00
Brad Davis
5288d98376 Using pipelines properly where appropriate 2016-06-30 20:52:41 -07:00
howard-stearns
125f6d8b63 Merge branch 'master' of https://github.com/highfidelity/hifi into button-state 2016-06-30 16:49:19 -07:00
howard-stearns
ff55644fe8 stateful hud toolbar buttons 2016-06-30 16:24:11 -07:00
Brad Davis
b7926b8582 Don't render wire geometry with lighting effects 2016-06-30 16:11:05 -07:00
SamGondelman
69ffd63ba7 fix snapshot sharing window 2016-06-30 15:42:48 -07:00
Ryan Huffman
49da7d9a61 Remove sending of session id in request body in favor of header 2016-06-30 14:43:27 -07:00
Ryan Huffman
38776fe007 Fix multiple sessions being created for some users 
If a user didn't have send-data activated they don't have their session id
sent in the header of requests, but instead send it inside the request
body. The session id being send in the request included curly braces which
the server considers invalid.
 2016-06-30 14:35:27 -07:00
Seth Alves
5f9c7b6ea5 trying to take joint information into account when raypicking against models 2016-06-29 17:02:49 -07:00
Seth Alves
9114ebb548 remove unused code 2016-06-29 09:53:26 -07:00
Seth Alves
c3dbe5d9c4 ray pick against avatar meshes rather than capsules 2016-06-29 09:45:09 -07:00
Seth Alves
03ed36cf33 take shape offset into account when getting avatar's capsule 2016-06-29 09:13:52 -07:00
Seth Alves
c414df7a9d Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-06-28 18:28:20 -07:00
Brad Hefta-Gaub
ec0ca1d173 Merge pull request #8146 from huffman/fix/launch-version 
Add version to launch user activity
 2016-06-28 17:13:10 -07:00
Seth Alves
224008afd6 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-06-28 16:56:27 -07:00
Howard Stearns
da61100b6d Merge pull request #8150 from highfidelity/vive-ui 
merge vive-ui to master
 2016-06-28 13:31:55 -07:00
Seth Alves
0f9f4749e7 fix invokeMethod in AvatarManager::findRayIntersection 2016-06-28 11:18:46 -07:00
Seth Alves
8a0d58a0c2 fix invokeMethod in AvatarManager::findRayIntersection 2016-06-28 11:15:01 -07:00
Ryan Huffman
b36a39b2bc Add version to launch user activity 2016-06-28 09:59:59 -07:00
Seth Alves
5e7e6d2f3e Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-06-28 09:57:58 -07:00
Seth Alves
4e70e8ed42 js call to ray-pick against avatars 2016-06-28 09:55:49 -07:00
Andrew Meadows
58e05b2e90 Merge pull request #8143 from AlexanderOtavka/remove-cam-slots 
namechange Camera::_rotation --> Camera::_orientation
 2016-06-28 09:49:54 -07:00
Brad Davis
8561581ab2 Merge pull request #8121 from SamGondelman/miniMirrorFix 
Mini mirror/multi-monitor bug fixes
 2016-06-27 22:04:39 -07:00
Zander Otavka
235ee4bd46 Refactor Camera scripting interface a little 
get/setRotation has been removed, as it was a duplicate of
get/setOrientation, but undocumented and barely used.  get/setTransform
and get/setPerspective have been changed to methods from slots, since
glm::mat4 is not exposed to the scriping interface so they don't work in
scripting.
 2016-06-27 13:06:12 -07:00
Triplelexx
aae3555b63 update TouchscreenDevice 
* fix threading issue with zoom gesture
* KeyboardMouseDevice touchpad disabled to prevent interference
* device supported based on QTouchDevice::devices().count()
 2016-06-27 21:01:06 +01:00
Howard Stearns
de7738e644 Merge pull request #8134 from highfidelity/vive-ui 
Vive UI bug fixes
 2016-06-24 18:39:06 -07:00
Brad Davis
f90a351400 Don't reposition windows prior to selecting the initial display plugin 2016-06-24 16:31:24 -07:00
Sam Gondelman
3c809ef40c Merge pull request #8123 from AlexanderOtavka/first-person-hmd 
Automatically enter first person when in HMD mode
 2016-06-24 15:58:38 -07:00
howard-stearns
9ae3c38616 doh! 2016-06-24 15:26:24 -07:00
howard-stearns
2ae0a7defc If there are TWO conditions holding things back, weight for them both to 
clear.
 2016-06-24 14:46:46 -07:00
howard-stearns
7da854d98c do not reset hud from button 2016-06-24 13:35:47 -07:00
Zander Otavka
dd023e16fd Tabs -> spaces 2016-06-24 13:16:24 -07:00
Zander Otavka
d45694836f Add signal for display mode change in HMD 2016-06-24 11:57:12 -07:00
Zander Otavka
41d38ab630 Revert "Automatically enter first person when in HMD mode" 
This reverts commit 3c9f3f3927.
 2016-06-24 10:16:40 -07:00
Zander Otavka
88ad570024 Revert "Uses spaces, not tabs" 
This reverts commit 7e5b9db13a.
 2016-06-24 10:16:26 -07:00
Triplelexx
6542604d13 resolve conflicts with TouchscreenDevice 
updated to master
 2016-06-24 05:19:28 +01:00
Triplelexx
fd4d9761ce merge master and resolve conflicts 
* remove use of jointsCaptured flag in inputDevice update, TouchscreenDevice now locks the userInputMapper * resolve conflict in Application.cpp, userInputMapper no longer loads default mapping
 2016-06-24 03:34:39 +01:00
Brad Hefta-Gaub
d7bffc3eab first cut at negotiating codecs 2016-06-23 17:14:41 -07:00
howard-stearns
f8391f0062 fix reticle bugs 2016-06-23 16:51:15 -07:00
Brad Hefta-Gaub
be37921845 first cut at codec plugins 2016-06-23 10:42:02 -07:00
Zander Otavka
7e5b9db13a Uses spaces, not tabs 2016-06-22 16:50:47 -07:00
Zander Otavka
3c9f3f3927 Automatically enter first person when in HMD mode 2016-06-22 16:22:14 -07:00
howard-stearns
67f76db7e4 Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui 2016-06-22 15:58:53 -07:00
SamGondelman
d4cfe6256a don't render mini mirror if rendering fullscreen mirror 2016-06-22 14:46:08 -07:00
howard-stearns
d3735322a5 Whitespace. 2016-06-22 13:03:13 -07:00
Ryan Huffman
2621add8e3 Fix nearby_avatars not tracking 2016-06-22 09:17:28 -07:00
SamGondelman
78a1845afe fixed resizing of qml overlays when device pixel ratio changes 2016-06-21 18:13:11 -07:00
SamGondelman
f0b78eae47 fix mini mirror 2016-06-21 16:48:32 -07:00
Ryan Huffman
70be7b3273 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions 2016-06-21 16:39:25 -07:00
howard-stearns
8421931c56 Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui 2016-06-21 14:47:45 -07:00
Brad Davis
c928de6051 Merge pull request #8099 from howard-stearns/turn-hud-reset-behavior-on-by-default 
turn hud reset behavior on by default
 2016-06-21 13:33:23 -07:00
Brad Davis
f475dd1d85 Merge pull request #8100 from howard-stearns/minimize-trigger-distance-to-hud 
minimize trigger distance to hud
 2016-06-21 13:33:16 -07:00
Brad Hefta-Gaub
160a5de271 CR feedback 2016-06-21 12:49:42 -07:00
Brad Hefta-Gaub
c322317878 rework plugins to not depend on PluginContainer unless they want to 2016-06-21 12:07:05 -07:00
Ryan Huffman
6d753e317b Fix more osx warning 2016-06-21 10:51:31 -07:00
Ryan Huffman
a77dea9048 Fix osx warning 2016-06-21 10:30:05 -07:00
Ryan Huffman
cee897d6d3 Fix osx warning 2016-06-20 16:44:07 -07:00
Ryan Huffman
ab057010d6 Add changed display mode tracking 2016-06-20 16:09:34 -07:00
Ryan Huffman
1eaa9e40cd Cleanup nearby avatar tracking 2016-06-20 16:09:17 -07:00
SamGondelman
a52fab00a9 commit possible fix for testing 2016-06-20 16:04:39 -07:00
Ryan Huffman
3aac0cc4fb Update fps useractivity with more general stats 2016-06-20 16:02:36 -07:00
Ryan Huffman
7b3b01a96a Add more values to launch UserActivity 2016-06-20 16:02:14 -07:00
Brad Davis
37e9f66639 Additional toolbar work 2016-06-20 15:41:21 -07:00
Howard Stearns
81300ec127 turn hud reset behavior on by default 2016-06-18 14:35:37 -07:00
Howard Stearns
6196c657f8 Minimize triggering distance to HUD. 2016-06-18 14:17:47 -07:00
Bradley Austin Davis
ec615caa80 Support toolbar API 2016-06-17 13:06:42 -07:00
Bradley Austin Davis
5bc8b53d1b Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-17 10:56:53 -07:00
Brad Hefta-Gaub
d8d4eb65ec Merge pull request #8059 from Atlante45/feat/steamworks 
Initial Steamworks integration
 2016-06-16 18:49:51 -07:00
Ryan Huffman
c7955900ab Add new user activity events 2016-06-16 13:17:18 -07:00
Ryan Huffman
8b3b62aad7 Add UserActivityLogger scripting interface 2016-06-16 10:25:38 -07:00
Ryan Huffman
ed88232fb0 Move session id storage to AccountManager 2016-06-16 09:19:42 -07:00
Bradley Austin Davis
067539ff6d Fix overlay stuck to face 2016-06-15 17:44:58 -07:00
Bradley Austin Davis
33e9caa636 Simplify overlay conductor, menu interation 2016-06-15 17:24:39 -07:00
Bradley Austin Davis
6ad1008a56 Allow explicit overlay alpha from scripts 2016-06-15 17:24:32 -07:00
Bradley Austin Davis
bc838ac0b4 Fix vive json 2016-06-15 11:41:28 -07:00
Bradley Austin Davis
0b0977f362 Support keyboard suppresion, control suppresion while in keyboard mode 2016-06-15 10:48:48 -07:00
Bradley Austin Davis
71bf9384ce Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-15 10:45:51 -07:00
David Rowe
657f8fdad5 Fix reporting of JSON export failure 2016-06-15 14:12:49 +12:00
Atlante45
1403fad04e Add cmd line opt to disable settings reset popup 2016-06-14 16:34:46 -07:00
Atlante45
5560ba9a4c Quit application when SteamVR requests it 2016-06-14 16:29:50 -07:00
Brad Hefta-Gaub
1c391e626f Merge pull request #8054 from ctrlaltdavid/20957 
fix model export continued
 2016-06-14 10:57:25 -07:00
Bradley Austin Davis
175dbb8924 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-14 09:48:56 -07:00
Howard Stearns
d05987de6d Merge pull request #8042 from jherico/lasers 
First pass prototype of laser rendering in OpenVR plugin
 2016-06-13 18:06:15 -07:00