Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-22 22:29:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
48308 commits 25 branches 0 tags 1.1 GiB
Commit graph

16181 commits

Author SHA1 Message Date
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
Ryan Huffman
26545b2b99 Add new help.html info window 2016-07-09 04:22:42 -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
Howard Stearns
213479c530 Merge pull request #8043 from hyperlogic/bug-fix/hmd-ui-center-improvements 
HMD UI re-centering while driving improvements.
 2016-06-13 14:28:50 -07:00
Chris Collins
b14f9cd312 Merge pull request #8041 from sethalves/fix-avatar-entity-locking 
Fix avatar entity locking
 2016-06-13 13:10:32 -07:00
Brad Davis
9640727f51 Hand laser rendering support in HMD plugins. 2016-06-13 13:04:11 -07:00
Brad Davis
0ddee876c3 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-13 13:03:46 -07:00
David Rowe
5553c9f87f Code review 2016-06-14 07:46:41 +12:00
Anthony J. Thibault
21e67fc4d8 Another unused variable warning 2016-06-13 12:03:42 -07:00
Anthony J. Thibault
1ca1f98034 Fix unused variable warning 2016-06-13 12:01:42 -07:00
Anthony J. Thibault
ab4bef7d55 Fixes based on PR feedback 
* The "Clear Overlay When Driving" avatar preference is obeyed.
* sensor reset will also center the ui.
 2016-06-13 11:19:47 -07:00
Anthony J. Thibault
ccf85c1f7c Merge branch 'vive-ui' into bug-fix/hmd-ui-center-improvements 2016-06-13 09:48:58 -07:00
David Rowe
098432152d Merge branch 'master' into 20957 2016-06-13 16:16:12 +12:00
David Rowe
58f89c88a2 Remember last directory used for Window.browse() and Window.save() 
Use last directory if not specified in method call. Default to desktop.
 2016-06-11 16:45:17 +12:00
Seth Alves
4c45d081cd merge from upstream 2016-06-10 19:57:46 -07:00
Anthony J. Thibault
f6ed5a1dae Bugfixes based on feedback 
* When the overlay is hidden because your head is too close to the sphere,
  instead of coming back immediately, it waits until the avatar's velocity is near zero
  for a period of time.
* Hooked up jump and fly to MyAvatar::hasDriveInput()
* Added an internal state machine to OverlayConductor to manage hiding/showing transitions.
* The overlay menu state is now tied directly to the overlay, so it will change state as the
  overlay is dynamically hidden/shown from code.
* Removed slot going directly from MenuOption::Overlays directly to OverlayConductor::setEnable().
 2016-06-10 18:33:40 -07:00
Chris Collins
006eb8fe64 Merge pull request #8031 from birarda/api-recheck-on-fail 
re-instate domain API connection info refresh during failure, fix localhost connection after downgrade
 2016-06-10 15:26:42 -07:00
Brad Davis
472a3540d7 Merge remote-tracking branch 'upstream/master' into vive-ui 
Conflicts:
	scripts/system/controllers/handControllerGrab.js
 2016-06-10 10:43:09 -07:00
Stephen Birarda
3c4f336e72 re-instate NodeList reset on limit of check ins reached 2016-06-10 09:11:25 -07:00
Brad Hefta-Gaub
426d67f5bf Merge pull request #8038 from jherico/pure_virtual 
Attempt to get better logging from pure virtual call crashes
 2016-06-10 08:25:10 -07:00
Anthony J. Thibault
685710d0ec OverlayConductor improvments 
* the HUD will fade/in when driving, even in desktop mode.
* the HUD no longer pops when you lean outside of the UI sphere,
  instead it should smoothly fade out and fade back in.
* the overlay toggle button should override fading while driving, as expected.
* removed any notion of SITTING, STANDING or FLAT mode from overlay.
 2016-06-09 18:09:04 -07:00
Stephen Birarda
e4ebafa0d8 add a menu option to force the wrong DS connect version 2016-06-09 15:53:19 -07:00
Stephen Birarda
12e5851ba4 fix connection denial message, put version back 2016-06-09 15:53:19 -07:00
Stephen Birarda
4b5a554122 remove check in version downgrading from NodeList 2016-06-09 15:53:19 -07:00
Seth Alves
441b5a20d8 merge from upstream 2016-06-09 13:23:41 -07:00
Brad Davis
cd7c6be590 Fix formatting 2016-06-09 12:25:21 -07:00
Brad Hefta-Gaub
3c5af56421 Merge pull request #8010 from hyperlogic/feature/hmd-lean-recenter-property 
Added MyAvatar.hmdLeanRecenterEnabled property
 2016-06-09 12:17:51 -07:00
Anthony J. Thibault
6e3057479f fixes for warnings 
Also overlays menu option should work better in conjunction with ui-center/fading
 2016-06-09 11:27:02 -07:00
Brad Davis
eee1ba0906 trying to get buildability 2016-06-09 10:19:38 -07:00
Anthony J. Thibault
1aae22f5a5 Optimized MyAvatar.getCharacterControllerEnabled() 
Instead of doing a blocking queued invokeMethod, it just calls into CharacterController.isEnabled() which is now thread-safe.
 2016-06-09 09:35:19 -07:00
Brad Davis
ff8d4883b1 Attempt to get better logging from pure virtual call crashes 2016-06-08 22:35:39 -07:00
Anthony J. Thibault
5ef6847dc3 HMD re-centering while driving improvements. 
Previously the HUD fading in/out would also recenter the hmd sensor and the avatar, which caused many problems including:
  * The user's view could shift vertically.
  * Your avatar would briefly go into t-pose
  * other users would see your avatar go into t-pose.

Now we now move the UI sphere instead, which results in a much smoother experience.

MyAvatar: added hasDriveInput method.

OverlayConductor:
* removed avatar and sensor reset, instead the overlay's modelTransform is changed.
* revived STANDING mode, which is active if myAvatar->getClearOverlayWhenDriving() is true and you are wearing an HMD.
* SITTING & FLAT mode should be unchanged.
* Instead of using avatar velocity to fade out/fade in the hud, We use the presense or absanse of avatar drive input.
* Additionally, we check distance to the UI sphere, and quickly recenter the hud if the users head is too close to the actual hud sphere.

CompositorHelper:
* Bug fixes for ray picks not using the modelTransform.

HmdDisplayPlugin:
* Bug fixes for rendering not using the modelTransform.
 2016-06-08 18:36:36 -07:00
Seth Alves
f070708b4a _avatarEntityData is accessed by more than one thread. 2016-06-08 15:53:54 -07:00
Seth Alves
1977efae4f Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid 2016-06-08 10:36:52 -07:00
Howard Stearns
bf48099286 Merge pull request #8032 from jherico/pin-button 
Add a constant hud toggle button to the UI
 2016-06-08 10:33:11 -07:00
Brad Davis
ca6e86e767 Merge remote-tracking branch 'upstream/master' into vive-ui 
Conflicts:
	interface/resources/qml/hifi/dialogs/RunningScripts.qml
 2016-06-07 21:51:47 -07:00
