Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 11:42:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
54940 commits 71 branches 56 tags 1.2 GiB
Commit graph

2443 commits

Author SHA1 Message Date
humbletim
6f178ee1ec initial checkin of doppleganger module and tablet app scripts 2017-04-24 19:28:03 -04:00
Triplelexx
d689a43678 changes from CR 2017-04-24 22:07:51 +01:00
David Rowe
c0a258f9b3 Disable "load" button while making a recording 2017-04-25 09:04:26 +12:00
Triplelexx
d63c4d11c7 enable grabbable property for all newly created entities 2017-04-24 21:33:08 +01:00
David Rowe
d73fd6e08d Update AC script URL in info 2017-04-25 07:42:21 +12:00
Andrew Lowry
6a218eaca9 Embeds colpick color picker in dat.GUI for particle explorer. 
Cleans up eslint for particleExplorer.js.
 2017-04-24 13:35:37 -04:00
Andrew Lowry
aea89824c5 Switches tablet edit tab to particle explorer when particle entities are 
selected or created.
 2017-04-24 13:35:37 -04:00
Andrew Lowry
ecf3826050 Always show hand lasers when in edit mode. 2017-04-24 13:35:37 -04:00
Andrew Lowry
8479d835b2 Adds laser selection of particle systems while in edit mode in HMD. 2017-04-24 13:35:37 -04:00
volansystech
1abbca6737 Merge branch 'master' into 21200 2017-04-24 19:09:02 +05:30
howard-stearns
fac40f51d9 message waiting art 2017-04-21 16:00:23 -07:00
David Rowe
7fe0ba19b5 Don't display the "Record" button as pressed while recording 2017-04-22 10:05:02 +12:00
howard-stearns
ce7f3197f6 watch for announcements 2017-04-21 14:27:38 -07:00
Seth Alves
ec687bdb4b cleanups 2017-04-21 11:03:43 -07:00
Seth Alves
1e6b2682c9 use timers rather than relying on update calls 2017-04-21 10:17:57 -07:00
David Rowe
ce86ce4530 Red buttons to unload recordings 2017-04-21 19:45:14 +12:00
David Rowe
8060e98bd5 Right-align "i" icon and update info text 2017-04-21 17:46:30 +12:00
David Rowe
d064511121 Rearrange dialog controls 2017-04-21 17:01:29 +12:00
David Rowe
1aa6e20791 Change "Record" button to "Stop" while recording 2017-04-21 16:15:49 +12:00
David Rowe
477237cca2 Red "recording" ring animation with countdown numbers inside 2017-04-21 16:07:50 +12:00
David Rowe
aaf9b40bb3 New app icon 2017-04-21 15:20:08 +12:00
David Rowe
daedb94b04 Merge branch 'master' into 21249 2017-04-21 14:50:28 +12:00
David Rowe
076bf0943e Attach HMD "recording" indicator to camera 2017-04-21 10:33:24 +12:00
Stephen Birarda
3452dd0251 increment colspan count in table footer 2017-04-20 15:20:48 -07:00
Stephen Birarda
924624b127 add new glyphs with check, reference in entityList 2017-04-20 14:21:13 -07:00
Stephen Birarda
f64efe18c0 add an isBaked column to edit.js 2017-04-20 14:21:13 -07:00
volansystech
9e2899678a Resolving conflicts of #21206 2017-04-20 23:54:41 +05:30
volansystech
abc87c0338 Increased accuracy for converting far-grab to near-grab for every object 
Near-grab radius reduced to its default = 0.3
 2017-04-20 23:37:16 +05:30
Seth Alves
f7378abb08 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-20 02:40:10 -07:00
David Rowe
43619d1db1 Finish with TODOs 2017-04-20 14:22:54 +12:00
David Rowe
0da4e3e3c4 Display scrollbar in recordings table when needed 2017-04-20 14:19:25 +12:00
Brad Hefta-Gaub
a555846d5d Merge pull request #10235 from volansystech/21206 
21206 Far grab improvement to draw held entity toward yourself
 2017-04-19 14:33:09 -07:00
