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

1601 commits

Author SHA1 Message Date
Zach Fox
af1c67a252 Progress! 2016-12-28 17:23:56 -08:00
Zach Fox
e26d347682 It seems to be working, minus removing from list 2016-12-28 15:15:39 -08:00
Zach Fox
46e8bf5283 First steps, holding off til Howard finishes 2016-12-28 15:12:21 -08:00
howard-stearns
768b747b3a Make avatar go away when ignored, even when pal is up. (But currently, it 
comes back!)
 2016-12-27 10:17:39 -08:00
howard-stearns
0ad9786f6b requestsDomainsListData 2016-12-27 10:14:20 -08:00
Zach Fox
72da05bb30 Merge pull request #9268 from zfox23/PalRefresh 
Add PAL refresh button
 2016-12-23 15:16:51 -08:00
David Kelly
68fb81902b Merge pull request #9261 from davidkelly/dk/workingVUMetersInPal 
Working VU meters in PAL
 2016-12-23 13:24:38 -08:00
David Kelly
5065f027e7 whitespace 2016-12-23 13:11:42 -08:00
Zach Fox
5490dddbbf Cool style changes! 2016-12-23 12:22:33 -08:00
Chris Collins
9bacab07e6 Merge pull request #9254 from PhilipRosedale/ambisonicRotation 
Ambisonic rotation
 2016-12-23 09:25:48 -08:00
David Kelly
9eed430f49 CR feedback 2016-12-22 18:09:19 -08:00
Zach Fox
f2bdbe051c Halve the volume 2016-12-22 16:35:12 -08:00
David Kelly
2e897e0cc9 Working first pass 
Seems roughly same as mic meter.  Works for other avatars, though
using agent avatars (crowd-agent.js + summon.js), seems not to work.

I'll investigate that...
 2016-12-22 14:01:03 -08:00
David Kelly
e67d6e347d Merge pull request #9253 from zfox23/PAL_QML_Updates 
PAL Visual Style Updates
 2016-12-22 10:21:27 -08:00
Dante Ruiz
61277c0605 Stylus now works in edit mode 2016-12-22 17:33:25 +00:00
Dante Ruiz
bf6178f500 diff minimize 2016-12-21 23:48:45 +00:00
Dante Ruiz
1753508f53 diff minimize 2016-12-21 23:31:00 +00:00
Dante Ruiz
5ed8831bee all hud buttons on tablet 2016-12-21 23:25:40 +00:00
Philip Rosedale
b02d14fcc2 set right thing initially 2016-12-21 13:17:08 -08:00
Philip Rosedale
632bf997f3 debug off 2016-12-21 13:15:44 -08:00
Philip Rosedale
cf3a260646 added ability to rotate entity and sound direction 2016-12-21 13:13:59 -08:00
Zach Fox
630fb8696f Lots of progress today 2016-12-21 12:48:26 -08:00
Zach Fox
7999e14ecf Kinda screwed things up by changing styles 2016-12-21 12:48:25 -08:00
Zach Fox
feafc16833 Frequent checkpoints are good. 2016-12-21 12:47:38 -08:00
Zach Fox
e7c2229b2c More progress 2016-12-21 12:46:23 -08:00
Brad Hefta-Gaub
e6a20102d4 debug window enhancements 2016-12-21 11:31:34 -08:00
Ryan Huffman
8b5a05c409 Fix right touch controller tip labels not showing up 2016-12-20 18:01:53 -08:00
Ryan Huffman
df0dfc761d Add ability to disable avatar and object scaling in handController grab 2016-12-20 18:01:53 -08:00
Ryan Huffman
0b2f60fb27 Update tutorial to use new trigger configuration for touch 2016-12-20 18:01:53 -08:00
Chris Collins
9ee1c64573 Merge pull request #9246 from birarda/touch-equip 
add Oculus Touch friendly grab and equip
 2016-12-20 17:12:34 -08:00
Brad Hefta-Gaub
14445c37fe Merge pull request #9231 from PhilipRosedale/ambisonic 
Entity script for ambisonic sound emitter
 2016-12-20 16:16:37 -08:00