Brad Hefta-Gaub
80100b1d34 Merge pull request #8000 from Atlante45/feat/plugins 
Select/Disable plugins via command line args
 2016-06-07 18:17:29 -07:00
Anthony J. Thibault
30d8ae36e8 Added MyAvatar.characterControllerEnabled property 2016-06-07 16:55:32 -07:00
Brad Davis
29d9f51b58 Adding missed file 2016-06-07 16:46:17 -07:00
Seth Alves
b2f63a2132 hook up can-rez-tmp and can-write-to-asset-server 2016-06-07 16:17:58 -07:00
Howard Stearns
38d0d28603 Merge pull request #8021 from AndrewMeadows/walk-follows-camera 
camera steers avatar when walking
 2016-06-07 10:43:01 -07:00
Atlante45
399517fcbd Activate Inputs after menus are setup 2016-06-06 13:28:36 -07:00
Atlante45
26acc6fd8b Typo 2016-06-06 13:28:36 -07:00
Atlante45
24bbb8db3f Remove input plugin menu dependency 2016-06-06 13:28:36 -07:00
Atlante45
6f75fab298 Revert header changes 2016-06-06 13:28:36 -07:00
Atlante45
ee62a211ac Remove "Input Devices" menu 2016-06-06 13:28:36 -07:00
Atlante45
992fa63932 Allow ordered list of preferred plugins 2016-06-06 13:28:36 -07:00
Atlante45
932838b1e3 Setup preferred display plugin 2016-06-06 13:28:36 -07:00
Atlante45
d8493f960a Add command line option to enable/disable plugins 2016-06-06 13:28:36 -07:00
Brad Hefta-Gaub
b4721ec57e Merge pull request #7973 from ctrlaltdavid/clipboard-dimensions 
add Clipboard.getContentsDimensions() JavaScript method
 2016-06-06 12:03:10 -07:00
Brad Davis
b7d1659852 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-06 09:32:33 -07:00
Andrew Meadows
e6844e2468 use world-UP rather than head-UP 2016-06-04 21:11:31 -07:00
Andrew Meadows
49c835b6fc use camera twist for walk steering 2016-06-04 20:53:30 -07:00
Brad Davis
39dcd1f9bd Eliminate file IO contentions for the settings 2016-06-04 17:55:30 -07:00
Anthony J. Thibault
9292a9ce0b Added MyAvatar.hmdLeanRecenterEnabled property 
Used to disable the 'room-scale' avatar re-centering code.
Disabling this can prevent sliding when the avatar is supposed to be sitting or mounted on a stationary object.

Also, removed a bunch of old, unused leaning and torso twisting code.
 2016-06-03 13:56:32 -07:00
Brad Hefta-Gaub
c85923c69b Merge pull request #7956 from jherico/web_entity_crash 
fix crash on click on non-visible web-entity
 2016-06-03 10:29:55 -07:00
Brad Hefta-Gaub
2e4480ee15 Merge pull request #7979 from jherico/steam_vr_exit_fix 
Fix crash on shutdown of SteamVR
 2016-06-03 10:28:53 -07:00
Atlante45
e2fa734024 Set collision threashold to walking speed 2016-06-02 19:15:55 -07:00
Atlante45
4e8b61dea0 Limit collision injectors count to 3 2016-06-02 19:12:37 -07:00
Atlante45
854bf82631 Raise and stretch collision sounds threshold 2016-06-02 17:37:36 -07:00
Brad Davis
8c13ff4ee1 Pinned UI support 2016-06-02 17:24:25 -07:00
Brad Davis
bf734395e5 More invisible web entity fixes 2016-06-02 16:37:45 -07:00
David Rowe
7a8954d851 Merge branch 'master' into clipboard-dimensions 2016-06-02 12:55:23 +12:00
Brad Davis
ac5912df01 Fix crash on shutdown of SteamVR 2016-05-27 13:40:47 -07:00
Howard Stearns
5b6660e7ea Default preference to false. 2016-05-27 10:35:46 -07:00
Howard Stearns
e4d36cc2c2 Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving 2016-05-27 10:32:01 -07:00
Anthony J. Thibault
b4d14f06d8 Bugfix for avatar LOD 
If an avatar was LOD'ed out, it would never become visible again, because the bounds of the skeleton model were never again.
This ensures that the model bound is updated, even when the avatar is LOD'ed away.
 2016-05-26 14:35:17 -07:00
howard-stearns
9ff1a695f0 Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving 2016-05-26 13:52:23 -07:00
howard-stearns
991da9e248 fix cut-paste error in settings. 2016-05-26 09:51:55 -07:00
Brad Hefta-Gaub
78b6a6c661 Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck 
Conflicts:
	libraries/networking/src/udt/PacketHeaders.cpp
 2016-05-25 17:18:27 -07:00
Brad Hefta-Gaub
f2acc82899 Merge pull request #7971 from birarda/session-id-with-place-request 
optionally include the metaverse session ID as HTTP header when sending usage data
 2016-05-25 17:14:27 -07:00
Brad Hefta-Gaub
06cb625d09 Merge pull request #7959 from hyperlogic/tony/improved-avatar-mixer-precision 
Improved Avatar Mixer Rotation Precision
 2016-05-25 17:14:12 -07:00
David Rowe
2f3fa80b96 Add Clipboard.getContentsDimensions() JavaScript method 2016-05-26 09:52:22 +12:00
howard-stearns
dc7d6d470d Don't reset head when we come back. 2016-05-25 12:21:50 -07:00
Stephen Birarda
66bdbf910d optionally include the metaverse session ID as an http header 2016-05-25 11:55:04 -07:00
howard-stearns
2accccef9e Merge branch 'reset-hud-on-driving' of https://github.com/howard-stearns/hifi into reset-hud-on-driving 2016-05-25 11:32:01 -07:00
howard-stearns
8198a1b4d1 Add preference to control behavior. 2016-05-25 11:30:45 -07:00
howard-stearns
5d806cba7f Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving 2016-05-25 10:47:31 -07:00
Brad Hefta-Gaub
fb9f6185db CR feedback 2016-05-24 17:19:53 -07:00
Brad Hefta-Gaub
183f38e4f0 pop up warning if domain over capacity 2016-05-24 16:07:57 -07:00
Brad Hefta-Gaub
2eef07e414 cleanup and dead code removal 2016-05-24 15:38:08 -07:00
Brad Hefta-Gaub
12a1857280 check point with protocol refusal working 2016-05-24 15:20:11 -07:00
Brad Hefta-Gaub
1cf8236860 Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck 2016-05-24 13:31:36 -07:00
Brad Hefta-Gaub
1d9981e624 first cut at support for verifying all protocol version compatibility 2016-05-24 13:31:19 -07:00
Brad Hefta-Gaub
f16a3ce6bb Merge pull request #7962 from zzmp/fix/throttle 
fix throttling when Interface is not in focus
 2016-05-24 08:25:38 -07:00