David Rowe
2108300272 Merge branch 'master' into 21249 2017-04-20 08:43:00 +12:00
Delanir
956d1e9d95 Fix Code Standard 2017-04-19 16:30:49 +01:00
volansystech
b194ddeb66 Resolve Comments of @sethalves 2017-04-19 16:39:23 +05:30
David Rowe
f7d87c4c28 Tweak start-up delay 2017-04-19 16:32:46 +12:00
David Rowe
00b6b2a2c0 Implement desktop recordings browser dialog 2017-04-19 12:34:59 +12:00
howard-stearns
3113dced7b Be sure to callback even on profile failure. 2017-04-18 12:06:44 -07:00
volansystech
e5c7587ad8 Improve far grabbing based on timescale. 2017-04-18 20:01:02 +05:30
David Rowe
dae6d6fb69 Stub desktop dialog to select recording to play from ATP assets 2017-04-18 11:43:42 +12:00
David Rowe
f920192244 Fix up script tear-down 2017-04-18 08:22:29 +12:00
volansystech
7e0efed062 Improve speed of grabbing. 2017-04-18 00:54:01 +05:30
David Rowe
7dcda47f95 Fix recording GIF still displaying when reopen tablet to stop recording 2017-04-16 12:57:37 +12:00
Seth Alves
db98020974 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-15 07:22:16 -07:00
David Rowe
15128faa49 Fix (work around) tablet access at Interface start-up crashing Interface 2017-04-15 17:11:03 +12:00
David Rowe
ef8f36026c Improve speed of starting playing animations at server start-up 2017-04-15 13:20:42 +12:00
David Rowe
e91cf4a4e8 Use "i" circle for info button 2017-04-15 12:50:00 +12:00
David Rowe
e7fb268843 Update to use modified Recording API 2017-04-15 12:18:50 +12:00
Seth Alves
371118a6c0 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-14 16:26:30 -07:00
Zach Fox
b410399a16 Resolve your paths, silly! 2017-04-14 16:26:29 -07:00
Zach Fox
85e5173abe Fix embedded location 2017-04-14 16:11:37 -07:00
Zach Fox
f81dce5e70 Fix the bug 2017-04-14 15:42:19 -07:00
Chris Collins
6a6800b8c3 Merge pull request #10222 from sethalves/fix-late-touch-cant-grab-tablet 
fix can't grab tablet
 2017-04-14 14:57:06 -07:00
David Rowe
2731c13a5c Merge remote-tracking branch 'upstream/master' into 21249 2017-04-15 09:51:16 +12:00
Andrew Meadows
45bb639ef5 Merge pull request #10128 from kunalgosar/fingerpainting 
Make it easier to exit FingerPaint
 2017-04-14 14:34:57 -07:00