Philip Rosedale
4bade4400f fixed typo per review 2016-12-20 16:02:26 -08:00
Dante Ruiz
fa761af1a6 update#2 2016-12-20 15:39:17 -08:00
Dante Ruiz
8698ee61cd commit update 2016-12-20 15:39:17 -08:00
Stephen Birarda
ebd347fc15 only respect release of secondary for hold once pressed 2016-12-20 14:46:55 -08:00
Brad Hefta-Gaub
c2320d317c Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam 2016-12-20 14:34:57 -08:00
Stephen Birarda
4fcccb5455 check for release of equip in this.nearGrabbing 2016-12-20 14:32:47 -08:00
Stephen Birarda
c3d736dd16 return after release, duh 2016-12-20 14:30:08 -08:00
Stephen Birarda
8cd13eaedf always unequip on secondary release 2016-12-20 14:25:26 -08:00
Stephen Birarda
0a024616cc add special equip for oculus style grab 2016-12-20 14:21:23 -08:00
Brad Hefta-Gaub
0448023a0f better handle null senders, trim lines after 2000 2016-12-20 14:14:28 -08:00
Philip Rosedale
13e03b35cc removed initial delay for seek beams 2016-12-20 14:11:52 -08:00
Philip Rosedale
250d071788 grip squeezes fingers too 2016-12-20 14:11:45 -08:00
Philip Rosedale
938734d3fc Grip controllers can grab objects, slight delay on search beam 2016-12-20 14:11:33 -08:00
Anthony J. Thibault
ec38c4e319 Merge remote-tracking branch 'upstream/tablet-ui' into tablet-ui 2016-12-20 13:43:06 -08:00
Anthony Thibault
9d964042c9 Merge pull request #9243 from sethalves/tablet-ui-overlay-stylus-rebase 
use overlays for tablet-ui, use a stylus rather than lasers
 2016-12-20 13:42:22 -08:00
Anthony J. Thibault
84db58dbc6 Make tablet.qml work on Web3DOverlay 2016-12-20 12:16:11 -08:00
Philip Rosedale
632af18c1d PR feedback - flag for setting color 2016-12-20 12:09:42 -08:00
Philip Rosedale
e2dfbf1b02 Addressed PR feedback - now dynamically reads userdata 2016-12-20 12:02:13 -08:00
Brad Hefta-Gaub
f8bae60361 make debug log autoscroll when you add new content to it 2016-12-20 11:27:18 -08:00
Chris Collins
5cc1cd758f Merge pull request #9236 from jherico/chrome_tracing 
Updates to tracing, removing log spam
 2016-12-20 11:17:17 -08:00
Anthony Thibault
bb56701fdb Merge pull request #9241 from druiz17/tabletMenu 
Moved some hud menus to tablet
 2016-12-20 11:13:03 -08:00
Brad Hefta-Gaub
9b11c7cc9c Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam 
Conflicts:
	libraries/networking/src/NodeList.cpp
 2016-12-20 10:46:57 -08:00
Brad Hefta-Gaub
2079b1ff7e cleanup comments 2016-12-20 10:45:36 -08:00
Dante Ruiz
bee6e230ae made requested changes 2016-12-20 18:28:07 +00:00
Howard Stearns
9aad93465d Merge pull request #9227 from howard-stearns/sessionDisplayNames 
Session display names
 2016-12-20 10:07:05 -08:00
Howard Stearns
9ff06e53d4 Merge pull request #9235 from davidkelly/dk/fingerprintInPAL 
Expose Machine Fingerprint in PAL
 2016-12-20 10:06:36 -08:00