Zach Pomerantz
7dabce9cff Check throttle before idling/painting 2016-05-23 19:04:35 -07:00
Anthony J. Thibault
edfce0d5ba MyAvatar: reset fix, for both oculus and vive 2016-05-23 16:34:19 -07:00
Anthony J. Thibault
a1c32f8c44 Merge branch 'master' into tony/improved-avatar-mixer-precision 2016-05-23 10:24:52 -07:00
Seth Alves
40e862cf9e quiet gcc 5 warnings 2016-05-21 16:53:01 -07:00
Brad Hefta-Gaub
ac49feda22 Merge branch 'master' of https://github.com/highfidelity/hifi into removeDisableEntityNACKS 
Conflicts:
	libraries/entities/src/EntityEditPacketSender.h
 2016-05-21 09:23:45 -07:00
Seth Alves
f91a2403be merge from upstream 2016-05-20 17:07:34 -07:00
Brad Hefta-Gaub
18613908df Merge pull request #7800 from sethalves/no-fly-zones 
No fly zones
 2016-05-20 16:59:55 -07:00
howard-stearns
fa78eea434 Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving 2016-05-20 16:50:54 -07:00
howard-stearns
9a428947e4 Simplify code. 2016-05-20 16:50:17 -07:00
howard-stearns
6568c0563d Delay on entry/exit. 2016-05-20 16:43:55 -07:00
Seth Alves
d95d3ff3ac clean up debugging prints 2016-05-20 14:56:47 -07:00
Brad Davis
07562f72af Doing a pass over the input plugins and controller code 2016-05-20 14:50:23 -07:00
Seth Alves
ff36b39067 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-20 14:38:53 -07:00
howard-stearns
dcc8764fa7 Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving 2016-05-20 13:41:41 -07:00
Brad Hefta-Gaub
770fab956f remove dead code 2016-05-20 12:23:06 -07:00
howard-stearns
1801e270af Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving 2016-05-20 09:26:25 -07:00
Zach Pomerantz
2026226fe2 Handle vsync without halving fps 2016-05-20 09:04:39 -07:00
Howard Stearns
3088a84035 Just bringing the code up to date and forcing a build to see how Jenkins/osx is doing. 
Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving
 2016-05-20 08:04:38 -07:00
Seth Alves
1de9598243 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-19 16:37:40 -07:00
Anthony J. Thibault
7f131e2c4f Reset avatar as well as displayPlugin when "driving" 2016-05-19 15:00:08 -07:00
Zach Pomerantz
9a4b30a50b Fix AvatarInputs phantom movement 2016-05-19 13:19:15 -07:00
Brad Hefta-Gaub
cef4a49c35 Merge pull request #7867 from huffman/fix/query-octree-crash 
Fix crash in JurisdictionMap
 2016-05-19 11:53:54 -07:00
Seth Alves
74520f5c92 Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones 2016-05-19 09:49:44 -07:00
Seth Alves
419c744bd4 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-19 09:49:18 -07:00
Anthony J. Thibault
0294066668 Removed pupilData and translationRadix from AvatarData packet. 2016-05-18 16:41:50 -07:00
Ryan Huffman
01944f5100 Remove unused DependencyManager include 2016-05-18 15:38:54 -07:00
Ryan Huffman
ce6ae40432 Replace foreach use with for() 2016-05-18 15:38:54 -07:00
Ryan Huffman
dd093e3fcd Make AccountManager a DependencyManager singleton 2016-05-18 15:38:54 -07:00
Ryan Huffman
cf49c8e2bf Add getUserAgent function that includes plugin information 2016-05-18 15:35:29 -07:00
Brad Hefta-Gaub
335d9abddd Merge pull request #7874 from AndrewMeadows/vertical-thrust 
allow MyAvatar.addThrust() to raise avatar from standing on ground
 2016-05-18 11:41:37 -07:00
Anthony J. Thibault
b48134e30c WIP commit testing for joint mapping transmission 2016-05-18 11:40:45 -07:00
Brad Hefta-Gaub
4df4829280 Merge pull request #7902 from jherico/gpu_breakup 
moving GL backend out of GPU
 2016-05-18 11:35:35 -07:00
Brad Hefta-Gaub
9a3b6bf081 Merge pull request #7858 from Atlante45/remove-deprecated-entity-props 
removed dead code for overlays/entities glow level
 2016-05-18 09:14:26 -07:00
Seth Alves
cf829f1bab magic number 2016-05-17 19:14:44 -07:00
Seth Alves
3380b2a668 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-17 19:10:33 -07:00
Ryan Huffman
47d897f669 Fix processOctreeStats recreating JurisdictionMap for every stat packet 2016-05-17 15:12:14 -07:00
Andrew Meadows
aa171578b7 remove cruft 2016-05-17 14:58:14 -07:00
Andrew Meadows
c64612c42b namechange keyboardMotor --> actionMotor 2016-05-17 14:46:50 -07:00
Andrew Meadows
e4cb6e2b87 order-independent CharacterController motors 2016-05-17 14:02:49 -07:00
Ryan Huffman
e7087c7393 Fix address bar becoming unusable after going backwards or forwards 
The address bar dialog was being disabled when a lookup request was finished,
but was not hidden - this was bug #1. Presumably, though, the intent was to have the
window _not_ disappear when going backwards or forwards, but hiding the
window when a lookup request finishes would cause the window
to be hidden when going backwards or forwards - this was bug #2.

I decided to disable the hide-on-request-finished functionality because
the window is already manually hidden after entering a new address.
 2016-05-17 11:17:34 -07:00
Ryan Huffman
ef6d758e7f Fix JurisdictionMap multithreading issues 
Make octal code pointers use shared_ptr, add locks around access.
 2016-05-17 10:59:51 -07:00
Brad Davis
34e574c148 Merge pull request #7816 from zzmp/perf/idle-event 
Drive render loop from DisplayPlugin instead of busy wait
 2016-05-17 09:36:09 -07:00
Brad Davis
5ba8372c21 Moving GL backend out of GPU 2016-05-16 12:54:17 -07:00
Seth Alves
a0c3224705 Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones 2016-05-16 10:56:09 -07:00
Brad Hefta-Gaub
06d1bd5728 Merge pull request #7799 from birarda/remove-avatar-billboard 
remove the last of the avatar billboard code
 2016-05-16 10:23:42 -07:00
Brad Hefta-Gaub
166fbdece5 Merge pull request #7853 from zzmp/fix/shutdown 
Fix hang on exit from dying scripts
 2016-05-16 10:17:34 -07:00
Seth Alves
3876a8037c Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-16 09:51:20 -07:00
Atlante45
38f74c1843 Remove the last of the glow level 2016-05-14 14:49:31 -07:00
Brad Hefta-Gaub
a5f99ba370 Merge pull request #7899 from sethalves/dont-send-file-urls-to-avatar-mixer 
fix invisible default avatars
 2016-05-14 07:48:16 -07:00