Seth Alves
110cfb47d1 turn off handControllerGrab debug prints 2017-04-14 14:23:27 -07:00
Seth Alves
6420ddd038 grab script checks for touch devices continually, rather than just when the script starts 2017-04-14 14:20:04 -07:00
kunalgosar
891d52909e fixed typo in comments 2017-04-14 14:10:19 -07:00
Seth Alves
d17d12446b Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-14 12:49:03 -07:00
Seth Alves
1009182c06 grab and handControllerGrab use new far-grab action 2017-04-14 11:52:07 -07:00
Seth Alves
af5a352f02 turn on handControllerGrab debug prints 2017-04-14 08:10:31 -07:00
David Rowe
f715850766 Display animated GIF while recording 2017-04-14 16:13:45 +12:00
David Rowe
08f4fc2cf9 Remove hover highlight from "x"s 2017-04-14 15:51:59 +12:00
David Rowe
c2d8755b15 Merge branch 'master' into 21249 2017-04-14 15:32:45 +12:00
David Rowe
11a2559df9 Use HiFi glyph for delete "x"s 2017-04-14 15:30:28 +12:00
David Rowe
5f333ee02c Style "i" button and info text 2017-04-14 15:14:39 +12:00
David Rowe
1d43e5a992 Style overall dialog layout 2017-04-14 15:12:36 +12:00
David Rowe
fd919f0db7 Play sounds during countdown and beep when recording starts and finishes 2017-04-14 10:34:15 +12:00
David Rowe
072e06123f Fix recording just made not being played 2017-04-14 10:02:15 +12:00
volansystech
70855b1c53 Improve the accuracy of Far to near Equip State. 2017-04-13 19:24:47 +05:30
David Rowe
75e4fb3820 On tablet with option enabled recording ends when open tablet or dialog 2017-04-13 19:28:40 +12:00
David Rowe
8f3789421f Show "busy" spinner when counting down or recording 2017-04-13 19:23:22 +12:00
David Rowe
9638b093d8 Fix number of available player instances being wrong on tablet 2017-04-13 18:55:02 +12:00
David Rowe
ff42715a15 Retain "Record" button's pressed state when close and reopen dialog 2017-04-13 18:41:55 +12:00
David Rowe
45ca8438fa Persist finish-on-open checkbox value to settings 2017-04-13 18:29:39 +12:00
David Rowe
b508d6882f Add checkbox that stops countdown/finishes recording when reopen dialog 2017-04-13 17:59:28 +12:00
David Rowe
84cfe1cb75 Don't close dialog when start recording; press "Record" again to finish 2017-04-13 17:00:35 +12:00
David Rowe
c369b1314a Remove countdown overlays 2017-04-13 16:32:03 +12:00
David Rowe
afd82f09c0 Provide instructions on running the AC player script 2017-04-13 15:18:04 +12:00
David Rowe
e21e15c064 Update warning dialog to refer to player "instance" 2017-04-13 14:01:37 +12:00
David Rowe
5ad44b6caf Display empty rows for unused players 2017-04-13 13:50:26 +12:00
David Rowe
24a68ea685 Report the numnber of free players rather than total number 2017-04-13 13:40:52 +12:00
David Rowe
464bc17491 Column heading for "unload" buttons 2017-04-13 13:40:20 +12:00
David Rowe
8bbce53f74 Reset player details when domain restarts or user teleports 2017-04-13 12:23:10 +12:00
Seth Alves
0dab94fada Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0 2017-04-12 16:34:46 -07:00
Seth Alves
0eb9507a10 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0 2017-04-12 16:25:50 -07:00
Zach Fox
3f91fb8e55 Remove unnecessary comment 2017-04-12 14:45:57 -07:00
Zach Fox
c724c2e50b New loading icon 2017-04-12 14:45:57 -07:00
Zach Fox
87b2d5bf8a New loading icon 2017-04-12 14:45:57 -07:00
Zach Fox
75f1168b19 Clearer function names 2017-04-12 14:45:57 -07:00
Zach Fox
7b92989b1d Fix it 2017-04-12 14:45:57 -07:00
Zach Fox
2579ac1baa It's working! 2017-04-12 14:45:57 -07:00
Zach Fox
e296383b1b Checkpoint! 2017-04-12 14:45:56 -07:00
volansystech
7bc3435cfa Initial Commit.. 
If distanceToObject from avatar is more than 15, we are accelarting entity travel by 2x.
This will help user to grab the entity in lesser time.
 2017-04-13 02:51:30 +05:30
David Rowe
7dddd266ba Merge branch 'master' into 21249 2017-04-13 08:39:32 +12:00
Seth Alves
026dde2e68 allow kinematic near-grab to be turned on or off for a given entity 2017-04-12 10:14:16 -07:00
volansystech
5639a3f92a Far to near grab: If the object is capable of being equipped, transfer from far-grab to an equipped state. 2017-04-12 20:08:26 +05:30
David Rowe
50a06db1b9 Display "REC" indicator when recording 2017-04-12 15:56:59 +12:00
David Rowe
f30dc4b560 Add a "record" button to initiate recording 2017-04-12 15:04:29 +12:00
David Rowe
905560b96d Remove checkbox and record-on-close functionality 2017-04-12 14:48:15 +12:00
Thijs Wenker
695c55bc3d fix teleport cool-in, added missing TARGETTING state and some ESLINT style fixes 2017-04-12 03:44:24 +02:00
David Rowe
3ae388bded Rework auto-playback 2017-04-12 13:32:34 +12:00
David Rowe
0d9e0ebfec Merge branch 'master' into 21249 2017-04-12 08:45:01 +12:00
Chris Collins
b07ed13023 Merge pull request #10184 from druiz17/snapshot-fix 
snapshot bug fixes
 2017-04-11 13:00:46 -07:00