Seth Alves
ab3c833dd5 diff minimization 2016-12-20 09:23:21 -08:00
Seth Alves
36e843178a diff minimization 2016-12-20 09:21:41 -08:00
Brad Hefta-Gaub
6a7fa63327 classify ScriptEngine errors better, and send them as signal to JS 2016-12-20 09:00:01 -08:00
Seth Alves
d8ee4d86b0 merge from upstream 2016-12-20 08:43:19 -08:00
Seth Alves
dc996bee95 merge from upstream 2016-12-20 08:06:01 -08:00
Dante Ruiz
fe4fa351d1 clean up 3 2016-12-20 16:04:18 +00:00
Dante Ruiz
31decffb31 clean up 2 2016-12-20 15:59:52 +00:00
Dante Ruiz
7251fa6c18 clean up 2016-12-20 15:54:14 +00:00
Dante Ruiz
74092d8714 removed commented code 2016-12-20 15:46:15 +00:00
Zach Fox
ba240854a7 Comments and clarity 2016-12-20 07:45:35 -08:00
Zach Fox
95e2f0687d It's working! Untested on human avatars. 2016-12-20 07:45:35 -08:00
Zach Fox
54774950d2 Super close 2016-12-20 07:45:35 -08:00
Zach Fox
42127e4e0f Another checkpoint, getting closer 2016-12-20 07:45:35 -08:00
Zach Fox
9c09ec6755 Checkpoint 2016-12-20 07:45:35 -08:00
Ryan Huffman
bf7066d4e3 Cleanup tutorial scripts 2016-12-20 07:45:35 -08:00
Ryan Huffman
e12ef0a187 Cleanup variable naming in touch controller config 2016-12-20 07:45:35 -08:00
Ryan Huffman
04efea7293 Cleanup implementation of touch controller config 2016-12-20 07:45:35 -08:00
Ryan Huffman
6e1459f4b3 Update Touch controller configuration 2016-12-20 07:45:35 -08:00
Ryan Huffman
3dfc3946ba Fix positioning of Oculus Touch controller visual 2016-12-20 07:45:35 -08:00
Ryan Huffman
8aba8f7bf3 Remove cache buster from touchControllerConfiguration 2016-12-20 07:45:35 -08:00
Ryan Huffman
240dba5306 Fix oculus touch labels in tutorial 2016-12-20 07:45:35 -08:00
Ryan Huffman
74b07273d6 Update oculus touch labels to be emissive 2016-12-20 07:45:35 -08:00
Ryan Huffman
1ddc869c8e Fix emissive channel on touch models 2016-12-20 07:45:35 -08:00
Ryan Huffman
ac33bf4d4a Fix right touch joystick 2016-12-20 07:45:35 -08:00
Ryan Huffman
3879922e78 Reenable disabling of hand controllers 2016-12-20 07:45:35 -08:00
Ryan Huffman
53fb0a95fe Update controller display to support non-string hardware resolution 2016-12-20 07:45:35 -08:00
Ryan Huffman
b835fc7ada Add touch controller support to ControllerDisplay 2016-12-20 07:45:35 -08:00
Ryan Huffman
21bab49f79 Add chrome tracing support 2016-12-20 07:45:35 -08:00
David Rowe
8ef8de7891 Move Clara download button when displaying on tablet 2016-12-20 07:45:35 -08:00
David Rowe
2a2e8a424b Fix flash of old desktop window content if reopen after closing with "x" 2016-12-20 07:45:35 -08:00
David Rowe
df5d115db7 Fix auto-downloads not happening after forced log in 2016-12-20 07:45:35 -08:00
David Rowe
0ddc1271b2 Continuously update Clara pages because content can change dynamically 2016-12-20 07:45:35 -08:00
howard-stearns
658ae48d3f fix selection and hud-hiding issues 2016-12-20 07:45:35 -08:00
David Rowe
446a7c6a79 Reduce whitespace in Clara categories 2016-12-20 07:45:35 -08:00
howard-stearns
c60a78d727 clean up avatar nodes properly (and add some logging) 2016-12-20 07:45:35 -08:00
Howard Stearns
3ac10f5f79 deal with bubble-bounces (and comment the code a bit) 2016-12-20 07:43:48 -08:00
David Rowe
1f8323fb8f Improve robustness of navigation footer 2016-12-20 07:43:48 -08:00
David Rowe
c4ff129f86 Inform user if can't do Clara.io download because can't write to ATP 2016-12-20 07:43:48 -08:00
howard-stearns
db68a6adcd fix broken search for myself 2016-12-20 07:43:48 -08:00
Seth Alves
e5804dade0 get stylus working with web entities 2016-12-20 07:43:48 -08:00
howard-stearns
3610d5ddeb people.svg 2016-12-20 07:43:48 -08:00
Seth Alves
ae7af3e227 don't hide stylus so quickly 2016-12-20 07:43:48 -08:00
Seth Alves
e9c848bfe8 stylus for web overlays 2016-12-20 07:43:48 -08:00
howard-stearns
5a97156151 no debug printing 2016-12-20 07:43:48 -08:00
howard-stearns
946d9aa346 checkpoint 2016-12-20 07:43:48 -08:00
howard-stearns
7e7ce0c103 checkpoint 2016-12-20 07:43:48 -08:00
Howard Stearns
b6b80fb9c1 checkpoint 2016-12-20 07:43:48 -08:00
David Rowe
0ae88c389a Start at HiFi marketplace page instead of directory page 2016-12-20 07:43:48 -08:00
David Rowe
4d35b7a736 Fix Clara marketplace button appearing on top of navigation footer 2016-12-20 07:43:48 -08:00
David Rowe
39d01b8755 Raise and lower keyboard on password fields 2016-12-20 07:43:48 -08:00
howard-stearns
8d300eac76 pal prototype 2016-12-20 07:43:48 -08:00
David Rowe
25651800dd Code review 2016-12-20 07:43:48 -08:00
David Rowe
f9bd03dd56 Remove extra browse history item created by Clara download 2016-12-20 07:43:48 -08:00
Seth Alves
67093dc519 don't flutter tablet when menu button is pressed. start on a stylus 2016-12-20 07:43:48 -08:00
David Rowe
4ff3599351 Tidying 2016-12-20 07:43:48 -08:00
David Rowe
7a36e4eed8 Fix keyboard focus when switch highlight between overlays and entities 2016-12-20 07:42:21 -08:00
David Rowe
0accdddc8f Fix Web overlay x, y coordinate calcs 2016-12-20 07:42:21 -08:00
David Rowe
f749c76ced First pass at controller interaction with 3D Web overlay 2016-12-20 07:42:21 -08:00
David Rowe
be0ef820ff Add "back" button to marketplaces footer 2016-12-20 07:40:28 -08:00
David Rowe
eef8c70f10 Remove e-mail message hyperlink if displaying on tablet 2016-12-20 07:40:28 -08:00
David Rowe
78c6441842 Inject navigation footer into Clara account createion page 2016-12-20 07:40:28 -08:00
David Rowe
6e0227f8f7 Improve text and robustness of marketplaces footer 2016-12-20 07:40:28 -08:00
David Rowe
2216ab6def Delete redundant code 2016-12-20 07:40:28 -08:00
David Rowe
5843185683 Tidying 2016-12-20 07:40:28 -08:00
David Rowe
5fbdd64fff Handle Clara marketplace downloads 2016-12-20 07:40:28 -08:00
David Rowe
0ef972c1e5 Inject Clara Web page modifications 2016-12-20 07:40:28 -08:00
David Rowe
2db0b4dc59 Fix navigation bar and opaqueness of Web page 2016-12-20 07:40:28 -08:00
David Rowe
bebedd8e51 Add JavaScript event bridge for Web 3D overlay 2016-12-20 07:40:28 -08:00
David Rowe
767b3ea8e9 Add script injection to Web 3D overlay 2016-12-20 07:40:28 -08:00
David Rowe
beddad5807 Fix Web tablet screen size 2016-12-20 07:40:08 -08:00
David Rowe
1a970dbd79 Use overlay instead of entity to display tablet Web content 2016-12-20 07:38:25 -08:00
David Rowe
4bc1616c07 Fix up navigation footer fonts 2016-12-20 07:33:55 -08:00
David Rowe
fd24d12bc1 Add navigation bar to marketplace pages 2016-12-20 07:33:55 -08:00
David Rowe
57ca34f866 Fix up script injection methods 2016-12-20 07:33:55 -08:00
David Rowe
ef488ec036 Get script injection working in new marketplaces window 2016-12-20 07:33:55 -08:00
David Rowe
4dbbb08c98 Update user instructions 2016-12-20 07:33:55 -08:00
David Rowe
196473f9fa Provide keyboard in marketplaces window 2016-12-20 07:33:55 -08:00
David Rowe
1c6cb9f905 Tidying 2016-12-20 07:33:55 -08:00
David Rowe
9dbcb94a0c Update Clara.io instructions 2016-12-20 07:33:55 -08:00
Brad Hefta-Gaub
c65471e880 Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam 
Conflicts:
	libraries/script-engine/src/FileScriptingInterface.cpp
 2016-12-19 22:27:24 -08:00