Brad Hefta-Gaub
0d5fdbdb6e Merge pull request #7879 from howard-stearns/fix-reticle-offset 
fix reticle position offset
 2016-05-13 17:17:23 -07:00
Seth Alves
6277bf8603 if avatar is set to the default avatar file that came with the distribution, don't save that url to settings. never send a file url to the avatar-mixer. 2016-05-13 16:37:43 -07:00
Zach Pomerantz
65e81077cb Merge branch 'master' of github.com:highfidelity/hifi into perf/idle-event 2016-05-13 16:24:42 -07:00
howard-stearns
654ed33dd4 Fix warnings. 2016-05-13 15:32:59 -07:00
Zach Pomerantz
59e4b9c356 Merge branch 'master' of github.com:highfidelity/hifi into fix/shutdown 2016-05-13 15:28:12 -07:00
howard-stearns
1f664671f9 Remove overlay when velocity first indicates travel, and restore it (with 
reset) when returning to reset.
 2016-05-13 14:32:54 -07:00
Brad Hefta-Gaub
65aae42714 move firstRun.set() to correct place 2016-05-13 13:28:02 -07:00
Seth Alves
eb19c5be13 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-13 07:04:58 -07:00
Stephen Birarda
2cf943b2b1 remove billboard code from AvatarData 2016-05-12 16:41:44 -07:00
howard-stearns
40f7212b1e Make uses of getReticlePosition consistent with respect to window offset. 2016-05-12 16:37:03 -07:00
Brad Davis
85272a87ba Merge pull request #7859 from samcake/lemon 
Introduce the "Unlit" shading model support and apply it to Web Enitities
 2016-05-12 15:09:50 -07:00
Seth Alves
c9c619916c Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones 2016-05-11 19:37:57 -07:00
Seth Alves
c784ca9771 debugging 2016-05-11 18:45:56 -07:00
Seth Alves
fcd2e45d67 merge from upstream 2016-05-11 18:45:32 -07:00
Zach Pomerantz
25deaf5bda Repost missed Presents with low priority 2016-05-11 18:27:48 -07:00
Anthony Thibault
8fecb51dde Merge pull request #7846 from hyperlogic/tony/improved-avatar-debug-draw 
Eye tracking bug fix and debug rendering improvements
 2016-05-11 17:41:49 -07:00
Brad Hefta-Gaub
d656f61c64 Merge pull request #7759 from jherico/app_plugin_type 
Don't expose raw pointer to the display plugin
 2016-05-11 14:49:22 -07:00
Seth Alves
ac506dc4b7 where needed, copy clientOnly into properties before calling queueEditEntityMessage 2016-05-11 12:46:16 -07:00
Brad Hefta-Gaub
e01681eb52 Merge pull request #7856 from ZappoMan/NUEtweaks 
don't show help or login on first run
 2016-05-11 10:53:09 -07:00
samcake
99dcfef5a8 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-05-11 10:47:38 -07:00
Seth Alves
9038647b65 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-11 09:07:44 -07:00
samcake
e40a795a27 Trying to clean up for pr 2016-05-10 19:25:22 -07:00
Seth Alves
872f1b0c64 clear avatarEntity data for entities that are deleted 2016-05-10 17:48:55 -07:00
Seth Alves
de12680ff1 don't put actions on other people's avatarEntities 2016-05-10 16:43:27 -07:00
Zach Pomerantz
2d4fd783bd Rename Paint/Idle events to Present 2016-05-10 16:09:04 -07:00
Seth Alves
b05ab1b17e set simulationOwner to be the same as the owningAvatar 2016-05-10 15:59:25 -07:00
Brad Hefta-Gaub
af6be7f5f3 Merge pull request #7845 from jherico/script_debug 
Enable script debugging
 2016-05-10 15:56:38 -07:00
Brad Hefta-Gaub
a17acc6f6b rename functions 2016-05-10 15:52:07 -07:00
Seth Alves
4b13fd969e split code that sends edits via avatar-mixer out of queueEditEntityMessage 2016-05-10 15:37:54 -07:00
Anthony J. Thibault
80a349c65b Merge branch 'master' into tony/improved-avatar-debug-draw 2016-05-10 14:50:13 -07:00
Seth Alves
1e849956c9 get rid of _avatarEntityChangedTime 2016-05-10 14:48:19 -07:00
Zach Pomerantz
4711c23d9d Delay AvatarInputs instantiation to first paint 2016-05-10 14:39:23 -07:00
Zach Pomerantz
783be53125 Trigger Idle from present Paint 2016-05-10 14:39:23 -07:00
Zach Pomerantz
c3f41cdd89 Add PAINT_DELAY_DEBUG log 2016-05-10 14:39:23 -07:00
Seth Alves
f90b9ec65d Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-10 12:08:45 -07:00
Brad Hefta-Gaub
350743454b Merge pull request #7839 from sethalves/entity-simulation-smart-pointers-1 
use smart pointers for entity simulations
 2016-05-10 11:35:57 -07:00
Brad Hefta-Gaub
33c5cb519a cleanup firstRun with a common setting 2016-05-10 11:32:29 -07:00
Clément Brisset
c3ce463b6c Merge pull request #7854 from zzmp/refactor/delayLoad 
Clean up resource cache's encapsulation of asynchronous loading
 2016-05-10 10:47:23 -07:00
Brad Hefta-Gaub
22f4beab1a on first run, go to home or entry 2016-05-10 10:45:57 -07:00
Seth Alves
c572e1dc3a delete avatar-associated entities when the avatar goes away 2016-05-10 10:30:49 -07:00
Seth Alves
4c1f815870 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-10 10:09:40 -07:00
Brad Hefta-Gaub
d7eee98acc Merge pull request #7827 from AndrewMeadows/threadsafe-viewfrustum 
resurrection of threadsafe ViewFrustum
 2016-05-10 09:06:38 -07:00
Brad Hefta-Gaub
e478b72e67 Merge branch 'master' of https://github.com/highfidelity/hifi into NUEtweaks 2016-05-10 08:36:32 -07:00
Seth Alves
b761ecf44f merge from upstream 2016-05-10 08:18:45 -07:00
Brad Hefta-Gaub
466b535e4e Merge pull request #7852 from ZappoMan/fixUpdateDialogFormatting 
fix the update dialog to not show blank lines for missing version numbers
 2016-05-10 08:18:38 -07:00
Brad Hefta-Gaub
20b7e5f0a9 Merge pull request #7851 from Atlante45/remove-deadlock-status 
Remove Deadlock status
 2016-05-10 07:53:50 -07:00