volansystech
99af493ac8 Resolved the issue from the Initial commit - "grabbedEntity" stays into that grabbed position for a few seconds (hanging into mid of air) before dropping down automatically. 
Successfully converted far grab into near grab when entity is closer to the Avatar.
When Trigger is released after converted far grab into near grab far, the obect is dropped successfully.
 2017-04-11 21:57:01 +05:30
David Rowe
86baf785aa Add "Load" button 2017-04-11 15:23:09 +12:00
Dante Ruiz
daf25c1fe8 fix crashes when clicking in the homebutton 2017-04-11 00:25:08 +01:00
David Rowe
559fba39ab Remove avatar after stopping recording 2017-04-11 10:17:52 +12:00
David Rowe
9a9bcaf2ae Stop button stops playing recording 2017-04-11 09:37:57 +12:00
Dante Ruiz
382204a9a9 open feed after logging in 2017-04-10 22:33:07 +01:00
Delanir
fcde85e51b Fix Style 
- Replace tabs by 4 spaces;
- Add indents and spaces;
- Formated multi/line statement
- Removed out-of-scope comments.
 2017-04-10 22:16:56 +01:00
Dante Ruiz
df6498c67c fix snapshot login for toolbar-mode 2017-04-10 21:59:37 +01:00
Dante Ruiz
6922ba5c77 removed unnessary prints 2017-04-10 21:08:40 +01:00
Dante Ruiz
e0f19944bc Merge branch 'master' of github.com:highfidelity/hifi into snapshot-fix 2017-04-10 20:58:46 +01:00
Dante Ruiz
4e94aaa9e8 finished allowing to go back to previous app 2017-04-10 20:58:10 +01:00
Delanir
19de579057 Merge branch 'master' of https://github.com/CraftsmanMG/hifi 2017-04-10 20:37:51 +01:00
Delanir
25a89a631b hifi: #21216 - Resize entities with hand controllers while editing 
hifi: #21216 - Resize entities with hand controllers while editing
Modified StretchTool to allow for movement in 3D
- uses data from motion controller (position and rotation) to
stretch/resize the entities/primitives in 3D.
- the range of the resize depends on distance to the object.
 2017-04-10 20:25:30 +01:00
David Rowe
bd63960876 Add table of recordings currently being played 2017-04-11 07:23:52 +12:00
David Rowe
0a19b502fd Merge branch 'master' into 21249 2017-04-11 07:04:05 +12:00
David Rowe
9495bf6a47 Fix auto-playback logic 2017-04-10 19:56:46 +12:00
David Rowe
8e3bc31c36 Fix persisting new recording 2017-04-10 19:28:21 +12:00
David Rowe
b5bf7dc12f Tidying 2017-04-10 16:47:35 +12:00
David Rowe
6a88398e8e Handle AC script not being able to create an entity 2017-04-10 15:55:05 +12:00
David Rowe
1cc215e14b Fix test that recording just made started playing 2017-04-10 15:31:38 +12:00
David Rowe
3b32a4f74f Address AC scripts claiming same entity to play 2017-04-10 15:04:54 +12:00
Anthony Thibault
746b7aadbd Merge pull request #10133 from sethalves/fix-teleport-which-something-equipped 
Fix teleport when something equipped
 2017-04-09 19:00:21 -07:00
