Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-19 03:37:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
51434 commits 25 branches 0 tags 1.1 GiB
Commit graph

16801 commits

Author SHA1 Message Date
David Rowe
efb784f703 Code review 2016-12-13 13:11:21 +13:00
samcake
9155f11b3d Merge pull request #9190 from jherico/test_mode 
Add test mode to interface
 2016-12-12 15:37:05 -08:00
Brad Davis
2a43f5fbef Add test mode to interface 2016-12-12 14:51:11 -08:00
Zach Fox
7030c7b0a6 Space bubble improvements (#9142) 
* The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash.
* The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale.
* Space bubble collision detection is now more accurate and reliable.
* CTRL + N toggles the bubble.
* The "Bubble" HUD button has been moved to the proper location.
 2016-12-12 14:22:54 -08:00
Ryan Huffman
9f166d82ce Add support for oculus touch in help menu 2016-12-12 13:44:09 -08:00
Clément Brisset
84bf93b0fc Merge pull request #9154 from highfidelity/revert-9144-revert-9129-audio-dll 
Restores "Select Audio DLL at runtime"
 2016-12-12 13:38:34 -08:00
Stephen Birarda
dddb4c5412 Merge pull request #9175 from birarda/signup-from-interface 
add account sign up to Interface
 2016-12-12 13:21:21 -08:00
David Rowe
8a399c7cc0 Fix model auto-scaling to 1% not being seen by observers take 2 2016-12-12 17:01:02 +13:00
David Rowe
4f0c429e7f Fix model auto-scaling to 1% not being seen by observers 2016-12-11 17:08:36 +13:00
Chris Collins
c912d77a95 Merge pull request #9167 from Atlante45/feat/oculus-reorient-quit 
Honor reorient and quit request from OVR
 2016-12-09 16:03:41 -08:00
David Rowe
a52d8d1982 Merge branch 'master' into 21089 2016-12-10 11:47:43 +13:00
David Rowe
e956608fa4 Fix keyboard focus when switch highlight between overlays and entities 2016-12-09 18:31:52 +13:00
David Rowe
bad8d20dd9 Rescale large Clara.io models to 1% instead of 10% 2016-12-09 17:02:06 +13:00
David Rowe
7d8926c802 Fix Web overlay x, y coordinate calcs 2016-12-09 17:00:00 +13:00
Seth Alves
369f61e172 bring over some previous tablet-ui work 2016-12-08 16:54:39 -08:00
Atlante45
aa1d90108c No updater command line argument 2016-12-08 16:35:30 -08:00
Stephen Birarda
9445fc2898 fix for display of multiple sign up errors 2016-12-08 16:28:16 -08:00
Stephen Birarda
b66ddbdbdb add email field, error handling for sign up inputs 2016-12-08 16:16:37 -08:00
David Rowe
1213a1dfd1 Fix Overlays.getProperty method not returning value to script 2016-12-09 12:41:54 +13:00
Stephen Birarda
556ccb90f7 make a SignUpBody loaded by LoginDialog 2016-12-08 14:35:41 -08:00
Clément Brisset
06331494af Revert "Revert "Select Audio DLL at runtime"" 2016-12-08 14:14:03 -08:00
David Rowe
4c236b293e First pass at controller interaction with 3D Web overlay 2016-12-09 01:47:40 +13:00
David Rowe
5313a682ad Fix compiler warning 2016-12-08 19:48:51 +13:00
David Rowe
7eacdb69b5 Auto-resize Clara.io models if larger than 10m as likely in cm or mm 2016-12-08 19:17:26 +13:00
David Rowe
639d7a5d97 Add further user feedback on Clara download progress 2016-12-08 18:36:50 +13:00
Atlante45
7b0b777051 Honor reorient and quit request from OVR 2016-12-07 17:29:54 -08:00
Stephen Birarda
801a384607 a simple signup dialog copied from login dialog 2016-12-07 16:14:20 -08:00
Howard Stearns
2eb8d9d0c4 Merge pull request #9153 from davidkelly/dk/machineFingerprint 
Machine fingerprint
 2016-12-06 16:34:45 -08:00
David Kelly
562cd12bca More CR feedback 
Breaking into 2 functions - one public, one private, so I can avoid
nested control structures and so on in dealing with errors on the
windows side of things.  So, no more namespace, back to a class with
2 static functions, one public one private
 2016-12-06 15:17:47 -08:00
David Rowe
186d3f18ef Improve temporary download directory robustness 2016-12-07 11:55:17 +13:00
David Rowe
eafd51ba9e Merge branch 'master' into 21089 2016-12-07 11:27:15 +13:00
David Rowe
641e47e0c5 Fix build warnings 2016-12-07 10:39:37 +13:00
David Rowe
8e30674069 Tidying 2016-12-07 09:28:35 +13:00
David Rowe
d857f943f8 Handle Clara marketplace downloads 2016-12-07 09:16:59 +13:00
David Kelly
dc47c5fc0c CR feedback 
lame mistake - it is always the error branches that get you.
 2016-12-06 11:12:50 -08:00
Chris Collins
6d4b1c4b97 Merge pull request #9155 from jherico/text_degrade_fix 
Fix drop in text rendering quality when texture memory is low
 2016-12-06 09:23:32 -08:00
Andrew Meadows
7db8e8f31b Merge pull request #9156 from hyperlogic/out-of-body-revert 
Revert Out of Body experience
 2016-12-06 08:37:20 -08:00
David Kelly
c40aadfea4 whitespace 2016-12-05 17:13:12 -08:00
Ryan Huffman
a81e7c2d2c Merge pull request #9148 from Polyrhythm/ryan/client-side-tests 
Client script test runner
 2016-12-05 16:23:17 -08:00
Anthony J. Thibault
89ae3b3d6e Revert "Merge pull request #8691 from highfidelity/out-of-body-experience" 
This reverts commit efe9571ab8, reversing
changes made to 333e9ec7f4.
 2016-12-05 15:18:03 -08:00
Anthony J. Thibault
0c8105b551 Revert "Merge pull request #9141 from hyperlogic/feature/my-avatar-docs-part-1" 
This reverts commit 934148fea5, reversing
changes made to d2b32c3084.
 2016-12-05 15:17:53 -08:00
Anthony J. Thibault
49ce04e214 Revert "Merge pull request #9150 from hyperlogic/bug-fix/driving-while-flying-in-hmd" 
This reverts commit a69d77ffbe, reversing
changes made to 996d3f5875.
 2016-12-05 15:17:32 -08:00
Anthony J. Thibault
e8b5b56df7 Revert "Merge pull request #9151 from hyperlogic/bug-fix/reset-sensor-in-desktop-mode" 
This reverts commit 119653bceb, reversing
changes made to a69d77ffbe.
 2016-12-05 15:16:49 -08:00
Bradley Austin Davis
2ca4d0ab29 Fix drop in text rendering quality on texture memory constrained systems 2016-12-05 14:12:57 -08:00
Andrew Meadows
119653bceb Merge pull request #9151 from hyperlogic/bug-fix/reset-sensor-in-desktop-mode 
Fix for reset sensors while in desktop mode.
 2016-12-05 13:46:53 -08:00
Andrew Meadows
a69d77ffbe Merge pull request #9150 from hyperlogic/bug-fix/driving-while-flying-in-hmd 
Fix for driving/turning while flying in HMD mode
 2016-12-05 13:46:29 -08:00
Ryan Jones
094857949d tabs -> spaces, remove raw ptr, remove unnecessary spec diff 2016-12-05 12:57:21 -08:00
Anthony J. Thibault
6d82410bc5 Fix for away.js teleporting user when in desktop mode 
away.js calls MyAvatar.centerBody, however centerBody is only meaningful in HMD mode.
To guard against this, MyAvatar::centerBody is now a no-op if the application is not in HMD mode.
 2016-12-05 10:53:20 -08:00
Anthony J. Thibault
349f0355ae Fix for reset sensors while in desktop mode. 
Previously hitting ' a.k.a. reset sensors, would teleport you to the last
position you were in before you switched into desktop mode, or the spawn location.

This fixes that behavior but not re-centering the avatar while in desktop mode.
 2016-12-05 10:42:20 -08:00
Anthony J. Thibault
a0f93dad2c Fix for driving/turning while flying in HMD mode 
The internal MyAvatar:_sensorToWorldMatrix was being updated properly, however
the MyAvatar::_sensorToWorldMatrixCache was not. To fix this I've introduced
a new "mode" to updateSensorToWorldMatrix that does not change the sensorToWorldMatrix at all,
but properly copies the value to the cache and also updates hand controller poses etc.
 2016-12-05 10:14:03 -08:00
David Rowe
2f42f4cfa5 Merge branch 'master' into 21089 2016-12-05 18:33:38 +13:00
Ryan Jones
39e1a3fb44 add client-side test runner 2016-12-04 20:53:06 -08:00
David Rowe
a5bdd9066f Add JavaScript event bridge for Web 3D overlay 2016-12-05 17:20:30 +13:00
David Rowe
a8a04cfbba Add script injection to Web 3D overlay 2016-12-05 12:19:49 +13:00
Ryan Jones
3eecba77f2 working menu item 2016-12-03 19:34:38 -08:00
David Rowe
71de106594 Tidying 2016-12-04 15:14:47 +13:00
David Rowe
b84bcaf629 Highlight Web overlay with focus 2016-12-04 13:42:12 +13:00
David Rowe
38e6c8075c Direct keyboard input to Web overlay when has focus 2016-12-04 12:28:44 +13:00
David Rowe
7f76792a9b Refactoring 2016-12-03 21:42:57 +13:00
David Rowe
e8ef710fd3 Add mouse hover handling to Web overlay 2016-12-03 20:36:55 +13:00
David Rowe
6dbb7129e6 Add mouse press, move, and release handling to Web overlay 2016-12-03 17:09:09 +13:00
David Kelly
643353a31e Initial push 
Works on windows, have not tried it on mac.  Lots more to do, but
need to get it pushed to remote just in case.
 2016-12-02 15:46:20 -08:00
Clément Brisset
3659e8e585 Revert "Select Audio DLL at runtime" 2016-12-02 14:15:11 -08:00
David Rowe
0134709e2c Fix Web 3D overlay ray intersection then comment out for performance 
Per Image3DOverlay.
 2016-12-02 18:50:01 +13:00
Anthony J. Thibault
35eeaad590 Added jsdocs for MyAvatar 
Not complete by any means, but it's a start.
 2016-12-01 17:38:43 -08:00
Zach Fox
30dade242c GIFs: Quality improvements; duration tweaks; processing notif (#9139) 2016-12-01 14:53:18 -08:00
Seth Alves
efe9571ab8 Merge pull request #8691 from highfidelity/out-of-body-experience 
Room Scale HMD comfort features.
 2016-12-01 11:09:39 -08:00
Andrew Meadows
445c730ca3 remove cruft, fix formatting and spelling 2016-12-01 10:38:13 -08:00
Chris Collins
19b5e7cd86 Merge pull request #9054 from howard-stearns/third-person-lasers 
make hand-controller ui work in third person
 2016-12-01 10:11:12 -08:00
Atlante45
e6b9d3604d Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings 2016-12-01 09:45:50 -08:00
Brad Hefta-Gaub
c9545ca920 Merge pull request #9129 from Atlante45/audio-dll 
Select Audio DLL at runtime
 2016-11-30 15:42:21 -08:00
Atlante45
1d8c97b337 Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings 2016-11-30 10:22:16 -08:00
Atlante45
db263df03e Select Audio DLL at runtime 2016-11-29 19:42:59 -08:00
David Rowe
a75d0b3fe8 Merge branch 'master' into 21089 2016-11-30 14:50:51 +13:00
Anthony J. Thibault
78559934a1 Merge branch 'master' into third-person-lasers 2016-11-29 16:38:34 -08:00
Brad Davis
3b07e31eab Working on OpenGL debuggability 2016-11-29 13:15:56 -08:00
howard-stearns
bf0f56c138 null guard 2016-11-23 15:27:24 -08:00
howard-stearns
4e0c6e5d0f handle empty snapshot text data more broadly (and at the same time, don't 
lie from parseSnapshotData).
 2016-11-23 11:00:31 -08:00
howard-stearns
5188de924f allow for SnapshotReview dialog to be up during a change of href for all 
media capture
 2016-11-22 11:09:43 -08:00
Atlante45
3035d43772 Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings 2016-11-21 13:05:08 -08:00
Brad Hefta-Gaub
fe709f51de personal space feature 2016-11-19 16:30:15 -08:00
Zach Fox
3a5a9b359e Quick bugfix 2016-11-18 15:04:35 -08:00
Zach Fox
1e97a69b51 Massive performance improvements. 2016-11-18 14:39:30 -08:00
Zach Fox
7f4613f136 Add checkbox for GIF and length selector 2016-11-18 14:39:30 -08:00
Zach Fox
20a2d1275a Bugfixes and GIF uploads workinggit add -A! 2016-11-18 14:39:30 -08:00
Zach Fox
2c0cfdf241 Fix build for real? 2016-11-18 14:39:30 -08:00
Zach Fox
ad5c3e6f15 Decrease animated snapshot resolution 2016-11-18 14:39:30 -08:00
Zach Fox
cc8bf0ce6e BUGS FIXED! getting super close... 2016-11-18 14:39:30 -08:00
Zach Fox
adcbb0b760 Code clarity and potential bugfix 2016-11-18 14:39:30 -08:00
Zach Fox
a81289a0d7 Huge progress today. Buggy behavior with multiple snapshots remains 2016-11-18 14:39:29 -08:00
Zach Fox
8f9ffd2bc5 Framerate is stable, and GIF duration is correctgit add -A! 2016-11-18 14:39:29 -08:00
Zach Fox
25471d9fae Still unstable, but maybe better? 2016-11-18 14:39:29 -08:00
Zach Fox
fc21cae904 More stable than ever! Uses external GifCreator lib. Still frame timing issues. 2016-11-18 14:39:29 -08:00
Zach Fox
f726ea546f code cleanup; simultaneous gif and still capture 2016-11-18 14:39:29 -08:00
Zach Fox
1158ae8b3d Much more stability. 2016-11-18 14:39:29 -08:00
Zach Fox
d91158f07c Small changes, still trying to figure out judder 2016-11-18 14:39:29 -08:00
Zach Fox
0c4c97d3f9 GIF speed is wrong. Need to save both still and animated. 2016-11-18 14:39:29 -08:00
Zach Fox
152e0aee17 I think I'm very close to a PR... 2016-11-18 14:39:29 -08:00
Zach Fox
045dfff158 It's workinggit add -A! Stack corruption errors? Must fix. 2016-11-18 14:39:29 -08:00
Zach Fox
c39a8da3b8 Getting theregit add -A! 2016-11-18 14:39:29 -08:00
Zach Fox
e656a4413f Comments - still crashing... 2016-11-18 14:39:28 -08:00
Zach Fox
1912ab1467 still crashing, feeling closer 2016-11-18 14:39:28 -08:00
Zach Fox
b6dd795b00 It crashes, but it's the start of a new architecture 2016-11-18 14:39:28 -08:00
Zach Fox
ed1d087a68 Starting cleanup procedure... 2016-11-18 14:39:28 -08:00
Zach Fox
ee21d1ccc7 IT WORKSgit add -A! Mega amounts of cleanup to do now. 2016-11-18 14:39:28 -08:00
Zach Fox
21d4590075 Just using usleep won't work 2016-11-18 14:39:28 -08:00
Zach Fox
76121a2bcd Getting somewheregit add -A! 2016-11-18 14:39:28 -08:00
Zach Fox
912c9db1c1 More progress. Corrupted output GIF. 2016-11-18 14:39:28 -08:00
Zach Fox
704476c197 Initial progressgit add -A! 2016-11-18 14:39:28 -08:00
Anthony J. Thibault
38ac6fff03 Hand Controller rendering is camera relative 
Basically, when using the third person camera in HMD mode.  If the controllers are shown.
They should be shown in front of the users camera, not in front of the users avatar.

To accomplish this, two new faux joint indices are introduced.
CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX and CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX.

These joint indices can be used for Overlay parenting. (But not for entity parenting because they are not transmitted over the network).
They can also be queried for by using the MyAvatar.getAbsoluteJointRotationInObjectFrame() call.

These new indices are now used by the controllerDisplay.js for the hand controller rendering.
They are also used by system/libraries/controllers.js as the origin for hand controller grabbing and interaction lasers.
 2016-11-17 11:33:12 -08:00
Ryan Huffman
c6b64081fc Add Overlays jsdocs 2016-11-16 12:01:05 -08:00
Ryan Huffman
7e9df928f4 Add jsdoc comments to Menu 2016-11-16 10:49:50 -08:00
Brad Hefta-Gaub
84573d373b Merge pull request #9070 from huffman/fix/docs 
Add jsdoc to Camera
 2016-11-15 13:46:16 -08:00
Andrew Meadows
d749697c46 scan bottom points during hover-HMD-drive 2016-11-15 12:05:44 -08:00
David Rowe
9b270834dd Merge branch 'master' into 21089 2016-11-16 08:51:48 +13:00
Andrew Meadows
a04b7ae297 fix hover-drive in HMD 2016-11-15 11:45:09 -08:00
Andrew Meadows
6bb3dd6830 Merge hifi/master into hifi/out-of-body-experience 2016-11-14 15:08:04 -08:00
Andrew Meadows
5f0761598e Merge pull request #8926 from AndrewMeadows/drive-hmd2 
improved driving for HMD
 2016-11-14 14:40:19 -08:00
Ryan Huffman
3fcc2d3fa5 Add jsdoc to Clipboard 2016-11-14 13:52:16 -08:00
Ryan Huffman
7e2bb0e5ed Cleanup camera docs 2016-11-14 13:51:51 -08:00
Ryan Huffman
ec86b82079 Add jsdoc to Camera 2016-11-14 12:14:24 -08:00
Chris Collins
0876dbc809 Merge pull request #9050 from sethalves/last-edited-by 
lastEditedBy property for entities
 2016-11-11 16:02:18 -08:00
Chris Collins
b9b90cc646 Merge pull request #9047 from jherico/stutter 
Add stutter tracking
 2016-11-11 11:39:00 -08:00
Seth Alves
15c247fc5e quiet warnings 2016-11-11 06:37:22 -08:00
Seth Alves
5629db9109 Merge pull request #9049 from birarda/max-min-av-scale 
add a min/max avatar scale in domain-server settings
 2016-11-11 06:11:02 -08:00
Brad Hefta-Gaub
6db3556dc5 Merge pull request #9048 from howard-stearns/disable-viewpoint-menus-in-hmd 
Disable viewpoint menus in hmd
 2016-11-10 17:52:50 -08:00
Stephen Birarda
020942c826 better handling for a flipped min/max scale 2016-11-10 16:50:36 -08:00
Stephen Birarda
88c63332de protect flipped min/max scale in avatar mixer settings 2016-11-10 16:21:48 -08:00
Brad Davis
16060d50af Merge pull request #9041 from jherico/disable_incremental 
Remove incremental texture transfers
 2016-11-10 15:43:20 -08:00
Stephen Birarda
272d0c845e add clarifying comments about target scale changes 2016-11-10 15:25:15 -08:00
Stephen Birarda
d5722c1654 fix clamping of scale and DRY it up 2016-11-10 15:03:13 -08:00
howard-stearns
4d18a3cc3d expose menu enablement to javascript 2016-11-10 15:01:06 -08:00
Stephen Birarda
53769f4edf change scale for avatar if domain limited scale changes 2016-11-10 14:58:04 -08:00
Stephen Birarda
9fdde49d14 clamp target scale changes on both ends 2016-11-10 14:54:42 -08:00
Stephen Birarda
6f442a74b1 request settings from agents and debug results 2016-11-10 14:43:15 -08:00
Stephen Birarda
77ede81fc9 limit MyAvatar scale to limits from domain settings 2016-11-10 13:27:13 -08:00
Brad Davis
c7d68aa9cf Add stutter stat logging 2016-11-10 13:15:35 -08:00
Brad Davis
90f55f0cd5 Add stutter tracking 2016-11-10 11:56:38 -08:00
Brad Hefta-Gaub
ff559aa4a1 Merge pull request #9042 from hyperlogic/feature/jsdoc 
Generate JS documentation from comments in C++ source
 2016-11-10 10:17:39 -08:00
Brad Davis
db98a742b6 Remove incremental transfers 2016-11-10 08:35:35 -08:00
David Rowe
84795439ea Display Clara.io download information 2016-11-10 16:29:48 +13:00
Anthony J. Thibault
839b1a3c5e Added some jsdoc comments to the C++ source 2016-11-09 18:09:10 -08:00
David Rowe
5eff7c9e15 Merge branch 'master' into 21089 2016-11-10 14:42:21 +13:00
samcake
f5fd4bf8d1 Merge pull request #9014 from jherico/texture_derez 
Re-enable downsampling for non-sparse textures
 2016-11-09 17:18:03 -08:00
Brad Hefta-Gaub
770bf35d2b CR feedback 2016-11-09 14:31:18 -08:00
Brad Hefta-Gaub
cf3d1011f4 remove scripts from avatar attached entities for other avatars 2016-11-09 12:26:57 -08:00
Brad Davis
192c72ff99 Update menu, initial state for texture management 2016-11-09 12:09:25 -08:00
Howard Stearns
666d2dd2fc Merge pull request #9031 from davidkelly/dk/2178 
Log snapshot upload and user story creation errors
 2016-11-08 12:11:16 -08:00
David Kelly
1766ebab2c Added a bit more logging 2016-11-08 09:08:34 -08:00
Brad Hefta-Gaub
5454dca82e Merge pull request #9030 from highfidelity/stable 
Update master with Stable hotfix
 2016-11-07 18:48:54 -08:00
David Kelly
3105299670 Log snapshot upload and user story creation errors 
Plus, if the body of the error is empty, put something in there so
the script will not think it was successful.
 2016-11-07 18:13:10 -08:00
David Rowe
76de7bf03c Fix typo 2016-11-08 13:53:37 +13:00
David Rowe
8cceda1cfe Tidy UI text 2016-11-08 13:23:44 +13:00
David Rowe
afd2a900a3 Improve error handling for case that don't have permissions 2016-11-08 13:22:50 +13:00
Chris Collins
eec8e2f19b Merge pull request #9000 from samcake/punk 
Add Frame Timing and GPU memory to the Stats and user activity log
 2016-11-07 16:17:20 -08:00
Atlante45
f34cf64f3e Disable updater on Steam 2016-11-07 16:09:56 -08:00
David Rowe
090065ee34 Add user feedback on download process 2016-11-08 13:05:35 +13:00
Seth Alves
24556fc70d Merge pull request #8980 from huffman/feat/default-to-hmd 
Update interface to default to HMD display plugin
 2016-11-07 13:36:39 -08:00
David Rowe
d33ac21aaa Merge branch 'master' into 21089 2016-11-08 08:23:10 +13:00
Andrew Meadows
ccdf383151 Merge hifi/master into hifi/out-of-body-experience 2016-11-07 08:24:26 -08:00
Atlante45
ae29fe8ab2 Logging improvements 2016-11-04 14:26:19 -07:00
samcake
449add6b34 Fix bad variable initialization 2016-11-04 13:29:27 -07:00
Ryan Huffman
0cec62b3a3 Revert "Update interface to default to HMD display plugin" 
This reverts commit bbef071723.
 2016-11-04 12:27:15 -07:00
Ryan Huffman
0dac2c999e Revert "Remove unused 'first' variable" 
This reverts commit 26e0d02d60.
 2016-11-04 12:27:04 -07:00
Ryan Huffman
3ad9c1a797 Add check to go into HMD on first run if available 2016-11-04 12:26:20 -07:00
samcake
76aa541d4a Adding the frame gpu and batch timer 2016-11-04 11:49:52 -07:00
samcake
3db1831841 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2016-11-04 09:59:28 -07:00
samcake
7655f906f1 Starting adding a timer for the frame 2016-11-03 19:26:30 -07:00
Brad Hefta-Gaub
7cca8f0a66 Merge pull request #8993 from samcake/blue 
Prevent sparse texture on AMD gpus for now
 2016-11-03 16:48:52 -07:00
samcake
1086585559 fixing the test to actually capture ati correctly and add the report to the ui 2016-11-03 15:15:05 -07:00
Clément Brisset
00a94bdd6d Merge pull request #8974 from huffman/feat/help-select-xbox-tab 
Update help window to auto select xbox or vive controller tab on availability of device
 2016-11-03 14:42:23 -07:00
Brad Hefta-Gaub
206f1ead1a Merge pull request #8990 from howard-stearns/centered-toolbar 
centered toolbar
 2016-11-03 14:18:32 -07:00
howard-stearns
b6e440f891 delete this and formatting 2016-11-03 13:26:50 -07:00
howard-stearns
3a072b5bf9 tell desktop about preference changes 2016-11-03 12:17:28 -07:00
Zach Fox
9a22c29788 Get ready for merge 2016-11-03 11:20:08 -07:00
Zach Fox
e9e1d0cb2f Remove erroneous exclamation mark 2016-11-03 11:10:32 -07:00
Zach Fox
b74c1d3476 tabs to spaces 2016-11-03 10:42:15 -07:00
Zach Fox
a12e0325bf Making progress... 2016-11-03 10:39:55 -07:00
David Rowe
427c8008c6 Merge branch 'master' into 21089 2016-11-03 09:18:25 +13:00
Ryan Huffman
26e0d02d60 Remove unused 'first' variable 2016-11-01 16:40:41 -07:00
Ryan Huffman
bbef071723 Update interface to default to HMD display plugin 2016-11-01 16:23:53 -07:00
David Rowe
10490a9fad Default collision shap to hull per submesh instead of static 2016-11-02 10:45:00 +13:00
howard-stearns
52cc03c5a2 Get snapshot location data from file, which now uses shareable place info. 2016-11-01 14:44:39 -07:00
Ryan Huffman
3147ea9e33 Update help window to auto select xbox or vive controller tab on availability of device 2016-11-01 13:43:55 -07:00
David Rowe
93beaa81c0 Code tidying 2016-11-01 13:27:05 +13:00
David Rowe
cee8b66ce9 Handle duplicate Clara download asset names 2016-11-01 13:26:05 +13:00
David Rowe
3ca2c19075 Delete temporary directory after content has been used 2016-11-01 12:31:35 +13:00
David Rowe
8ab56fe871 Automatically download Clara model to ATP and add to world 2016-10-31 16:02:20 +13:00
David Rowe
12747d26e0 Add parameter that enables automatically adding download model to world 2016-10-30 13:58:17 +13:00
Seth Alves
3ad748cfe2 Merge branch 'master' of github.com:highfidelity/hifi into possible-fix-for-2068 2016-10-28 16:41:39 -07:00
Zach Pomerantz
be23668ca8 delete websurfaces on shutdown 2016-10-28 14:29:52 -07:00
Seth Alves
e15043754c Merge branch 'master' of github.com:highfidelity/hifi into possible-fix-for-2068 2016-10-28 11:36:09 -07:00
Brad Davis
e9db8be435 Fix linux build 2016-10-27 16:51:52 -07:00
Brad Davis
018d945b85 Display warning overlay instead of scene when below min spec 2016-10-27 15:51:26 -07:00
Brad Davis
012e215f62 Merge pull request #8922 from ZappoMan/report45hzTarget 
when vive is on i5 report a correct target frame rate so we can see that in metaverse stats
 2016-10-27 14:03:07 -07:00
Brad Hefta-Gaub
bfe6ebb44f some tweaks 2016-10-27 12:04:46 -07:00
Brad Hefta-Gaub
510786bc0f Merge pull request #8923 from Atlante45/steamvr 
Add getter for SteamVR's buildID to SteamClient
 2016-10-27 11:38:35 -07:00
Chris Collins
ab8e5759b0 Merge pull request #8929 from ZappoMan/addAudioStatsToMenu 
add a menu item to run audio stats script
 2016-10-27 10:43:20 -07:00
Seth Alves
f47aeae2a7 stop passing bare pointers to EntityTreeRenderer all around 2016-10-27 10:10:22 -07:00
Brad Hefta-Gaub
c6d89f181a CR feedback 2016-10-27 10:08:16 -07:00
Brad Hefta-Gaub
d778b3b4ce fix the timing of the launchedFromSteam property 2016-10-27 10:00:48 -07:00
Brad Hefta-Gaub
76344f3253 add a menu item to run audio stats script 2016-10-26 22:41:56 -07:00
Andrew Meadows
5e273664db improved ray tests for HMD driving 2016-10-26 17:28:35 -07:00
Andrew Meadows
38e4ac0ae9 Merge master into out-of-body-experience 2016-10-26 16:59:31 -07:00
Brad Davis
1c89fa2291 Make threaded submit in OpenVR controllable from menu 2016-10-26 15:28:42 -07:00
Atlante45
f26ddc6f8b Add getter for SteamVR's buildID to SteamClient 2016-10-26 14:51:48 -07:00
Brad Hefta-Gaub
e464858c4c use SteamClient::isRunning() instead of command line param 2016-10-26 14:08:18 -07:00
Brad Hefta-Gaub
5f2b4c2a7f CR feedback 2016-10-26 13:27:11 -07:00
Brad Hefta-Gaub
f95a731249 add app property when the app was launched from steam 2016-10-26 13:22:03 -07:00
Chris Collins
d25a4fb1cb Merge pull request #8910 from zzmp/fix/qml-audio-shutdown-order 
fix shutdown order of qml/audio
 2016-10-26 11:37:54 -07:00
Brad Davis
ce627eeea1 Updated metrics 2016-10-25 17:49:51 -07:00
Zach Pomerantz
4913654f44 Merge branch 'master' of github.com:highfidelity/hifi into fix/qml-audio-shutdown-order 2016-10-25 17:49:30 -07:00
Brad Hefta-Gaub
56b0995047 Merge pull request #8909 from hyperlogic/bug-fix/crash-on-exit-fix 
Crash on exit fix for render items
 2016-10-25 17:34:46 -07:00
Chris Collins
3b31b28622 Merge pull request #8904 from sethalves/fix-a-couple-crash-on-exits 
fix a couple of crash-on-exits
 2016-10-25 17:03:21 -07:00
Zach Pomerantz
78a04255ab amend qml/audio ordering comment 2016-10-25 16:35:56 -07:00
Brad Hefta-Gaub
001cfc7e15 Merge pull request #8901 from samcake/blue 
Adding more detailed counters for texture memory consumption
 2016-10-25 16:19:56 -07:00
Zach Pomerantz
5413d97089 cleanup qml before audio 2016-10-25 15:54:08 -07:00
Anthony Thibault
23aa626755 Destroy render scene & engine before Application is destroyed 
Many render items/payloads contain smart pointers back to the
objects that added them to the scene, including entity and avatar
objects. Currently, those render items are destroyed when the
scene is destroyed very late in the application life-cycle.

There are rare crashes that can occur when these render items are
destroyed. Possibly, due to them referencing objects that have
already been destroyed via raw pointers. In an effort to
eliminate these crashes, we now destroy the scene earlier, within
Application::aboutToQuit() which is connected to the
QCoreApplication::aboutToQuit signal.  Also, we guard against null
scene pointer dereferences.  Any location that accesses the scene
off the main thread, now checks the validity of the scene pointer.
 2016-10-25 15:28:37 -07:00
Brad Hefta-Gaub
822e088240 tweak format of gl_info 2016-10-25 15:20:10 -07:00
Brad Hefta-Gaub
e22a2e9e2f add gl info and gpu free memory to user stats 2016-10-25 14:56:54 -07:00
Brad Hefta-Gaub
272055b6ee add location and build info to user activity stats 2016-10-25 14:19:44 -07:00
Seth Alves
3903a51062 fix a couple of crash-on-exits 2016-10-25 13:58:48 -07:00
samcake
507d3e5a39 IMprove the counting and namoing of the new couters the gl swapchain 2016-10-25 12:28:07 -07:00
Brad Hefta-Gaub
1bbf0179dd Merge pull request #8894 from ZappoMan/xboxLasers 
Adds support for "lasers" to the Oculus+xbox controller
 2016-10-25 09:18:00 -07:00
Chris Collins
9846614468 Merge pull request #8879 from AndrewMeadows/show-physics-stats 
add Bullet profile info to PerformanceTimer stats
 2016-10-25 06:29:27 -07:00
sam
6b2b68e691 trying to add counters for the default FBO 2016-10-25 03:36:23 -07:00
Brad Hefta-Gaub
62f63f32a7 Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers 2016-10-24 20:24:29 -07:00
samcake
58b81e3b0c Adding counter for the amount of memory used in texture for Framebuffers 2016-10-24 18:34:16 -07:00
Anthony J. Thibault
69bd4ccea2 Show hand controllers when out-of-body for more then 3/4 of a second 
Without the timer, the hands can flicker in and out of visibility when lightly brushing against collision.
 2016-10-24 18:16:05 -07:00
Clément Brisset
dd45500313 Merge pull request #8891 from huffman/fix/disconnected-dialog-updates 
Fix several aspects of the "disconnected" dialog
 2016-10-24 15:39:16 -07:00
Brad Hefta-Gaub
a25d50387e gak 2016-10-24 14:47:10 -07:00
Ryan Huffman
e0c109d6ca Simplify ConnectionMonitor to only rely on domainConnectionRefused instead of authRequired 2016-10-24 14:45:41 -07:00
Ryan Huffman
bbf5afeb8d Remove use of start() w/o param in ConnectionMonitor 2016-10-24 14:35:38 -07:00
Ryan Huffman
5077ec2044 Remove unused indicateDomainConnectionFailure 2016-10-24 14:35:09 -07:00
Ryan Huffman
f3ef0cebed Update ConnectionMonitor to not show poopup on domain connection refusal 2016-10-24 14:27:28 -07:00
Andrew Meadows
42c6996aee fix warning about unused variable 2016-10-24 14:05:28 -07:00
Brad Davis
da9eb0433c Remove workaround for QML HDPI offscreen rendering bug 2016-10-24 11:51:40 -07:00
Ryan Huffman
e7023b3d99 Add ConnectionFaiureDialog qml 2016-10-24 10:52:46 -07:00
Ryan Huffman
5b58e8ae97 Fix ConnectionHandler not handling connected-but-need-auth condition 2016-10-24 10:44:33 -07:00
Ryan Huffman
84bcefc147 Update ConnectionMonitor to increase timeout on startup 2016-10-24 10:28:13 -07:00
Ryan Huffman
32b5c84bec Update ConnectionMonitor to init at end of startup 2016-10-24 10:27:27 -07:00
Andrew Meadows
8ecc23f62b HMD drive stops against simple walls 2016-10-24 08:26:44 -07:00
Andrew Meadows
06866957d0 first pass (theoretical) HMD ray-traced step logic 2016-10-24 08:26:44 -07:00
Andrew Meadows
66479808ba cleanup velocity calculation in HMD mode 2016-10-24 08:26:44 -07:00
Andrew Meadows
51a9a99381 Merge hifi/master into hifi/out-of-body-experience 2016-10-24 08:13:42 -07:00
Brad Hefta-Gaub
0f8967970a Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers 2016-10-24 08:11:31 -07:00
Brad Hefta-Gaub
a282d83546 more work on extra lasers 2016-10-24 07:46:04 -07:00
Brad Davis
861b69aa94 Add free GPU memory to the displayed stats 2016-10-23 13:07:38 -07:00
Brad Davis
62de2af944 Add more GPU stats, make stats easier to read 2016-10-22 14:38:46 -07:00
Brad Hefta-Gaub
ee1f3ac38c Merge pull request #8881 from jherico/offscreen_texture_memory_stats 
Report offscreen texture memory usage in stats
 2016-10-21 19:15:59 -07:00
Ryan Downe Karpf
f5a116fc92 Merge pull request #8880 from hyperlogic/feature/controller-display 
Show hand controllers in away.js
 2016-10-21 17:43:52 -07:00
David Kelly
aa31d3d8cc Heartbeats need to happen while waiting for sandbox 
We can only know if sandbox is up by waiting for the http request to
succeed or fail.  In the common case (fail since it isn't up yet), we
have to wait until a connect timeout in http.  Seems that is a couple
seconds, and in that time we really upset the deadlock watchdog thread
since it keeps a moving average of heartbeat times.

Simple solution, updateHeartbeat while waiting, and right before we
start.
 2016-10-21 14:43:39 -07:00
Brad Hefta-Gaub
ba9d9f6ab7 Merge pull request #8860 from davidkelly/dk/2004 
Fix for sandbox startup issue
 2016-10-21 14:24:08 -07:00
Anthony J. Thibault
c431c69d60 Merge branch 'master' into feature/controller-display 2016-10-21 13:48:07 -07:00
Andrew Meadows
e44672180a add Bullet profile info to PerformanceTimer stats 2016-10-21 13:22:22 -07:00
Brad Davis
1bd398ae5e Report offscreen texture memory usage in stats 2016-10-21 11:31:37 -07:00
Anthony J. Thibault
60f728585a away.js now shows hand controllers in away mode. 
* controllerDisplayManager is now part of default scripts.
* Also tutorial and away.js communicate with controllerDisplayManager via HMD.requestShowHandControllers, HMD.requestHideHandControllers
  and sendLocalMessage.
* removed previous version of controllerDisplayManger from tutorial.
 2016-10-21 10:40:39 -07:00
Brad Hefta-Gaub
6279b273fc Merge pull request #8867 from jherico/offscreen_textures 
Fix offscreen QML texture leak, improve texture sharing for same size surfaces
 2016-10-20 17:07:29 -07:00
David Kelly
20b140317c PR feedback 
bool to indicate sandbox is actually running.
 2016-10-20 17:01:09 -07:00
Clément Brisset
b63eb6ba9f Merge pull request #8665 from zzmp/feat/audio-stats 
move audio stats to QML/JS, with graphs
 2016-10-20 16:43:49 -07:00
Brad Davis
9523660027 Fix offscreen QML texture leak, improve texture sharing for same size surfaces 2016-10-20 11:55:25 -07:00
Brad Hefta-Gaub
8a071f18b3 more work 2016-10-20 11:18:20 -07:00
David Kelly
ab02fd79a0 since we know the state, use that boolean 2016-10-20 10:12:26 -07:00
howard-stearns
6f283a4893 fix resize on plugin switch 2016-10-20 09:39:02 -07:00
Brad Hefta-Gaub
bf732127ca Merge pull request #8856 from jherico/geometry_ids 
Remove the use of implicit ids in geometry cache
 2016-10-20 08:14:49 -07:00
David Kelly
5b7f0cb358 Fix for sandbox startup issue 
Move determinedSandboxState=true until after we spawn it.
 2016-10-19 13:51:20 -07:00
Brad Hefta-Gaub
aa50f460c3 Merge pull request #8851 from jherico/qml_limit 
Rate limit QML web surfaces
 2016-10-19 12:04:47 -07:00
Brad Davis
2705ee7030 Remove the use of implicit ids in geometry cache 2016-10-19 11:18:25 -07:00
Seth Alves
e247f0aa34 Merge pull request #8850 from zzmp/fix/model-attachment-lifetime 
ensure model attachment lifetimes
 2016-10-19 09:56:02 -07:00
Andrew Meadows
f414ffaf98 fix crash in MyCharacterController on shutdown 2016-10-18 21:03:02 -07:00
Stephen Birarda
18523558f7 move HFWebEngineProfile back to interface/networking 2016-10-18 20:04:11 -07:00
Brad Davis
61e5e2861e Rate limit QML web surfaces 2016-10-18 19:29:11 -07:00
Zach Pomerantz
a9bad592f9 ensure model attachment lifetimes 2016-10-18 18:01:18 -07:00
Stephen Birarda
9f2627d31d Merge pull request #8828 from birarda/web-engine-interceptor 
move HF access token to authorization header
 2016-10-18 17:24:58 -07:00
Andrew Meadows
a4308f08a4 remove debug cruft 2016-10-18 16:50:19 -07:00
Andrew Meadows
6a445a0a98 more correct steepest walkable slope detection 2016-10-18 16:48:33 -07:00
Andrew Meadows
5a04c7ceee remove tabs in formatting 2016-10-18 13:09:42 -07:00
Stephen Birarda
f8e0d7ad88 move QWebEngine classes to ui library 2016-10-18 12:53:32 -07:00
Andrew Meadows
ecc6cb49ae more correct hitFraction adjustments 2016-10-18 11:42:31 -07:00
Stephen Birarda
c4cec8eb1e use desktop profile again, move classes to networking subdir 2016-10-18 10:22:31 -07:00
Stephen Birarda
a45677c2a2 mark intercept override, only add header for HTTPS 2016-10-18 10:03:46 -07:00
Brad Hefta-Gaub
0d48eb55b9 Merge pull request #8835 from zzmp/fix/entity-del-deadlock 
fix deadlock when removing tablet
 2016-10-18 01:21:55 -07:00
Brad Hefta-Gaub
13e5c31d0d Merge pull request #8829 from jherico/gpu_leak 
Fix GPU buffer leak in geometry cache / overlays
 2016-10-18 01:12:44 -07:00
Chris Collins
a9dd31f59d Merge pull request #8833 from jherico/gpu_stats 
Add GPU buffer and texture current counts to the main stats display
 2016-10-17 21:03:23 -07:00
Andrew Meadows
6f5f6d2493 adding ray shotgun scan for avatar motion 
using the shotgun scan results to deterimine if slope is walkable
 2016-10-17 17:58:52 -07:00
Brad Davis
99ed7ac08c Fix shutdown crash (hopefully) 2016-10-17 17:38:10 -07:00
howard-stearns
7a3c14683e switchable placeholder for domain-connection failure, currently a modal 2016-10-17 14:50:46 -07:00
Zach Pomerantz
95eb52ad17 bail early when removing entity focus 2016-10-17 14:02:22 -07:00
Brad Davis
1e9c369660 Add GPU buffer and texture current counts to the main stats display 2016-10-17 14:02:14 -07:00
Chris Collins
f1b2dd8b1a Merge pull request #8825 from howard-stearns/recover-from-cancelled-snapshot-directory 
check for empty snapshot dir, and default to temp
 2016-10-17 13:21:58 -07:00
Brad Hefta-Gaub
dcab5a5dbc fix unix warning 2016-10-17 13:12:24 -07:00
Brad Hefta-Gaub
c575e19b81 more CR feedback 2016-10-17 13:09:10 -07:00
Brad Davis
dde79ef3c5 Fix GPU buffer leak in geometry cache / overlays 2016-10-17 12:22:20 -07:00
Brad Hefta-Gaub
d5c87a0db6 CR feedback 2016-10-17 12:02:23 -07:00
Stephen Birarda
edc83f547b only add token for HFWebEngineProfile if present 2016-10-17 11:34:37 -07:00
Stephen Birarda
b4b5c648c2 use a QWebEngineProfile request interceptor for auth in HTTP header 2016-10-17 11:34:37 -07:00
Stephen Birarda
89a4bc8434 add custom QWebEngine request interceptor 2016-10-17 11:34:10 -07:00
Brad Hefta-Gaub
d46170bec0 auto shutdown of sandbox when interface quits 2016-10-17 07:55:24 -07:00
Howard Stearns
baea0f5cb0 create a directory chooser that works in hmd, and use it 2016-10-16 17:27:51 -07:00
Howard Stearns
615325c17f check for empty snapshot dir, and default to temp 2016-10-16 12:25:32 -07:00
Andrew Meadows
72ad974b3e improved shape prevents avatar walking up walls 2016-10-15 16:00:02 -07:00
Anthony J. Thibault
81db8f7e08 Merge branch 'master' into out-of-body-experience 2016-10-13 17:27:15 -07:00
Chris Collins
90b283f83b Merge pull request #8806 from huffman/fix/atp-script-cache 
Update ScriptCache to clear ATP assets when disconnected from a domain
 2016-10-13 16:30:29 -07:00
Ryan Huffman
decb94b719 Update ScriptCache to clear ATP assets when disconnected from a domain 2016-10-13 14:05:53 -07:00
Brad Hefta-Gaub
0e1b377227 Merge pull request #8785 from jherico/oculus_crash 
Additional plugin debugging, better plugin resource cleanup
 2016-10-13 13:54:34 -07:00
Brad Hefta-Gaub
37e58d123e Merge pull request #8793 from AndrewMeadows/recenter-above-ground2 
prevent avatar from recentering below ground
 2016-10-13 13:50:06 -07:00
Chris Collins
7ec1e05165 Merge pull request #8791 from hyperlogic/bug-fix/avatar-hold-action-deadlock-fix 
Deadlock fix in avatar grab action.
 2016-10-13 13:48:28 -07:00
Anthony J. Thibault
f0dba9e766 Prevent crash on exit. 
If you or another user begins to near-grab an object while you exit the application, you might run into this crash.
The PhysicalEntitySimulation has a list of AvatarHoldActions shared_ptr's.
When it is destroyed, via the Application destructor, it will release these pointers.
This in turn will invoke a AvatarHoldAction destructor, which attempts to reference the AvatarManager via the DependencyManager.
However at this point the AvatarManager has already been destroyed, leading to a null dereference.

The fix is to check the AvatarManager pointer first.
 2016-10-12 16:29:05 -07:00
Andrew Meadows
d54c07ed14 Merge 'master' into 'out-of-body-experience' 2016-10-12 13:35:27 -07:00
Andrew Meadows
867fc3ccbf prevent avatar from recentering below ground 2016-10-12 13:23:44 -07:00
Anthony J. Thibault
ba4c356d7f Deadlock fix in avatar grab action. 
Reverse the order we acquire the entityTree & holdActions locks, to avoid deadlocks when the network thread also acquires them.
The network thread does this when hold actions from other avatars are received.
 2016-10-12 11:05:19 -07:00
Atlante45
d5429e76da Warnings fixes and cleanup 2016-10-12 10:20:19 -07:00
Atlante45
eaca3b672f Switch to JSON for application settings 2016-10-12 10:20:19 -07:00
Brad Davis
28771cbda9 Additional plugin debugging, better plugin resource cleanup 2016-10-11 19:40:02 -07:00
Andrew Meadows
ef465d4443 prevent avatar from recentering below ground 2016-10-11 16:37:29 -07:00
Andrew Meadows
abb05bc686 Merge pull request #8753 from ctrlaltdavid/21068 
Improve indication of user not being logged in
 2016-10-11 10:40:37 -07:00
Andrew Meadows
55c90e7bca Merge branch 'master' into out-of-body-experience 2016-10-07 15:18:08 -07:00
Ryan Huffman
c995e51128 Fix compilation bugs in Application 2016-10-07 10:30:18 -07:00
Ryan Huffman
b839926396 Remove unnecessary lambda for location initialization on startup 2016-10-07 10:30:18 -07:00
Ryan Huffman
9ddeda389e Update initial run logic 2016-10-07 10:30:18 -07:00
Ryan Huffman
20b93a7afa Add redirection to entry on first turn if you don't have Vive 2016-10-07 10:30:18 -07:00
Ryan Huffman
216cf2b4bc Update tutorial to work with HMD + Hand Controllers only 2016-10-07 10:30:18 -07:00
Ryan Huffman
1699299de9 Fix location that server content version is looked for 2016-10-07 10:30:18 -07:00
Ryan Huffman
37096910fc Fix tutorial begin location 2016-10-07 10:30:18 -07:00
Ryan Huffman
9c7ea6ac7c Update logic for going to tutorial on launch 2016-10-07 10:30:18 -07:00
Ryan Huffman
1e0772d613 Remove unused variable 2016-10-07 10:30:18 -07:00
Ryan Huffman
4c3cb83d47 Set default preferred device to vive and rift 2016-10-07 10:30:18 -07:00
Ryan Huffman
9f53652dfb Add routing of new users to tutorial 2016-10-07 10:30:18 -07:00
Ryan Huffman
54498a8f3f Add the ability to ignore invisible entities in findRayIntersection 2016-10-07 10:30:18 -07:00
Howard Stearns
3a294e77d4 Merge pull request #8745 from huffman/feat/new-help-window 
Update the help window
 2016-10-07 10:01:47 -07:00
David Rowe
c76bb01359 Make Interface title say if user not logged in 2016-10-07 15:39:46 +13:00
David Rowe
e2e762f9e7 Merge branch 'master' into 21055 
Conflicts:
	interface/resources/qml/AddressBarDialog.qml
 2016-10-07 11:27:35 +13:00
Ryan Downe Karpf
877d62069e Merge pull request #8750 from ctrlaltdavid/21066 
QA READY: Improve address bar address entry
 2016-10-06 14:45:25 -07:00
Chris Collins
80ecf88935 Merge pull request #8731 from huffman/feat/interface-run-server 
Add flag to interface to have it start the sandbox server
 2016-10-06 09:18:41 -07:00
David Rowe
a347936b68 Fix location not being updated after using back and forwards buttons 2016-10-06 16:47:49 +13:00
Anthony J. Thibault
b0c7564b60 Fix for debug assert in glm::lerp() 2016-10-05 18:06:49 -07:00
Anthony J. Thibault
2fdd5e4368 Build fixes for change in getMyAvatar() from DepenencyManager 
It now returns a smart_ptr, not a raw pointer.
 2016-10-05 17:57:48 -07:00
Anthony J. Thibault
cc7a6ada38 Merge branch 'master' into out-of-body-experience 2016-10-05 17:16:39 -07:00
Chris Collins
bc6797fc3a Merge pull request #8733 from zzmp/fix/audio-channel-swap 
fix intermittent channel swapping
 2016-10-05 15:54:25 -07:00
David Rowe
1a745094e2 Merge branch 'master' into 21055 
Conflicts:
	libraries/entities-renderer/src/RenderableWebEntityItem.cpp
	libraries/gl/src/gl/OffscreenQmlSurface.h
 2016-10-06 09:29:09 +13:00
Zach Pomerantz
afce8c4a45 STEREO_FACTOR -> AudioConstants::STEREO 2016-10-05 13:02:28 -07:00
Clément Brisset
d18394f249 Merge pull request #8596 from huffman/feat/my-avatar-self-id 
Add ability to parent overlays to MyAvatar for use across servers
 2016-10-05 12:03:01 -07:00
Clément Brisset
3f64847888 Merge pull request #8726 from huffman/feat/model-overlay-hide-change-textures 
Fix model overlay visibility and texture properties
 2016-10-05 11:54:11 -07:00
Howard Stearns
32db63e177 Merge pull request #8737 from highfidelity/domain-check 
Domain check
 2016-10-05 08:47:27 -07:00
Brad Hefta-Gaub
415b492c8c Merge pull request #8715 from jherico/offscreen_fences2 
Support external GL textures with proper fencing
 2016-10-05 05:13:06 -07:00
Ryan Huffman
ff8f45d36c Fix application directory path 2016-10-04 16:47:59 -07:00
Ryan Huffman
224c35d568 Clean up launch server in main.cpp 2016-10-04 16:47:59 -07:00
Ryan Huffman
0aba1d3e54 Fix server arguments causing crash on startup 2016-10-04 16:47:58 -07:00
Ryan Huffman
fe6382d1b6 Update server content path to be relative 2016-10-04 16:47:58 -07:00
Ryan Huffman
392ecb0dae Update interface to launch server 2016-10-04 16:47:58 -07:00
Ryan Huffman
847a5cc7a1 Remove old texture setting code in ModelOverlay 2016-10-04 16:25:48 -07:00
Ryan Huffman
93d995a5ae Fix model overlay visible not working 2016-10-04 16:25:40 -07:00
Ryan Huffman
c683c82817 Fix setting textures in model overlays 2016-10-04 16:24:43 -07:00
Anthony J. Thibault
aab974e6ae Merge branch 'master' into out-of-body-experience 2016-10-04 11:17:52 -07:00
Anthony Thibault
60aff44f33 Merge pull request #8717 from hyperlogic/bug-fix/near-grab-lag-fix 
Remove frame lag and jitter from near grabbed physical objects.
 2016-10-04 11:14:22 -07:00
Anthony J. Thibault
dcd425a165 Add an entityTree lock around the AvatarHoldAction::lateAvatarUpdate calls 2016-10-04 10:56:44 -07:00
Brad Davis
8c5028158f Fix crash on destroying web entities and overlays 2016-10-03 18:02:21 -07:00
Brad Davis
ca3572f991 Support external GL textures with proper fencing 2016-10-03 17:09:10 -07:00
Anthony J. Thibault
327fcc970b Remove frame lag from near grabbed physical objects. 
In the game loop, physics occurs before avatar update.
Before this PR, when the avatar is moved during avatar update, near grabbed objects will not pick up this move until one frame later, when
the physics is run on the next update.

After this PR, near grabbed objects are adjusted to reflect any position or rotation change that occurred during the avatar update.
 2016-10-03 16:01:54 -07:00
Ryan Huffman
b5eb943c1d Add hmd stats to stats event 2016-10-03 15:12:14 -07:00
Ryan Huffman
dafb5c5bab Add processor information to launch user activity event 2016-10-03 15:11:56 -07:00
David Rowe
caf1a93354 Merge branch 'master' into 21055 
Conflicts:
	libraries/entities-renderer/src/RenderableWebEntityItem.cpp
 2016-10-04 10:51:14 +13:00
howard-stearns
4fcddfdf2b Merge branch 'davidkelly-dk/triggerMenuInScriptPlus' into domain-check 2016-10-03 13:02:32 -07:00
howard-stearns
0809484e33 Merge branch 'dk/triggerMenuInScriptPlus' of https://github.com/davidkelly/hifi into davidkelly-dk/triggerMenuInScriptPlus 2016-10-03 13:01:51 -07:00
David Rowe
4818ad2615 Merge branch 'master' into 21055 2016-10-04 08:46:30 +13:00
samcake
0189e3aea7 Github is borked ? 2016-10-03 11:29:17 -07:00
samcake
5adedbbb8b replace the simple log by a unique log 2016-10-03 11:27:15 -07:00
samcake
0df69b8e15 Protecting the usage of the defaultSkyboxTexture in case its creation has failed to avoid crash on the first usage, removing an uncorrect assert in GL45BackendTexture that would trigger in debug 2016-10-03 10:06:58 -07:00
Clément Brisset
becee3bba3 Merge pull request #8685 from thoys/ac-fixes 
Assignment Client fixes
 2016-09-30 11:05:58 -07:00
David Kelly
621e3fc000 Expose triggerOption to scripts, plus _physicsEnabled 
Now any menu item can be triggered.  Plus you can do a
Window.isPhysicsEnabled to detect when we are done loading assets and
such.  Whee!
 2016-09-30 09:06:17 -07:00
Anthony J. Thibault
eccd01e88f Merge remote-tracking branch 'upstream/master' into out-of-body-experience 2016-09-29 16:36:25 -07:00
Thijs Wenker
3d14a32d17 fix controller::ScriptingInterface not found warning in AC 2016-09-29 22:11:12 +02:00
Andrew Meadows
d29386c43f better tracking of avatar gravity setting 2016-09-29 11:14:19 -07:00
Brad Hefta-Gaub
38eccd32a8 add developer menu support to enable/disable dynamic texture management 2016-09-29 10:18:54 -07:00
David Rowe
f8572096b1 Merge branch 'master' into 21055 2016-09-28 20:00:04 +13:00
Anthony J. Thibault
62dc250237 removed DebugDraw calls 2016-09-27 16:48:15 -07:00
Anthony J. Thibault
961d262df1 Improved body follow behavior 
* follow helper lean re-centering / reconciliation now modifies bodySensorMatrix, NOT the character controller.
* The character controller now always follows the bodySensorMatrix (in world space).

This decouples the lean re-centering velocity from the velocity used to move the character controller.
We can now independently tune these things separately.
 2016-09-27 16:38:48 -07:00
Zach Pomerantz
b9c4018b8e expose AudioStats to qml/js 2016-09-26 15:35:29 -07:00
Anthony J. Thibault
0a72805874 Tuned transition from idle to back to reduce foot sliding 2016-09-26 10:41:16 -07:00
Anthony J. Thibault
203ff95849 Animation tuning to reduce foot sliding. 
* Navigation walk speed has been reduced
* Tuned IdleToWalk timescale and interp time to reduce foot sliding
* Tuned fwd, back and lateral characteristicSpeeds to better match the
  animations.  This reduces foot sliding when moving forward and backward.
* Reduced rig state machine hysteresis to 1/60th of a second.
 2016-09-26 09:59:50 -07:00
Anthony Thibault
10c5da5728 Smooth transition of hands from in-body to out-of-body modes. 2016-09-24 14:28:56 -07:00
Anthony Thibault
27e6c0f872 Added debug draw path trace for left and right feet 2016-09-24 13:01:16 -07:00
Anthony J. Thibault
f4c4b3474b capsule projection and distance tests now work for non-vertical capsules 2016-09-23 16:55:38 -07:00
Anthony J. Thibault
9567ec11af Prevent character from walking when pinned against collision. 
This is fixed by using the pre-action velocity from CharacterController, which does not include any motors or follow velocity.
This pre-action velocity reflects the actual rigid body velocity after collision constraints are resolved.

This should prevent the character f
 2016-09-23 15:22:52 -07:00
Chris Collins
be33524990 Merge pull request #8636 from zzmp/clean/audio-config 
strip unused audio settings, hide the rest
 2016-09-23 15:08:48 -07:00
Zach Pomerantz
277eefafd7 remove the audio stats dialog 2016-09-23 14:39:07 -07:00
Zach Pomerantz
d0f4a29031 Merge branch 'master' of github.com:highfidelity/hifi into fix/local-audio-injection 2016-09-23 13:12:39 -07:00
Zach Pomerantz
a9318d052b Merge branch 'master' of github.com:highfidelity/hifi into clean/audio-config 2016-09-23 13:11:52 -07:00
Brad Davis
f33d3a3b36 Migrate logging functionality to shared library 2016-09-23 12:04:58 -07:00
Brad Davis
a7f0ba24ed Dynamic texture memory management 2016-09-23 12:04:42 -07:00
Anthony J. Thibault
b68dbab994 Fix for incorrect hand offset when backing into collision. 
We know properly account for the offset of the head due to clamping from a small maxHipsOffset.
This means the hands should look more natural when you are out-of-body and are moving your hand controllers.
 2016-09-23 11:47:44 -07:00
Anthony J. Thibault
98ffea2fb9 Merge branch 'master' into out-of-body-experience 2016-09-22 18:08:23 -07:00
Andrew Meadows
06ff984f90 sky-hook for walking up steps 2016-09-22 09:48:59 -07:00
Brad Hefta-Gaub
5d3d4bdbd9 add support for redirection on domain at max capacity 2016-09-21 18:12:38 -07:00
Zach Pomerantz
e2ff738fc3 strip unused audio settings 
- remove parameters on the jitter buffer algorithm, these are now static
- remove parameters on the output starve detection algorithm, now static
- move interface audio settings to the Developer menu
 2016-09-21 17:35:27 -07:00
Zach Pomerantz
9e2ec27b29 always play audio injectors locally 2016-09-21 17:20:51 -07:00
Ken Cooke
b14f43b11e Merge pull request #8610 from zzmp/test/audio-jitter 
add audio jitter simulator testing tool
 2016-09-21 16:43:36 -07:00
Anthony J. Thibault
1f7dc25f12 MyAvatar.addThrust() works again. 2016-09-21 11:48:54 -07:00
Anthony J. Thibault
4c99848f29 disable vertical re-centering behavior 2016-09-20 17:05:01 -07:00
Anthony J. Thibault
4afd60f22a Flying behavior now works again 2016-09-20 16:01:39 -07:00
Seth Alves
2468b56079 Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard 2016-09-20 13:28:20 -07:00
Andrew Meadows
7258835f3f restore orientation from physics to Avatar 2016-09-20 09:14:11 -07:00
Andrew Meadows
59e6ca8f8d avatar follows HMD using velocity motor 2016-09-20 08:29:55 -07:00
Andrew Meadows
8dd5c9b92b fix kinematic motion for ground and hover 2016-09-20 08:29:55 -07:00
Andrew Meadows
80b970f2d9 adding MyAvatar::_canonicalScale, but not used yet 2016-09-20 08:29:55 -07:00
Andrew Meadows
e6d40e6e4d Merge pull request #8625 from hyperlogic/bug-fix/oobe-desktop-motor-fix 
Fixed motor velocity
 2016-09-19 17:04:54 -07:00
Anthony J. Thibault
6f0acb3826 Fixed motor velocity in HMD mode 2016-09-19 16:56:36 -07:00
Anthony J. Thibault
a028d3ba58 Remove hacks for debug rendering of IK targets 
A AnimContext class was introduced.  This context is passed into every node during evaluation/overlay.
It holds non-animVar "global" data passed from the application.
 2016-09-19 15:03:46 -07:00
Brad Hefta-Gaub
fd474f6319 add basic support for master vs stable builds 2016-09-19 14:14:32 -07:00
Chris Collins
3d9f231543 Merge pull request #8609 from zzmp/fix/audio-stats 
fix audio network stats
 2016-09-19 09:08:35 -07:00
Andrew Meadows
c77f6a7c16 Merge pull request #8614 from hyperlogic/out-of-body-experience 
Turn and drive the HMD with linear velocity
 2016-09-16 15:43:29 -07:00
Andrew Meadows
20418d5f58 fix hips sweep test 2016-09-15 18:39:57 -07:00
Zach Pomerantz
bbbe070af1 bring audio network latencies to standard 2016-09-15 18:19:58 -07:00
Zach Pomerantz
5b03d3e13d render audio network stats immediately 2016-09-15 18:19:57 -07:00
Zach Pomerantz
177466e4c7 calculate unplayed ms on all streams/buffers as max 2016-09-15 17:54:41 -07:00
Anthony J. Thibault
c7caf9fe06 Turn and drive the HMD with linear velocity 2016-09-15 17:08:36 -07:00
Andrew Meadows
83157b573a measure max hips offset and clamp it in IK 2016-09-15 14:55:04 -07:00
Zach Pomerantz
53f5899a69 add audio jitter simulator 2016-09-15 14:51:39 -07:00
Anthony J. Thibault
d51898f60d Merge branch 'out-of-body-experience' of github.com:highfidelity/hifi into out-of-body-experience 2016-09-15 14:23:38 -07:00
Zach Pomerantz
9792d025fa clean up audio stats 2016-09-15 13:09:06 -07:00
Seth Alves
d67701f7bb new logging category for deadlock debug prints 2016-09-15 13:02:18 -07:00
Andrew Meadows
821570fa76 fix Windows build and minor format/namechange 2016-09-15 09:32:03 -07:00
Seth Alves
4470338663 catagorize some qDebugs 2016-09-14 21:39:45 -07:00
Andrew Meadows
f5c5c68937 adding kinematic character controller demo 2016-09-14 11:43:52 -07:00
Seth Alves
59db640cb5 add explaining comment 2016-09-14 11:33:03 -07:00
Seth Alves
8734661a0e add explaining comment 2016-09-14 11:28:22 -07:00
Seth Alves
e5e9bb0052 Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments 2016-09-14 11:28:10 -07:00
Seth Alves
e6a1c14de6 Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard 2016-09-14 09:43:19 -07:00
Ryan Huffman
e506491026 Remove blank lines 2016-09-13 16:35:13 -07:00
Ryan Huffman
23450e929b Add special avatar id for attaching overlays 2016-09-13 16:33:58 -07:00
Anthony J. Thibault
bc130eaf26 ramp support with comfort mode option 2016-09-13 16:26:10 -07:00
Anthony J. Thibault
0fde3a2d76 Fix for TRUNCATE_IK_CAPSULE globals 2016-09-13 10:26:38 -07:00
Anthony J. Thibault
362e185098 Revert "When out-of-body have your avatar face toward your HMD." 
This reverts commit ffb1bae1f0.
 2016-09-13 09:54:19 -07:00
Andrew Meadows
954d690b8a expose setting avatar collisionless 2016-09-12 16:24:08 -07:00
Anthony J. Thibault
ffb1bae1f0 When out-of-body have your avatar face toward your HMD. 2016-09-12 16:20:13 -07:00
David Rowe
fe8b3b4d0d Merge branch 'master' into 21040 2016-09-13 09:12:47 +12:00
Anthony J. Thibault
baee5180c1 Moved outOfBody detection into MyAvatar::FollowHelper 
in preparation for different follow behavior for in-body and out-of-body.
 2016-09-12 11:52:27 -07:00
Anthony J. Thibault
5e0c2286ec Use OUTOFBODY_HACK as searchable token 2016-09-12 10:58:06 -07:00
Seth Alves
51fe9b2a80 Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard 2016-09-12 09:59:19 -07:00
Howard Stearns
b949c83a05 remove jpg error popup behavior 2016-09-10 11:18:14 -07:00
Anthony J. Thibault
86351ca21c Teleport bugs 
* made HMD.setPosition thread safe
* changed script to use HMD.position = foo;
 2016-09-09 17:32:02 -07:00
Andrew Meadows
97623f489c expose setting HMD sensorToWorld from JS script 2016-09-09 16:32:57 -07:00
Andrew Meadows
0f248c4540 expose MyAvatar::setSensorToWorldMatrix() 2016-09-09 16:31:36 -07:00
Brad Hefta-Gaub
258c83f864 Merge pull request #8551 from jherico/texture_load_test_pbo 
Stuttering: Sparse Textures
 2016-09-09 13:47:27 -07:00
Anthony J. Thibault
7e7803c648 Added developer option to draw IK targets in world. 2016-09-09 12:50:34 -07:00
Brad Hefta-Gaub
dbf29ba79d Merge pull request #8569 from jherico/gli 
Stuttering: Upgrade GLM & add GLI integration
 2016-09-09 12:11:08 -07:00
Seth Alves
f6398315b1 avoid a crash-on-exit 2016-09-09 11:48:14 -07:00
Brad Davis
ecfe56085d GLM update and GLI integration 2016-09-09 10:18:15 -07:00
Brad Hefta-Gaub
fddbeb6d11 Merge pull request #8588 from zzmp/test/audio-jitter 
add a test for audio jitter in DEV/PR builds
 2016-09-09 10:17:34 -07:00
David Rowe
ce58edc4e0 Add frustum property to JavaScript Camera object 2016-09-09 18:56:05 +12:00
Brad Davis
bc6b43b7be Add debug option to lower texture resolution 2016-09-08 22:19:17 -07:00
Brad Hefta-Gaub
b56ad737d4 Merge pull request #8567 from hyperlogic/feature/tablet-ui-foundation 
Web Entities Virtual Keyboard + Event Bridge support
 2016-09-08 18:36:46 -07:00
Brad Hefta-Gaub
3d54600843 Merge pull request #8513 from Atlante45/feat/network-port 
Add settings to change local port
 2016-09-08 18:10:32 -07:00
Zach Pomerantz
e785c0cdf8 add test for audio jitter 2016-09-08 17:50:11 -07:00
Andrew Meadows
bc56df0be1 out-of-body with reduced recovery speeds 2016-09-08 14:31:31 -07:00
Seth Alves
624cc655dd disable code that backs-up in time to pick release velocity 2016-09-07 13:24:53 -07:00
Anthony J. Thibault
dc0d0c2d5c Merge branch 'master' into feature/tablet-ui-foundation 2016-09-07 09:49:55 -07:00
SamGondelman
99176588cc remove old webwindowclass that relied on qwebkit 2016-09-06 17:36:59 -07:00
SamGondelman
716647037e removed unused code 2016-09-06 17:36:54 -07:00
SamGondelman
9d447d4dcc enabled qnetworkrequest redirects everywhere I could find them 2016-09-06 17:35:06 -07:00
Brad Davis
20deae3242 Working on Qt 5.6 compatibility 2016-09-06 17:35:04 -07:00
Atlante45
eb007b24cd Use invalid port to signal no value passed 2016-09-06 11:59:07 -07:00
Atlante45
9f07511fd8 Move setter to LimitedNodeList 2016-09-06 10:18:42 -07:00
Atlante45
fcf44911a3 Fix Windows warning 2016-09-06 10:18:42 -07:00
Atlante45
a8de6f0a57 Add settings to change local port 2016-09-06 10:18:42 -07:00
Seth Alves
37db1cba26 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-09-06 09:38:44 -07:00
Anthony J. Thibault
9122a33fff only raise the webEntity virtual keyboard in HMD mode 2016-09-02 16:53:40 -07:00
Seth Alves
342f7edff3 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-09-02 16:12:41 -07:00
Brad Davis
94210d2e69 Use dynamic count for global thread pool 2016-09-02 15:23:35 -07:00
Brad Davis
91bfa7677c Updating stats display for threaded rendering 2016-09-02 14:41:49 -07:00
Seth Alves
25f6e1d79d Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-09-01 15:06:52 -07:00
Brad Hefta-Gaub
b3e5e21f40 Merge pull request #8559 from birarda/android-interface 
create a foundation for interface target compile on android
 2016-09-01 13:10:45 -07:00
Seth Alves
1a9f43cb67 fix AvatarActionHold's idea of where the controllers are when the avatar has been scaled 2016-09-01 12:17:34 -07:00
Seth Alves
dc31525794 remove some left-over code 2016-08-31 16:39:57 -07:00
Seth Alves
280b603747 remove some leftover code 2016-08-31 16:30:51 -07:00
Seth Alves
74dc2ce493 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-08-31 16:26:21 -07:00
Chris Collins
02afa460ff Merge pull request #8557 from jherico/location_bar 
Don't show address bar when starting up in a connected state
 2016-08-31 16:03:37 -07:00
Brad Davis
b9a97712d5 Don't show address bar when starting up in a connected state 2016-08-31 15:17:57 -07:00
Stephen Birarda
feef76cbab add tools, no plugins, add InterfaceActivity 2016-08-31 11:31:07 -07:00
Zach Pomerantz
441005bba0 use existing defaults for zoneless keylight 2016-08-31 09:47:53 -07:00
Zach Pomerantz
372c52fea5 restore default ambient skybox 2016-08-30 17:07:34 -07:00
Seth Alves
cdd08bd38e more anti-jitter changes 2016-08-30 14:59:30 -07:00
Seth Alves
78f54a7f33 get rid of some jitter in equipped items. do a better job of deciding when something equipped has been torn-away 2016-08-30 14:39:11 -07:00
Seth Alves
5bda94b2ba use same data as used for drawing show-hand-targets for controller joints in MyAvatar 2016-08-30 12:39:30 -07:00
Seth Alves
2a9ffc1529 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-08-30 10:26:14 -07:00
Stephen Birarda
74fac8c7c9 Merge pull request #8512 from birarda/shareable-address 
add shareable address from default name, leverage for steam join/invite
 2016-08-30 09:35:24 -07:00
Seth Alves
87fbbd68ae Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-08-29 17:37:58 -07:00
Brad Hefta-Gaub
f3d157c396 Merge pull request #8500 from jherico/gl_context 
Custom OpenGL context creation
 2016-08-29 16:22:21 -07:00
Howard Stearns
a1ae9eebf2 Merge pull request #8534 from howard-stearns/silence-address-bar-log-warning 
Silence address bar log warning
 2016-08-29 11:48:43 -07:00
Brad Davis
617633b85c Moving to custom context creation 2016-08-29 11:21:54 -07:00
howard-stearns
01af8899bf silence address bar dialog qml warning 2016-08-29 10:47:22 -07:00
Seth Alves
178a68c967 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-08-29 10:21:07 -07:00
Seth Alves
3fb10d0eea action for arrow flight, etc 2016-08-28 19:08:13 -07:00
Seth Alves
76b72e32f0 Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers 2016-08-27 09:06:45 -07:00
Brad Davis
587d015c57 Give names to offscreen contexts for easier debugging 2016-08-26 19:09:26 -07:00
Brad Hefta-Gaub
3d6691f3d1 Merge pull request #8527 from zzmp/fix/skybox-default-color 
fix skybox default
 2016-08-26 15:14:44 -07:00
Seth Alves
9394a25a1c remove some anti-jitter code that was doing more harm than good 2016-08-26 12:47:19 -07:00
Seth Alves
9884426ad8 replace debugging aborts with asserts 2016-08-26 06:13:33 -07:00
Seth Alves
174a95a005 do some hokey pokey to avoid jitter of held entities while walking 2016-08-25 18:49:47 -07:00
Seth Alves
3b278adba3 Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers 2016-08-25 17:28:18 -07:00