Brad Hefta-Gaub
8b51746788 don't show help or login on first run 2016-05-09 18:49:29 -07:00
Zach Pomerantz
9ac783a88d Black box asynch resource retrieval 2016-05-09 18:03:19 -07:00
Zach Pomerantz
2d820221dc Clear queued processing on quit 2016-05-09 17:32:25 -07:00
Zach Pomerantz
694dc1bbf6 Delay Overlays cleanup for scripting 2016-05-09 17:32:25 -07:00
Brad Davis
40316498a4 Enable script debugging 2016-05-09 17:02:40 -07:00
Brad Hefta-Gaub
7bb21d3700 fix the update dialog to not show blank lines for missing version numbers 2016-05-09 16:19:03 -07:00
Atlante45
5c196f3df5 Remove Deadlock status 2016-05-09 15:53:45 -07:00
Andrew Meadows
59c6a6dfea Merge pull request #7825 from sethalves/linux-qol 
Linux qol
 2016-05-09 15:34:10 -07:00
Andrew Meadows
ffc3123467 Merge pull request #7658 from sethalves/grab-fixes 
Grab fixes
 2016-05-09 15:30:37 -07:00
Brad Hefta-Gaub
2c0204b0d6 Merge pull request #7821 from Atlante45/fix/collision-sound 
Fix avatar/entity collision sound
 2016-05-09 14:24:19 -07:00
Anthony Thibault
87d513b5f8 fixed unused variable warnings 2016-05-08 18:14:18 -07:00
Anthony J. Thibault
641e152699 Eye tracking bug fix and debug rendering improvement 
* Bug fix for eye tracking in HMD, the "up" orientation of your eyes now match your head.
* DebugDraw: added drawRay method.
* Application: Renamed preRender to postUpdate
* AvatarManager: added postUpdate method that iterates over all avatars.
* MyAvatar: Renamed preRender to preDisplaySide
* MyAvatar: split preRender code into postUpdate and preDisplaySide.
* Removed "Show who is looking at me", "Render focus indicator" and "Render lookat target" debug draw.
* Split "Show Look At Vectors" into "Show My Look At Vectors" and "Show Other Look At Vectors", to make it easier to debug eye tracking.
* "Show Look at Vectors" now draws the right eye red and the left eye blue.
* Removed Avatar and MyAvatar renderBody
* Removed look at rendering from head.
* GLMHelpers: Bugfix for generateBasisVectors when up primary and secondary axis were orthogonal
 2016-05-08 16:20:32 -07:00
Brad Davis
c54d0bc993 Don't expose raw pointer to the display plugin 2016-05-08 10:35:31 -07:00
Seth Alves
0e6d9a1eec avatar mixer can relay "client-only" entities between interfaces -- the entity server wont know about them. 2016-05-07 14:48:31 -07:00
Seth Alves
f8f86a0d45 only _exit if not DEBUG 2016-05-07 11:05:38 -07:00
Seth Alves
4b1274cb0f Merge branch 'master' of github.com:highfidelity/hifi into linux-qol 2016-05-07 11:04:50 -07:00
Seth Alves
a0771f8ee5 use smart pointers for entity simulations 2016-05-07 09:14:33 -07:00
Clément Brisset
b234d94d25 Merge pull request #7832 from birarda/session-location 
repairs to user heartbeats
 2016-05-06 15:15:52 -07:00
Chris Collins
8eb61e9470 Merge pull request #7820 from imgntn/usersJS 
Add users.js to default, start visible to friends only
 2016-05-06 16:07:23 -06:00
Stephen Birarda
fb09efc0c9 send location updates immediately on mode change and startup 2016-05-06 12:01:03 -07:00
Stephen Birarda
258c5308db don't require an active domain connection for location update 2016-05-06 11:57:25 -07:00
Stephen Birarda
ed1ddc2a8b remove code to update/store wallet balance 2016-05-06 11:54:49 -07:00
Stephen Birarda
7dd8515bd8 send a simple heartbeat if location has not changed 2016-05-06 11:50:40 -07:00
Seth Alves
71738d4841 Merge branch 'master' of github.com:highfidelity/hifi into grab-fixes 2016-05-06 09:59:17 -07:00
Andrew Meadows
778820edb4 fix broken dupe method implementation 2016-05-06 09:07:03 -07:00
Andrew Meadows
635e2e78e3 minor cleanup 2016-05-05 18:43:08 -07:00
Andrew Meadows
7d6424bdcc Head::render() was cruft 2016-05-05 18:28:27 -07:00
Andrew Meadows
71b2d647e8 add locks and explicitly copy ViewFrustums 2016-05-05 18:28:27 -07:00
Andrew Meadows
bcf2cc8074 use references not pointers for ViewFrustums 
also unravelling some spaghetti:
(1) split Octree stuff out of ViewFrustum
(2) moved ViewFrustum from octree to shared lib
(3) removed some cruft
 2016-05-05 18:28:27 -07:00
Andrew Meadows
60a72c6660 getViewFrustum() provides const pointer 2016-05-05 18:28:27 -07:00
Stephen Birarda
a5d09e268d fix sessionID pull and re-sent for HB 2016-05-05 15:56:16 -07:00
Seth Alves
b5a3baf322 Merge branch 'master' of github.com:highfidelity/hifi into linux-qol 2016-05-05 15:55:37 -07:00
Stephen Birarda
839c7fb8c2 provide session ID for metaverse heartbeat once received 2016-05-05 15:45:11 -07:00
Stephen Birarda
0ea46cb415 send fallback socket, don't send HB if send usage disabled 2016-05-05 15:35:37 -07:00
Atlante45
bc6544a3c5 Fix MyAvatar's velocity change 2016-05-05 14:55:28 -07:00
Atlante45
07adef9465 Fix entities collision sounds 2016-05-05 14:55:28 -07:00
Atlante45
96ee33e80e Fix avatars collision sounds 2016-05-05 14:55:28 -07:00
James B. Pollack
67b1015f4a re add users to default, default to visible friends only 2016-05-05 14:54:04 -07:00
Zach Pomerantz
3619821b82 Improve timing tests with averages 2016-05-04 13:23:10 -07:00
Zach Pomerantz
0f6162d683 Use appropriate units for timing tests 2016-05-04 13:23:10 -07:00
Seth Alves
44beca1687 try having all spring derived actions agree on a target 2016-05-04 11:29:17 -07:00
Brad Hefta-Gaub
49d02b802a Merge pull request #7719 from zzmp/feat/resource-prefetch 
Add prefetching to exposed caches
 2016-05-02 18:04:26 -07:00
Clément Brisset
2ef87557fc Merge pull request #7798 from zzmp/clean/override 
Fix warnings on vanilla XCode compilations
 2016-05-02 10:56:07 -07:00
Seth Alves
5fd871d640 Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones 2016-05-02 10:28:53 -07:00
Brad Hefta-Gaub
cddcac60c1 Merge pull request #7768 from ctrlaltdavid/20891 
Add Interface "Home" bookmark function
 2016-05-02 10:14:57 -07:00
Seth Alves
4feb2944ed hook up zone's ghostingAllowed flag 2016-05-01 15:27:49 -07:00
Seth Alves
ef85cc7803 hook up zone flyingAllowed flag to character controller 2016-05-01 14:47:12 -07:00
Zach Pomerantz
13945aa4d9 Annotate all virtual fns with override 2016-04-30 13:48:59 -07:00
Andrew Meadows
5f98af1898 avoid crossed eyes 2016-04-27 16:58:13 -07:00
Andrew Meadows
8a691cf449 Merge pull request #7765 from hyperlogic/tony/cone-sphere-angle 
Improve eye tracking when face to face
 2016-04-27 16:54:07 -07:00