David Rowe
6896fe3ac6 Merge branch 'master' into 21249 2017-04-10 09:05:57 +12:00
David Rowe
d60d4d0755 Auto-play recording at start-up 2017-04-09 15:52:56 +12:00
David Rowe
adabcab888 Add invisible entity to persist playback of recording 2017-04-08 16:24:58 +12:00
David Rowe
d1e49cd926 Add and stub out stop, autoplay, and persistence to AC script 2017-04-08 14:57:37 +12:00
Dante Ruiz
86c67a3017 tablet pages 2017-04-08 02:01:21 +01:00
Chris Collins
8e12f62cbb Merge pull request #10153 from druiz17/goto-fix 
Ability to toggle goto with the crt-l and enter keys
 2017-04-07 16:36:41 -07:00
David Rowe
ef4f3368f9 Play recording just made from original start position and orientation 2017-04-08 11:06:34 +12:00
David Rowe
ebe3561582 Merge branch 'master' into 21249 2017-04-08 10:46:16 +12:00
volansystech
e0b08a5e4e Initial Commit of far to near grab conversion. Works only if object drawn at chest level And Object is near by to hand. 2017-04-07 21:55:26 +05:30
Howard Stearns
5d341778c5 fix notification word wrapping 2017-04-07 07:08:19 -07:00
David Rowe
1ef5f048a3 Inform user if recording failed to start 2017-04-07 18:53:20 +12:00
David Rowe
ce898ae42a Play recording 2017-04-07 18:38:55 +12:00
David Rowe
75d970f5d5 Remove unresponsive players from list 2017-04-07 17:30:03 +12:00
David Rowe
81d8d238de Refactor log and error messages 2017-04-07 17:13:23 +12:00
David Rowe
5e55233934 Assignment client player script receives "play" command from recorder 2017-04-07 17:04:24 +12:00
David Rowe
506a414762 Lint fix 2017-04-07 14:06:16 +12:00
David Rowe
858e9650a3 Encapsulate recording methods in Recorder object 2017-04-07 14:03:08 +12:00
howard-stearns
b089fd03b8 make connection messaging when not logged in 2017-04-06 16:48:11 -07:00
David Rowe
68901c8af5 Merge branch 'master' into 21249 2017-04-07 11:04:43 +12:00
David Rowe
49907970fb Fix countdown showing if restart with dialog open and recording enabled 2017-04-07 11:01:11 +12:00
David Rowe
f164fe7532 Improve error handling 2017-04-07 10:46:40 +12:00
Dante Ruiz
a89081601c fix merge issues 2017-04-06 22:31:47 +01:00
Dante Ruiz
52fd446d4d toggle goto in tablet 2017-04-06 22:27:37 +01:00
Howard Stearns
f7ef587c61 Merge pull request #10138 from davidkelly/dk/3935 
Now you can forget connections
 2017-04-06 14:05:25 -07:00
David Kelly
34a2cefb98 Merge pull request #10132 from davidkelly/dk/analyticsForConnections 
initial analytics for connections
 2017-04-06 10:45:39 -07:00
David Kelly
a92162dea9 no mo useless debug statements 2017-04-06 08:50:22 -07:00
David Rowe
23c937e55d Make avatar recording and upload to asset server 2017-04-06 18:50:47 +12:00
David Rowe
a9f5b60319 Fix recording starting on tablet when close dialog rather than tablet 2017-04-06 15:32:42 +12:00
David Rowe
982c0ec559 Display countdown in overlay 2017-04-06 15:01:53 +12:00
David Kelly
61ece265f4 now you can forget connections 2017-04-05 18:16:16 -07:00
David Rowe
4580b89aa6 Add countdown delay before starting recording 2017-04-06 12:08:27 +12:00
David Rowe
096909d423 Close dialog if open when stop script 2017-04-06 10:10:07 +12:00
David Rowe
b8de31db12 Make toolbar icon close dialog if it's open 2017-04-06 10:09:41 +12:00
David Rowe
813a5684e3 Display instruction text only if recording is enabled 2017-04-06 09:22:01 +12:00
Seth Alves
2e4e10759f teleport raypick now ignores equipped or grabbed entities 2017-04-05 13:17:03 -07:00
David Kelly
1b6bf90843 initial analytics for connections 2017-04-05 11:10:06 -07:00
David Rowe
b29bfd4bb4 Dialog instructions refer to tablet or window as appropriate 2017-04-05 17:49:13 +12:00
David Rowe
54a0bea8c0 Toolbar icon state and start/stop recording with window closing/opening 2017-04-05 17:48:35 +12:00
David Rowe
a625fd4523 Add dialog with "Enable recording" checkbox 2017-04-05 16:20:04 +12:00
David Rowe
d748068373 Stub new avatar recording script that records when tablet is hidden 2017-04-05 13:19:46 +12:00
Anthony J. Thibault
c33f10ca1b Recenter body on teleport, also it works more consistently. 
If your avatar happens to be squatting, your body will stand up straight after you teleport.
Also, setting MyAvatar.position can sometimes fail due to the multi-threaded nature of scripting.
Instead, teleport.js uses goToPosition to move the avatar, as a result teleport feels much more responsive now.
 2017-04-04 18:05:46 -07:00
