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
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
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
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
Anthony J. Thibault
839b1a3c5e
Added some jsdoc comments to the C++ source
2016-11-09 18:09:10 -08: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
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
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
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
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
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
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