Zach Pomerantz
bc8a171fde Merge branch 'master' of github.com:highfidelity/hifi into feat/resource-prefetch 2016-04-27 11:55:24 -07:00
Brad Hefta-Gaub
db6a07171f Merge pull request #7764 from zzmp/fix/text3d-pipeline 
Fix strange rendering with Text3DOverlay
 2016-04-26 17:15:09 -07:00
David Rowe
5e00a1ef49 Implement "go home" action 2016-04-27 11:24:19 +12:00
David Rowe
f74be226c8 Add "home" button to address bar 2016-04-27 10:28:05 +12:00
Anthony J. Thibault
71f67c99cc MyAvatar: use coneSphereAngle for eyeTracking look at targets 2016-04-26 13:43:03 -07:00
Zach Pomerantz
63b0c0a9ad Reset pipeline after rendering text3d 2016-04-26 13:23:16 -07:00
David Rowe
7406e5fd9c Add Navigate > Set Home Location menu item 2016-04-27 07:57:43 +12:00
Brad Hefta-Gaub
ee277dcf9d Merge branch 'master' of https://github.com/highfidelity/hifi into qmlWindowFixes 2016-04-26 11:44:51 -07:00
Brad Hefta-Gaub
cf49ba26ad Merge pull request #7760 from hyperlogic/tony/away-reset-avatar 
Reset avatar on exit of away-mode.
 2016-04-26 09:51:47 -07:00
Brad Hefta-Gaub
4ab7b660d4 fix a bunch of bugs in qml window placement 2016-04-25 20:19:54 -07:00
Anthony J. Thibault
b7f157f4ff Reset avatar on exit of away-mode. 
Exposed MyAvatar.reset(bool) to script.
away.js now calls this on exit of away-mode.
 2016-04-25 14:10:20 -07:00
Clément Brisset
d74b5bdb17 Merge pull request #7756 from sethalves/add-missing-delete 
fix memory leak in AssetMappingModel
 2016-04-25 12:56:26 -07:00
Anthony Thibault
6dfd174285 Merge pull request #7750 from hyperlogic/tony/thousand-yard-stare 
Avatar eye gaze fix for HMDs
 2016-04-25 10:29:41 -07:00
Seth Alves
49566c8f26 fix memory leak in AssetMappingModel 2016-04-25 10:07:08 -07:00
Anthony J. Thibault
0c200e8c00 MyAvatar: coding convention fix for updateEyeContactTarget() 2016-04-25 09:27:43 -07:00
Anthony Thibault
0da3fb8eee Eye contact improvements 
* After eyes change targets there is now a minimum 1/3rd second delay before they will again.
* Changing gaze from eye to mouth is less likely then switching between eyes.
 2016-04-24 18:50:14 -07:00
Anthony Thibault
d8a32c8329 Avatar eye gaze fix for HMDs 
When no avatars are chosen for more detailed eye gaze tracking the eyes should look straight ahead.
Before this fix, if you were in room scale or not aligned with the camera sensor your gaze could drift to the left or to the right of your head's forward direction.
Now it should follow your head more closely.
 2016-04-24 17:59:51 -07:00
Seth Alves
2425baf6e6 don't early _exit on Linux 2016-04-24 08:14:56 -07:00
Brad Hefta-Gaub
88ab52d340 Merge pull request #7747 from hyperlogic/tony/avatar-look-at-fixes 
Fixes for avatar eye tracking.
 2016-04-23 17:04:15 -07:00
Brad Hefta-Gaub
04dab65b59 Merge pull request #7727 from ZappoMan/supportLargeClockSkew 
support for larger than 35 minute clock skew
 2016-04-23 08:42:38 -07:00
Anthony J. Thibault
c850880515 Head: compute _eyePosition properly. 2016-04-22 19:16:28 -07:00
Chris Collins
9bd9de5710 Merge pull request #7636 from samcake/red 
Stereo drawcall amplification
 2016-04-22 15:46:18 -07:00
Brad Hefta-Gaub
79a1e6264e Merge pull request #7714 from hyperlogic/tony/default-anims-are-local 
Avatar animations are now stored locally
 2016-04-22 13:44:30 -07:00
Brad Hefta-Gaub
c410242fb2 Merge pull request #7688 from jherico/texture_derez 
Reducing GPU texture memory footprint
 2016-04-22 13:20:54 -07:00
Andrew Meadows
c35ddccba1 Merge pull request #7718 from zzmp/fix/release-motion-states 
Remove myAvatar motion states on shutdown
 2016-04-21 17:11:25 -07:00
Brad Hefta-Gaub
72c81e2378 Merge branch 'master' of https://github.com/highfidelity/hifi into supportLargeClockSkew 2016-04-21 16:26:44 -07:00
Brad Hefta-Gaub
d87d631871 Merge pull request #7708 from zzmp/feat/render-rates 
Add renderRates.js to visualize rates over time
 2016-04-21 15:59:58 -07:00
Brad Hefta-Gaub
d9ae788818 more CR feedback 2016-04-21 15:55:50 -07:00
Brad Davis
6c30194916 Support lowering the minimum mip of a texture at runtime 2016-04-21 14:46:12 -07:00
Brad Hefta-Gaub
ddf5b0f316 some debugging 2016-04-21 10:32:22 -07:00
Zach Pomerantz
e3131d2098 Rm prefetchAnimation from avatar/rig 2016-04-20 20:14:15 -07:00
Brad Hefta-Gaub
31f9d592e0 support for larger than 35 minute clock skew 2016-04-20 18:42:00 -07:00
Zach Pomerantz
2c7cf3ea83 Fix RateScriptingInterface headers 2016-04-20 14:32:25 -07:00
Zach Pomerantz
ad225b3aed Fix RatesScriptingInterface ctor 2016-04-20 13:58:06 -07:00
Zach Pomerantz
1fe12e7029 Mv Rates to RatesScriptingInterface.h 2016-04-20 13:26:23 -07:00
Anthony J. Thibault
8e5785cdf8 Avatar animations are now stored locally 
Improves FTUE, by no longer going over the network to download default avatar animations.
This also includes support for relative animation urls within the animation.json
 2016-04-19 16:11:14 -07:00
Zach Pomerantz
4dacb04ee1 Rm myAvatar motion states on shutdown 2016-04-19 16:01:55 -07:00
Howard Stearns
cbb76013c4 Merge pull request #7710 from ZappoMan/LODtweaks 
tweaks to LOD behavior
 2016-04-19 13:50:21 -07:00