kunalgosar
a5b10cc51e alert window to give directions 2017-04-04 15:35:38 -07:00
kunalgosar
b8500e45ad added tutorial 2017-04-04 15:35:38 -07:00
kunalgosar
d66038fff2 press B to exit finger painting 2017-04-04 15:35:38 -07:00
Seth Alves
b0b214012c Merge pull request #10118 from hyperlogic/bug-fix/tablet-restart-scripts 
Fix broken eventBridge on tablet after Reload All Scripts.
 2017-04-04 10:45:08 -07:00
Anthony J. Thibault
8ff457a1b6 Fix broken eventBridge on tablet after Reload All Scripts. 
The main issue here was the "webEventReceived" connection between the OffscreenQMLSurface and the TabletProxy object.
For whatever reason, if this is not a direct Signal to Slot connection, the webEventReceived event does not propagate.
 2017-04-03 16:03:55 -07:00
Anthony Thibault
999bd0d339 Merge pull request #10075 from sethalves/tablet-ui 
Tablet ui -- misc changes + landscape mode
 2017-04-03 10:43:34 -07:00
Seth Alves
b9e84691ad Merge pull request #10092 from ctrlaltdavid/dead-code 
Remove some dead code in edit.js
 2017-04-03 09:40:30 -07:00
Seth Alves
43e1cec8a3 merge from upstream 2017-04-03 06:28:59 -07:00
Chris Collins
3c62826ef9 Merge pull request #10091 from ctrlaltdavid/21248 
Fix HTML controls not working properly in the tablet
 2017-04-01 08:41:44 -07:00
Zach Fox
8a96969471 Merge pull request #9873 from highfidelity/PAL_v2 
PAL v2.0
 2017-03-31 17:00:41 -07:00
David Rowe
6a23f3a59b Remove some dead code noticed in passing 2017-04-01 11:25:42 +13:00
David Rowe
f397adb22a Reinstate scrollbars to marketplace pages 2017-04-01 11:06:27 +13:00
David Kelly
8ceb6a20f0 friend/unfriend working 2017-03-31 15:05:21 -07:00
Zach Fox
6a4c2c5e12 Fix issues; checkpoint on new ComboDialog 2017-03-31 14:56:42 -07:00
David Rowe
260309ae24 Remove CSS hack no longer needed 2017-04-01 10:53:46 +13:00
Seth Alves
54c66aff07 use tablet-ui stylus as default, rather than avatar finger 2017-03-31 13:18:40 -07:00
Seth Alves
3073b47ea3 Merge pull request #10065 from ctrlaltdavid/21242 
Address tablet scrollbar issues
 2017-03-31 12:43:53 -07:00
Ken Cooke
fa53ebef30 Merge pull request #9996 from zfox23/cleanup_selectAudioDevice 
FB3651: Fix audio devices switching when they shouldn't
 2017-03-31 12:07:49 -07:00
Seth Alves
715493922e code review 2017-03-30 17:33:01 -07:00
Zach Fox
4712ec7400 Reset pollCount; debug log when expired generated by client 2017-03-30 17:02:15 -07:00
David Rowe
a5c683192b Improve entity properties scroll handle operation in tablet 2017-03-31 12:26:22 +13:00
Howard Stearns
0edbf1fbd9 Merge pull request #10044 from howard-stearns/pal-backend-integration 
Pal backend integration
 2017-03-30 12:55:11 -07:00
