Anthony J. Thibault
8b99fa90e8
Merge branch 'master' into tablet-ui
2016-12-15 13:28:23 -08:00
samcake
7a29dbe7d4
Merge pull request #9207 from zzmp/feat/render-forward-empty
...
Forward render task (empty and only used with RENDER_FORWARD set)
2016-12-15 09:57:18 -08:00
Seth Alves
4494edae33
Merge pull request #9210 from zfox23/FB_2591
...
FB 2591: Taking simultaneous GIF snapshots crashes Interface
2016-12-15 07:01:58 -08:00
Seth Alves
26639aac15
Merge pull request #8789 from Atlante45/fix/settings
...
Use JSON for application Settings
2016-12-15 07:00:46 -08:00
Atlante45
bfc789f072
CR - CLI text
2016-12-14 15:44:00 -08:00
Atlante45
0dec97fc03
Make Steamworks a plugin
2016-12-14 15:37:49 -08:00
Anthony J. Thibault
d4f9d21ce8
Pass tablet QQuickItem to TabletScriptingInterface
...
Also, moved TabletScriptingInterface to script-engine library for easy access, baby.
2016-12-14 14:04:48 -08:00
Zach Fox
c53111781b
Fix the bug
2016-12-14 12:17:00 -08:00
Anthony J. Thibault
db0b2ba7d3
Fleshing out TabletScriptingInterface.
...
Added TabletProxy and TabletButtonProxy
2016-12-14 12:08:41 -08:00
Anthony J. Thibault
d94da76b72
Added TabletScriptingInterface
2016-12-14 12:08:40 -08:00
Zach Pomerantz
bbb7229392
skip graphics config if not in engine
2016-12-13 20:47:28 -05:00
Brad Hefta-Gaub
e3bc49c302
drop avatar data rate to 45hz
2016-12-13 16:51:59 -08:00
Zach Pomerantz
bc59be12ef
create flagged forward render task
2016-12-13 19:19:30 -05:00
Stephen Birarda
b4f43e01b1
Merge pull request #9189 from huffman/feat/help-touch
...
Add support for oculus touch in help menu
2016-12-12 16:48:00 -08:00
Seth Alves
d97be52542
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2016-12-12 16:24:17 -08: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
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
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
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
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 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 efe9571ab8333e9ec7f4
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 934148fea5d2b32c3084
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 a69d77ffbe996d3f5875
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 119653bceba69d77ffbe
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
Ryan Jones
39e1a3fb44
add client-side test runner
2016-12-04 20:53:06 -08:00
Ryan Jones
3eecba77f2
working menu item
2016-12-03 19:34:38 -08: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
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