samcake
3dad4f576e Merging with master 2016-04-19 11:59:44 -07:00
Brad Hefta-Gaub
c7ecbb6b4b tweaks to LOD behavior 2016-04-19 11:19:28 -07:00
Howard Stearns
9ff9682b2a Merge pull request #7692 from ZappoMan/resetScriptEngineOnDomainChange 
Reset entities script engine on domain change
 2016-04-19 11:14:28 -07:00
samcake
a997f9bb1b Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-04-19 10:49:53 -07:00
Zach Pomerantz
fc61f85bf9 Merge pull request #7698 from hyperlogic/tony/avatar-on-load-complete-callback 
Added MyAvatar onLoadComplete Callback
 2016-04-19 10:36:20 -07:00
samcake
265f6f1275 Updating & Merging with master 2016-04-19 10:05:44 -07:00
Brad Hefta-Gaub
8eff47f922 Merge pull request #7705 from hyperlogic/tony/avatar-attachment-lag-fix 
Fix for laggy avatar attachments
 2016-04-19 07:15:38 -07:00
Brad Hefta-Gaub
0ac9601ea7 Merge pull request #7690 from ZappoMan/improveHMD 
Introduce "recommended overlay rectangle" to display plugins
 2016-04-18 18:04:21 -07:00
Brad Hefta-Gaub
0a79b5dd69 Merge pull request #7707 from huffman/fix/osx-default-script-dir 
Remove fix for old QT file path bug in OSX
 2016-04-18 18:01:47 -07:00
Brad Hefta-Gaub
0e9bd9a776 Merge pull request #7682 from zzmp/clean/stars 
Cleanup stars to persist a single BufferView
 2016-04-18 17:59:48 -07:00
Zach Pomerantz
f48541961d Expose Rates to JS/QML 2016-04-18 17:43:34 -07:00
Ryan Huffman
4e0ac2a4be Remove fix for old QT file path bug in OSX 2016-04-18 16:07:53 -07:00
Brad Hefta-Gaub
01907f181f Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD 2016-04-18 16:01:42 -07:00
Seth Alves
3298883774 Merge pull request #7702 from zzmp/fix/clear-octree-on-exit 
Clear entities and avatars on exit
 2016-04-18 15:48:35 -07:00
Anthony J. Thibault
279e77f523 updated comment 2016-04-18 15:18:08 -07:00
samcake
dccf549118 Merge pull request #7676 from jherico/perf_testing 
Manually generate mipmaps for textures while loading
 2016-04-18 15:09:12 -07:00
Zach Pomerantz
146ea066db Update AvatarManager.cpp 2016-04-18 14:53:04 -07:00
Anthony J. Thibault
544928b46e MyAvatar: fix for laggy avatar attachments 2016-04-18 14:51:33 -07:00
Zach Pomerantz
c9dc642d76 Fix type in AvatarManager::clearAllAvatars 2016-04-18 14:48:24 -07:00
Zach Pomerantz
c87eec4182 Fix typo in AvatarManager::clearAllAvatars 2016-04-18 14:45:33 -07:00
Zach Pomerantz
790e325248 Clear entities and avatars on exit 2016-04-18 14:31:16 -07:00
Anthony J. Thibault
dc92ccc2b2 MyAvatar: Removed unnecessary slot. 2016-04-18 13:19:49 -07:00
Brad Hefta-Gaub
374ba10524 more CR feedback 2016-04-18 12:23:36 -07:00
Brad Hefta-Gaub
0d20f2468e CR feedback 2016-04-18 12:13:21 -07:00
Anthony J. Thibault
1682598be7 Added onLoadComplete signal to MyAvatar 
This can be used in javaScript to detect when the model has finished loading because the url has changed or the model has been reset.
 2016-04-18 11:37:02 -07:00
Brad Hefta-Gaub
0520363da8 cleanup 2016-04-18 10:37:15 -07:00
Brad Hefta-Gaub
d1f6b371c9 cleanup 2016-04-18 10:27:12 -07:00
Brad Davis
b50f835d35 Warning and error fixes 2016-04-17 10:22:26 -07:00
Brad Davis
f3e5306f90 Working on an automated performance test 2016-04-17 10:20:00 -07:00
Brad Hefta-Gaub
8f3d48190a switch to QRect instead of vec4 2016-04-16 16:59:47 -07:00
Brad Hefta-Gaub
6b5fd1e807 code review feedback 2016-04-16 16:11:36 -07:00
Brad Hefta-Gaub
54777c9cd5 Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD 2016-04-16 15:19:35 -07:00
Brad Hefta-Gaub
87078b1ea2 first cut at resetting entities script engine on domain change 2016-04-16 11:09:23 -07:00
David Rowe
8f6cfb72ea Fix QML warnings at shutdown 2016-04-16 15:23:41 +12:00
Brad Hefta-Gaub
04df84974c handle repositioning of qml windows 2016-04-15 19:50:12 -07:00
Zach Pomerantz
d96c97cdb4 Cleanup stars to persist BufferView 2016-04-15 16:40:02 -07:00
samcake
298300e42f Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-04-15 14:16:02 -07:00
Brad Hefta-Gaub
c7f58dc17c first cut at exposing recommend overlay rectangle 2016-04-14 20:47:31 -07:00
Zach Pomerantz
f803ecd2e7 Merge pull request #7633 from Atlante45/fix/shared-resource 
Fix raw pointers in shared resource cache items
 2016-04-14 17:52:04 -07:00
Atlante45
4ed8573f74 CR 2016-04-14 17:28:24 -07:00
Brad Hefta-Gaub
ea4da05cba Merge pull request #7643 from AndrewMeadows/faster-bullet 
faster Bullet kinematics
 2016-04-14 12:16:54 -07:00
Brad Hefta-Gaub
c9b0531f55 Merge pull request #7662 from zzmp/fix/model-anim-cache 
Use AnimationCache for models
 2016-04-14 12:16:32 -07:00
Andrew Meadows
dcf28937cf cleanup cached Physics::sessionUUID 2016-04-14 11:18:10 -07:00
Zach Pomerantz
e80898f095 Merge branch 'master' of github.com:highfidelity/hifi into fix/model-anim-cache 2016-04-14 10:12:16 -07:00
Ryan Huffman
e76ed6f73a Merge branch 'master' of https://github.com/highfidelity/hifi into feat/crash-handling 2016-04-14 09:47:03 -07:00
Brad Hefta-Gaub
7b5075cce5 Merge pull request #7645 from sethalves/dont-run-bullet-too-soon 
add a heuristic for deciding when it's safe to enable bullet
 2016-04-14 09:35:58 -07:00
Brad Hefta-Gaub
285ebe8ec5 Merge pull request #7655 from sethalves/dont-spam-about-expired-actions 
don't flood log with messages about expired actions
 2016-04-14 09:32:56 -07:00
Brad Hefta-Gaub
623bfa3c35 Merge pull request #7653 from hyperlogic/tony/avatar-meta-item-bound-fix 
Fix for occasional invisible avatars
 2016-04-14 09:32:46 -07:00