Howard Stearns
3056bb16a2 typo, and delete request on abort/fail 2017-03-30 12:40:54 -07:00
Seth Alves
c62b07d26f add setLandscape call to tablet 2017-03-30 11:36:21 -07:00
David Kelly
e66c075f8e Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-30 10:14:29 -07:00
David Rowe
9c4414cff6 No custom styling of marketplaces directory scrollbar 2017-03-30 14:38:17 +13:00
David Rowe
c7f648a6c2 Disable marketplace directory and Clara.io scrollbars in tablet 2017-03-30 14:20:32 +13:00
Zach Pomerantz
4a9fbf2bbd delay 200ms to avoid recursive audio dev switches 2017-03-29 19:05:41 -04:00
Zach Pomerantz
c30ab4de8b rm extra setDevice 2017-03-29 18:48:22 -04:00
Zach Fox
a6ff3fcdb7 Tablet PAL bugfix; Connections help text v1 2017-03-29 15:47:19 -07:00
Zach Fox
1b74576259 Fix tablet-close behavior for PAL; remove users-tablet.js 2017-03-29 14:53:45 -07:00
Seth Alves
ce9eb1a377 more tablet landscape changes 2017-03-29 14:21:38 -07:00
Seth Alves
371df35013 remove code related to tablet being a model rather than an overlay. start on landscape mode 2017-03-29 14:16:14 -07:00
Howard Stearns
b8f557ca54 Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into pal-backend-integration 2017-03-29 13:30:15 -07:00
Howard Stearns
53d484c318 makes connections! 2017-03-29 13:23:31 -07:00
Howard Stearns
b0c97d3a82 putative connection integration for 2-machine testing 2017-03-29 12:22:26 -07:00
David Rowe
c618e8e001 Open feed in tablet after sharing snapshot from tablet 2017-03-29 16:52:52 +13:00
Zach Fox
b776f25b3b Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-28 18:09:17 -07:00
Zach Fox
81264c998b Revert "Merge from upstream/master" 
This reverts commit b5ba4a109d.
 2017-03-28 17:39:45 -07:00
Zach Fox
b5ba4a109d Merge from upstream/master 2017-03-28 17:37:34 -07:00
howard-stearns
c2a49a582e send credentials to local metaverse servers, and initial users data 
integration.
 2017-03-28 16:44:16 -07:00
Seth Alves
4516ddf855 Merge pull request #9847 from highfidelity/tablet-ui 
Tablet ui
 2017-03-28 14:48:02 -07:00
Andrew Meadows
b9e80d3fa5 Merge pull request #9972 from kunalgosar/marketsBug 
Fixed buttons on Marketplace
 2017-03-28 12:45:25 -07:00
Zach Pomerantz
06bf5807ae fix audio setting persistence for already selected device 2017-03-28 15:34:42 -04:00
Zach Pomerantz
5e0cfb6137 short-circuit audio switching on missing device 2017-03-28 15:34:13 -04:00
Zach Pomerantz
1bdef141c3 simplify audio menu parsing 2017-03-28 15:33:54 -04:00
Seth Alves
6df4dda746 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-28 11:42:14 -07:00
Seth Alves
8e38b41e44 Merge branch 'tablet-ui' of github.com:sethalves/hifi into tablet-ui 2017-03-28 11:41:58 -07:00
Seth Alves
851ea7dabc fix initial finger/stylus setting 2017-03-28 11:41:51 -07:00
Clément Brisset
82114ae6ab Merge pull request #9940 from Atlante45/fix/sit 
Fix a few sitting bugs noticed at the meetup
 2017-03-28 11:14:31 -07:00
Dante Ruiz
e276bb52d2 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help-script 2017-03-28 18:14:28 +01:00
Dante Ruiz
b0e437cc5a remove help button from tablet when reloading scripts 2017-03-28 18:14:05 +01:00
Seth Alves
0cae616ab5 Merge pull request #10031 from hyperlogic/bug-fix/mouse-disconnect-issue 
WebTablet.js: Don't remove or add mouse callbacks onHMDChanged
 2017-03-28 10:07:52 -07:00
