Brad Davis
ee3c8e6efd
Merge pull request #9225 from jherico/chrome_tracing
...
Additional work on tracing
2016-12-16 17:53:55 -08:00
Brad Davis
2d73588361
Fix stat tracker missing in agents
2016-12-16 17:34:00 -08:00
Ryan Huffman
217d46704d
Update req tutorial version for Oculus Touch
2016-12-16 15:41:04 -08:00
Ryan Huffman
b9598a28f3
Update to only send users to tutorial if they have Vive or Touch
2016-12-16 15:05:17 -08:00
Ryan Huffman
188bf600d1
Fix oculus touch labels in tutorial
2016-12-16 15:05:17 -08:00
Ryan Huffman
46251e805a
Update oculus touch labels to be emissive
2016-12-16 15:05:17 -08:00
Ryan Huffman
46f5494af8
Fix emissive channel on touch models
2016-12-16 15:05:17 -08:00
Ryan Huffman
a1fea65aa5
Update right joystick mesh
2016-12-16 15:05:17 -08:00
Ryan Huffman
3df1819086
Fix right touch joystick
2016-12-16 15:05:17 -08:00
Ryan Huffman
cde558fb94
Update touch controller tips
2016-12-16 15:05:17 -08:00
Ryan Huffman
674bbe7de5
Add touch controller support to ControllerDisplay
2016-12-16 15:05:17 -08:00
Ryan Huffman
90e121ba47
Extend HMD scripting interface to check subdevices
2016-12-16 15:05:17 -08:00
Ryan Huffman
c953ceb58b
Add send-to-tutorial logic for Oculus Touch
2016-12-16 15:05:17 -08:00
samcake
1ded581895
Merge pull request #9217 from zzmp/feat/render-forward-bounds
...
Render bounds in Forward Render Task
2016-12-16 14:57:14 -08:00
howard-stearns
3adc78fecc
Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames
2016-12-16 14:16:06 -08:00
howard-stearns
49fd4216de
sessionDisplayName set at server and passed to all clients (including
...
oneself)
2016-12-16 14:15:20 -08:00
Brad Davis
30a9961362
tracing polish
2016-12-16 14:02:27 -08:00
Andrew Meadows
ee6a9f4506
adding profile stats relating to avatar CPU costs
2016-12-16 13:41:31 -08:00
Ryan Huffman
7bb2755913
Add chrome tracing support
2016-12-16 01:14:01 -08:00
David Rowe
9459b967be
Merge branch 'master' into 21089
2016-12-16 20:02:43 +13:00
David Rowe
9bf8f25ed0
Update from Seth
2016-12-16 16:11:27 +13:00
Brad Hefta-Gaub
8497ad1e29
Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer
2016-12-15 16:42:41 -08:00
David Rowe
9aaf55e6a3
Fix crash after manually closing Clara download status message box
2016-12-16 12:49:26 +13:00
Brad Hefta-Gaub
ed19b4b592
remove compression at the per avatar data buffer for now, since it gave no benefit
2016-12-15 14:13:38 -08:00
Howard Stearns
ba8b585368
Merge pull request #9202 from howard-stearns/pal-proto
...
People Action List prototype
2016-12-15 13:56:12 -08:00
David Rowe
b8114b29b2
Make manually closing message box code more correct
2016-12-16 09:47:11 +13:00
Zach Pomerantz
41f6990051
change render forward flag to HIFI_...
2016-12-15 14:53:51 -05: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
David Rowe
16418d52d2
Scale all imported Clara models to have max dimension of exactly 1m
2016-12-15 20:11:29 +13:00
David Rowe
349765ad74
Fix Clara download status message box not auto-closing
2016-12-15 16:00:07 +13:00
howard-stearns
ae4064f445
Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto
2016-12-14 17:04:52 -08:00
David Rowe
23b8bf7aab
Fix crashing if manually close Clara download status message box
2016-12-15 13:35:58 +13:00
Atlante45
588fdd6efa
Add steamworks to interface externals
2016-12-14 16:07:33 -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
David Rowe
eb293fb579
Increase resize timeout to 5 mins to improve the odds of model rezzing
...
Model needs to rez in order for its initial dimensions to be obtained
from FBX.
2016-12-15 12:26:53 +13:00
David Rowe
c82cceccac
Rescale models if necessary to have their largest dimension be 1m
...
Models are still rescaled beforehand if thought to be in cm.
2016-12-15 12:25:56 +13:00
David Rowe
dbd00e39a8
Handle unzip failure
2016-12-15 11:52:34 +13:00
David Rowe
fa6f121ff2
Missing comment close
2016-12-15 11:51:28 +13:00
David Rowe
b55c558f96
Initial fix for detaching tablet UI
2016-12-15 11:11:40 +13:00
David Rowe
17c54a5fae
Log requested ATP mapping of model upload
2016-12-15 10:01:19 +13:00
David Rowe
5af57d7bbc
Don't make downloaded Clara.io models dynamic
2016-12-15 09:38:06 +13:00
Zach Fox
c53111781b
Fix the bug
2016-12-14 12:17:00 -08:00
Brad Hefta-Gaub
2290179281
add compression and minimal data flags to AvatarData
2016-12-14 11:47:45 -08:00
David Rowe
934f48362a
Rework Clara.io download user messaging to have no user interaction
2016-12-14 22:23:25 +13:00
Brad Hefta-Gaub
a7750501c6
first cut at adding view frustum support to avatar mixer
2016-12-13 18:58:11 -08:00
Zach Pomerantz
bbb7229392
skip graphics config if not in engine
2016-12-13 20:47:28 -05:00
David Rowe
2b0529bcea
Inform user if can't do Clara.io download because can't write to ATP
2016-12-14 14:45:33 +13:00
David Rowe
d546b69daf
Add scriptEvent message to web3d overlay event bridge
2016-12-14 14:30:02 +13:00
howard-stearns
4503855ae8
don't keep selection while things are disappearing
2016-12-13 17:00:24 -08:00
howard-stearns
a50b731faa
fix broken search for myself
2016-12-13 16:52:18 -08:00
Brad Hefta-Gaub
e3bc49c302
drop avatar data rate to 45hz
2016-12-13 16:51:59 -08:00
howard-stearns
773bbc4ef1
update canKick whenever we get new data, instead of just at first use.
2016-12-13 16:30:16 -08:00
howard-stearns
00653b6b19
missing the ban button
2016-12-13 16:23:43 -08:00
Zach Pomerantz
bc59be12ef
create flagged forward render task
2016-12-13 19:19:30 -05:00
howard-stearns
03d3e0b550
Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto
2016-12-13 16:03:00 -08:00
Brad Hefta-Gaub
a2ba03284e
Merge pull request #9186 from ZappoMan/kinectPlugin
...
Kinect Plugin
2016-12-13 15:29:41 -08:00
howard-stearns
b0a69468d2
Don't show admin columns if you can't kick.
2016-12-13 15:16:18 -08:00
howard-stearns
adbfa0752a
no debug printing
2016-12-13 15:09:46 -08:00
howard-stearns
c9827d1521
checkpoint
2016-12-13 15:05:08 -08:00
howard-stearns
86010af828
checkpoint
2016-12-13 13:01:45 -08:00
howard-stearns
6fc27ac8d6
Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto
2016-12-13 09:39:51 -08:00
Howard Stearns
7c92ad5ced
checkpoint
2016-12-13 09:15:28 -08:00
David Rowe
2df7c189a2
Auto-close Clara model download progress box when model added to world
2016-12-14 01:22:47 +13:00
David Rowe
5344cc6155
Make Clara.io models grabbable and dynamic by default
2016-12-14 01:15:12 +13:00
David Rowe
20623ebddb
Raise and lower keyboard on password fields
2016-12-13 22:48:17 +13:00
David Rowe
c9a00e86d1
Fix model being left invisible if not auto-resized
2016-12-13 18:31:24 +13:00
David Rowe
ea7d84ec7d
Increase auto-resize timeout for Clara.io asset download from ATP
2016-12-13 17:55:44 +13:00
David Rowe
aefa116207
Add extra logging for Clara.io asset resizing
2016-12-13 17:55:22 +13:00
David Rowe
1f3045ad30
Merge branch 'master' into 21089
...
Conflicts:
interface/src/Application.cpp
2016-12-13 14:05:24 +13: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
Ryan Huffman
7c441ac3ee
Remove advanced controls from oculus help image
2016-12-12 16:45:52 -08:00
howard-stearns
712543a39a
Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto
2016-12-12 16:37:41 -08:00
howard-stearns
4b5aae3c55
pal prototype
2016-12-12 16:37:16 -08:00
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
Ryan Huffman
3e5d67f28b
Update oculus help image to swap menu buttons
2016-12-12 14:23:29 -08:00
Ryan Huffman
47c2af975b
Remove extraneous logging from help.html
2016-12-12 14:22:59 -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
Stephen Birarda
5111256a9e
resize the sign up dialog when showing errors
2016-12-12 13:04:14 -08:00
Stephen Birarda
a0663bdf31
fix resizing of LoginDialog and friends
2016-12-12 11:32:19 -08:00
Brad Hefta-Gaub
b57c1fe198
remove debug spam
2016-12-12 08:48:24 -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
Stephen Birarda
e4810a5643
Merge pull request #9179 from Atlante45/controller-mapping
...
Update Xbox controller mapping to have the menu on Start
2016-12-09 17:13:45 -08:00
Stephen Birarda
691ce4312e
fix resizing for keyboard changes in body loaded qml
2016-12-09 16:49:53 -08:00
Atlante45
5def039bd4
Swap start/back xbox controller mapping to conform to Oculus standard
2016-12-09 16:41:42 -08:00
Stephen Birarda
f0f10d837c
fix indents, fix resize for keyboard changes
2016-12-09 16:04:42 -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
David Rowe
a52d8d1982
Merge branch 'master' into 21089
2016-12-10 11:47:43 +13:00
Brad Hefta-Gaub
b6838c6ec4
more debugging
2016-12-08 23:32:03 -08:00
Brad Hefta-Gaub
4959a88581
first cut at kinect input plugin
2016-12-08 22:13:56 -08: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
Stephen Birarda
673e03aae4
add a spinner to sign up
2016-12-08 17:29:29 -08:00
Stephen Birarda
370de667d5
add a spinner to the login dialog
2016-12-08 17:23:39 -08:00
Stephen Birarda
396c2bc28f
add error for login after signup, fix link style
2016-12-08 17:00:47 -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
460d332c6f
Delete redundant code
2016-12-07 10:06:32 +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
Seth Alves
a04b486dfc
Merge pull request #9123 from druiz17/touchBug
...
fixed context menu showing up in the correct location with oculus touch
2016-12-06 10:34:00 -08:00
Bradley Austin Davis
f112d345e8
Add dead zone to yaw controls
2016-12-06 09:38:30 -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
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