Brad Hefta-Gaub
37dcfdad8a Merge pull request #7652 from huffman/feat/crash-menu 
Move crash menu items to submenu and add new crash types
 2016-04-14 09:32:36 -07:00
Seth Alves
ba0549dddd Merge branch 'master' of github.com:highfidelity/hifi into dont-run-bullet-too-soon 2016-04-14 09:18:58 -07:00
samcake
6c3e011b89 Expose cleanely the 3 different techniques 2016-04-14 02:43:28 -07:00
samcake
41d4d3b2d7 Providing a cleaner way to try different paths and exploring a simpler way 2016-04-13 19:21:17 -07:00
Chris Collins
47522e1774 Merge pull request #7659 from ZappoMan/newLODSettings 
improve reset settings
 2016-04-13 16:49:22 -07:00
Zach Pomerantz
7a15339631 Use AnimationCache for models 2016-04-13 15:44:47 -07:00
Ryan Huffman
47c2a1722b Merge branch 'master' of https://github.com/highfidelity/hifi into feat/crash-menu 2016-04-13 14:40:46 -07:00
Ryan Huffman
bc247ec058 Remove unused Application::crashApplication() 2016-04-13 14:01:41 -07:00
Howard Stearns
f24c2c7714 Merge pull request #7657 from ZappoMan/avatarLicenseSupport 
add support for avatar licenses in FST files
 2016-04-13 14:01:37 -07:00
Brad Hefta-Gaub
0af47fd3d5 Merge pull request #7617 from jherico/vr_menu 
VR menu fixes
 2016-04-13 13:53:36 -07:00
Brad Hefta-Gaub
9c437c0824 CR feedback 2016-04-13 13:36:28 -07:00
Brad Hefta-Gaub
67af3917bc improve reset settings 2016-04-13 13:18:23 -07:00
Brad Hefta-Gaub
4b3b917af6 add support for avatar licenses in FST files 2016-04-13 12:26:09 -07:00
Ryan Huffman
2d39551a35 Fix style in CrashReporter.cpp 2016-04-13 10:56:27 -07:00
Ryan Huffman
fa49c213cc Add threaded crashes 2016-04-13 10:24:56 -07:00
Seth Alves
3288bff963 don't flood log with messages about expired actions. also, try to remove such actions 2016-04-13 09:47:07 -07:00
Brad Hefta-Gaub
93f8cfc80a new default LOD settings, and support for reset settings without crashing 2016-04-13 09:26:01 -07:00
samcake
de4345bdc5 Trying to use several FBO instead to avoid changing the REnderBUffers for overlay but... 2016-04-13 01:27:57 -07:00
samcake
8800dd84f1 Trying to use several FBO instead to avoid changing the REnderBUffers for overlay but... 2016-04-13 01:25:46 -07:00
Anthony J. Thibault
97f836d3bb Avatar: fix for avatar meta item bound. 
* In the case where a SkeletonModel was renderable, but had not actually
  created the render items yet, don't use the the rendererableMeshBound
  for the meta render item, because it hasn't been computed yet!  Instead
  wait until the render items have been added to the scene before using
  the more accurate bound...
 2016-04-12 17:32:49 -07:00
Ryan Huffman
0c1277ae7a Add CrashHelpers.h and add to separate submenu 2016-04-12 16:44:11 -07:00
Seth Alves
688de6f100 quiet warning 2016-04-12 14:10:14 -07:00
Atlante45
e45939d18f Make sure ResourceCacheSharedItems deals with strong refs 2016-04-12 13:51:11 -07:00
Atlante45
afdfef1482 Make sure we don't use raw resource ptr 2016-04-12 13:51:11 -07:00
Seth Alves
e4c91e5064 add a heuristic for deciding when it's safe to enable bullet 2016-04-12 11:46:00 -07:00
Brad Davis
3349093908 Fix vr menu login item update 2016-04-12 11:15:06 -07:00
Brad Hefta-Gaub
83494c4a96 Merge pull request #7594 from huffman/feat/include-rolled-logs-bugsplat 
Add rolled log files to BugSplat
 2016-04-12 08:33:17 -07:00
Brad Hefta-Gaub
3f05ded932 Merge pull request #7611 from zzmp/guard/amd 
Disable gradient QML items on AMD
 2016-04-12 08:32:57 -07:00
Brad Hefta-Gaub
a1fe6aee6d Merge pull request #7625 from hyperlogic/tony/third-person-hmd-camera-improvements 
Improve comfort of third-person HMD camera.
 2016-04-12 08:32:23 -07:00
Brad Hefta-Gaub
c5840f217a Merge pull request #7630 from jherico/fps_fix 
Fix FPS counter
 2016-04-12 08:31:58 -07:00
Ryan Huffman
2dfe96a654 Cleanup headers 2016-04-11 14:50:28 -07:00
Ryan Huffman
afe502e1d2 Fix typo 2016-04-11 14:43:05 -07:00
Ryan Huffman
02a17c4497 Fix commented out code 2016-04-11 14:38:29 -07:00
Ryan Huffman
9faeb13ae9 Remove error testing code 2016-04-11 14:38:19 -07:00
Ryan Huffman
63aee23bf1 Move crash testing to CrashHelpers.h 2016-04-11 14:29:16 -07:00
Ryan Huffman
316d533d19 Update crash reporting to cover a larger area 2016-04-11 13:50:42 -07:00
Zach Pomerantz
ab72d8d8fb Init QML GL from share context 2016-04-11 13:47:45 -07:00
Brad Davis
df8ad57185 Fix FPS counter 2016-04-11 00:25:16 -07:00
Anthony J. Thibault
93a5bdd79a Prevent avatar rotation due to HMD head turning in third-person camera. 
Also, fix one frame glitch during snap turning, by updating the sensorToWorld matrix
after the MyAvatar::updateOrientation rotates the avatar, but before we perform IK.
 2016-04-08 15:27:43 -07:00
Anthony J. Thibault
711a1b8c7d Avatar: update renderItems when avatar position or render mesh is in the frustum. 
Previously, when render mesh was visible the renderItems they were not updated with the latest avatar mixer joints rotations and position.
This would result in a frozen avatar being visible.

Now the renderItems are updated when the render mesh is in the frustum or the bounding sphere around the avatar position is visible.
 2016-04-08 13:14:50 -07:00
Ryan Huffman
6232c82f66 Update BugSplat to only send first and last log files 2016-04-08 09:39:25 -07:00
Ryan Huffman
2d60a9a51e Reduce log size limit from 1MB to 512KB 2016-04-08 09:39:08 -07:00
Zach Pomerantz
e08c9db469 Expose GL property to QML 2016-04-07 18:27:07 -07:00
Brad Hefta-Gaub
5287c174b4 Merge pull request #7605 from jherico/route_log_errors 
Fixing logging errors on initial load of controller routes
 2016-04-07 17:13:13 -07:00
Brad Hefta-Gaub
3d94558d6b Merge pull request #7589 from jherico/oculus_input 
Support oculus remote input
 2016-04-07 15:05:45 -07:00