Seth Alves
9e675d4c93 Merge pull request #9990 from hyperlogic/bug-fix/sliders 
Added inputMode property to Web3DOverlay
 2017-03-28 10:07:37 -07:00
Anthony J. Thibault
29a159b90d WebTablet.js: Don't remove or add mouse callbacks onHMDChanged 
This should prevent the exception on destroy, caused by disconnecting a signal that is not attached.
 2017-03-28 09:27:13 -07:00
David Kelly
92718b6051 cr feedback 2017-03-28 08:57:27 -07:00
Seth Alves
b50a02ea19 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-28 08:16:59 -07:00
David Rowe
6a3dea030e Settings link 2017-03-28 15:15:33 +13:00
David Rowe
55033df354 Merge branch 'tablet-ui' into 21238-b 2017-03-28 14:47:57 +13:00
David Rowe
a6ef592353 Non-scrolling window with images scaled to fit 2017-03-28 14:43:26 +13:00
Seth Alves
cdac011472 fix home button 2017-03-27 18:21:00 -07:00
Zach Fox
0ae4ce7e98 Have I finally tamed the beast? 2017-03-27 16:15:11 -07:00
Brad Hefta-Gaub
3bdcfd8b78 Merge pull request #9796 from ZappoMan/removePropertiesFromRayPick 
remove properties from RayToEntityIntersectionResult
 2017-03-27 14:26:51 -07:00
David Rowe
ead1f00bbf Title 2017-03-28 09:10:20 +13:00
David Rowe
35305b4476 Make dialog single column with images above controls 2017-03-28 08:55:38 +13:00
David Kelly
5c1e085e7b Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-27 11:29:18 -07:00
David Kelly
76657a670c added notifications (faked user name for now), along with switch to avatar entities 2017-03-27 11:28:57 -07:00
Anthony J. Thibault
5796cbc898 Bug-fix for touching deleted entities or overlays. 2017-03-27 10:26:33 -07:00
Zach Fox
e1a880a5d4 Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-27 09:10:12 -07:00
David Rowe
e58e3fbbf7 Disconnect snapshot event handler when tablet "home" button pressed 2017-03-27 17:32:04 +13:00
David Rowe
dc3095bfcd Fix "don't share" button not closing window 2017-03-27 16:24:14 +13:00
David Rowe
d0fc352d3b Address event bridge being shared with other scripts 2017-03-27 16:07:58 +13:00
David Rowe
aa8a1e1dda Open snapshot dialog in tablet or window appropriately 2017-03-27 15:04:33 +13:00
Seth Alves
bb28976d0e Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-26 09:32:35 -07:00
Seth Alves
90db9af2f9 Merge pull request #9978 from Triplelexx/fix-tablet-users-typo 
fix myVisibility typo
 2017-03-26 07:36:11 -08:00
Seth Alves
d45e124529 Merge pull request #9995 from hyperlogic/bug-fix/no-scroll-bar-on-marketplace 
Hide the scrollbar on the marketplace
 2017-03-25 08:36:31 -08:00
Seth Alves
3abd6b3948 Merge pull request #10006 from druiz17/tablet-help 
Ported help into the tablet
 2017-03-25 08:33:41 -08:00
Vladyslav Stelmakhovskyi
edb66ae704 Merge branch 'tablet-ui' into tablet-ui-audio-screen 2017-03-25 13:20:43 +01:00
Vladyslav Stelmakhovskyi
fc23c348cb Implemented Audio settings screen for Tablet UI 2017-03-25 13:17:38 +01:00
Zach Fox
73a77f7f25 OK, how about now 2017-03-24 18:19:34 -07:00
Zach Fox
e88895935b Revert "Actually merge from master" 
This reverts commit 056d6fbe4f.
 2017-03-24 17:56:48 -07:00
Dante Ruiz
6178a86a46 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help 2017-03-24 23:56:33 +01:00
Seth Alves
f1470e34f9 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-24 15:17:52 -07:00