Brad Hefta-Gaub
1e5e6a12db add support for an HMD script debug log window 2016-12-19 19:34:24 -08:00
Chris Collins
61c60fca2d Merge pull request #8968 from ctrlaltdavid/21089 
Clara.io marketplace improvements
 2016-12-19 18:21:45 -08:00
Anthony J. Thibault
a791ddcc22 Tablet can switch to a web url. 
Help button has been updated to switch to the help.html.  It doesn't look good because
the content was authored expecting landscape window, not portrait.

The API is by no means final.  But it exposes two methods to JS.

* Tablet.gotoHomeScreen() - Used to forcefully go back to the home tablet "springboard", eventually this will
  hooked up to the tablet button.
* Tablet.gotoWebScreen(url) - Causes the tablet to switch from the home "springboard" and load a web url.

tabletTest.js and help.js have been updated to use this functionality.
 2016-12-19 17:52:19 -08:00
Dante Ruiz
fc4b4f85f4 added button to menu 2016-12-20 00:24:45 +00:00
howard-stearns
60cb7acb50 Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames 2016-12-19 15:28:07 -08:00
Anthony J. Thibault
856791c11d Made TabletRoot.qml the main tablet qml file. 
This file uses a Loader node to load, Tablet.qml.
 2016-12-19 15:15:16 -08:00
Brad Davis
9b0d0b3e7a Updates to tracing, removing log spam 2016-12-19 15:12:48 -08:00
David Kelly
36792e005a initial commit 2016-12-19 14:19:39 -08:00
Dante Ruiz
c0e82d3e05 moving buttons to tablet 2016-12-19 13:43:49 -08:00
Anthony J. Thibault
10f9233c90 Fixed js interface after recent Tablet.qml changes 
* TabletButton.inDebugMode defaults to false
* TabletButton now listens to onIsActiveChanged event to flip state of button.
* Fixed help.js and tabletTest.js to compensate for the removal of the TabletButton.color property
 2016-12-19 12:20:56 -08:00
Philip Rosedale
70942925bc Entity script for ambisonic sound emitter 2016-12-19 10:32:17 -08:00
Zach Fox
e940daf5b4 Comments and clarity 2016-12-19 10:20:08 -08:00
Zach Fox
aa837d8858 It's working! Untested on human avatars. 2016-12-19 10:20:08 -08:00