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

2266 commits

Author SHA1 Message Date
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
Brad Hefta-Gaub
9b26e8ee95 Merge pull request #9871 from Triplelexx/21208 
21208 - Muted microphone indicator
 2017-03-24 13:07:43 -07:00
Zach Fox
31ae326880 Pretty sure about this now 2017-03-24 13:05:07 -07:00
Zach Fox
e5741869e5 Checkpoint 2017-03-24 12:22:11 -07:00
Anthony J. Thibault
7e6ff7c2fb Scrollbar is visible on marketplace in toolbar mode. 2017-03-24 11:40:10 -07:00
Lexx
fa606446a7 remove cache buster 2017-03-24 18:27:38 +00:00
Anthony J. Thibault
54b11bb6ee Hide the scrollbar on the marketplace 2017-03-24 11:22:50 -07:00
Zach Fox
056d6fbe4f Actually merge from master 2017-03-24 10:10:17 -07:00
Zach Fox
915ace0087 Revert "Merge from Master" 
This reverts commit e48123b5bb.
 2017-03-24 10:04:51 -07:00
ZappoMan
52335e20a2 fix typo 2017-03-24 09:59:55 -07:00
ZappoMan
bc331af6a0 Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick 2017-03-24 08:46:43 -07:00
Seth Alves
902e3d41d6 merge from upstream 2017-03-24 08:20:35 -07:00
Brad Hefta-Gaub
9a38b36f59 Merge pull request #9970 from Triplelexx/21223 
21223 - Quat functions have naming inconsistencies
 2017-03-24 08:12:11 -07:00
Zach Fox
665b21f2f7 Checkpoint 2017-03-23 17:08:32 -07:00
Anthony J. Thibault
bab9890fea Added inputMode property to Web3DOverlay. 
This allows user to switch between Touch messages and Mouse messages.
Added a sliderTestMain.js script which demonstrates this behavior.
 2017-03-23 13:54:18 -07:00
ZappoMan
246f377a07 Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick 2017-03-23 10:40:37 -07:00
David Kelly
0edcdde746 better key mapping 2017-03-23 10:40:34 -07:00
David Kelly
a08346719c one bit of defensive code, plus some temporary logging 2017-03-23 10:29:45 -07:00
Zach Fox
e48123b5bb Merge from Master 2017-03-23 09:54:14 -07:00
Dante Ruiz
dfa6174069 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help 2017-03-23 17:34:50 +01:00
Seth Alves
62f10204d9 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-03-23 09:25:48 -07:00
David Kelly
aa085e577d more vis work 2017-03-23 09:19:04 -07:00
David Kelly
a0c19d6b59 Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-22 17:02:03 -07:00
David Kelly
7b52afb58b vis changes to fade. Still needs more work 2017-03-22 17:01:42 -07:00
Zach Fox
692ef369c7 Attempted Stale PAL fix - hard to test! 2017-03-22 15:14:11 -07:00
Triplelexx
6a17e328e8 fix myVisibility typo 2017-03-22 22:13:39 +00:00
David Kelly
675612c1e9 Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-22 14:56:23 -07:00
David Kelly
020dcca78d end handshake when successful, stop handshake sound if other guy pulls out 2017-03-22 14:55:57 -07:00
Zach Fox
bf191eabb7 Some new stale PAL behavior 2017-03-22 13:35:48 -07:00
David Kelly
34a89e4b9a added sounds, new haptics, and some cleanup 2017-03-22 13:26:51 -07:00
Dante Ruiz
3a89654111 saving work 2017-03-22 19:14:53 +01:00
Anthony J. Thibault
2c38d7ff89 Tablet spawn orientation now takes hand orientation into account. 
Perhaps this will make the tablet spawn location feel more predictable and consistent to the user.
 2017-03-22 11:03:03 -07:00
David Kelly
a594419688 friend->connection which I should have done long ago 2017-03-22 10:09:48 -07:00
Triplelexx
2d1ca99e2e change variable names that use Quat.getForward 2017-03-22 17:00:12 +00:00
Seth Alves
bd32104bc1 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-22 08:41:59 -08:00
Ryan Huffman
1285f2a9eb Merge pull request #9937 from thoys/boppo 
El Boppo the Clown punching bag game
 2017-03-22 09:30:54 -07:00
David Kelly
59b02261e5 minor cleanup, remove waiting visualization completely 2017-03-21 16:08:25 -07:00
Triplelexx
a964edee91 change all references of Quat.getFront to Quat.getForward in scripts directory 2017-03-21 22:25:30 +00:00
Dante Ruiz
d2c139ce6e fix error from using a misspelled function 2017-03-21 22:25:45 +01:00
kunalgosar
f09ee92fe1 spacing issues 2017-03-21 14:16:49 -07:00
kunalgosar
30d2ea0ea5 spacing issues 2017-03-21 14:15:56 -07:00
kunalgosar
a4af973ae4 fixed back button on marketplace 2017-03-21 14:12:54 -07:00
David Kelly
5bcd7ca97f visuals update. Will do some cleaning shortly 2017-03-21 13:27:00 -07:00
Seth Alves
14027d4acb Merge pull request #9968 from druiz17/tablet-xbox 
Fixed the third eye for the xbox controller
 2017-03-21 11:03:53 -08:00
Seth Alves
04a334fd07 unmangle merge 2017-03-21 11:02:18 -08:00
Dante Ruiz
bf3c5dbf0e Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-xbox 2017-03-21 19:47:16 +01:00
Dante Ruiz
1811a2edc7 fixed third eye laser 2017-03-21 19:45:00 +01:00
Seth Alves
1da6349505 merge from upstream 2017-03-21 10:26:02 -07:00
Ryan Huffman
13222468e3 Merge pull request #9712 from huffman/feat/edit-particle-icon 
Add particle system overlay in edit.js
 2017-03-21 10:02:52 -07:00
Seth Alves
cc4ddd1387 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-21 08:43:35 -08:00
Brad Hefta-Gaub
b7f48644af Merge pull request #9955 from druiz17/tablet-edit-selecting 
Fix edit.js from deselecting an object when trying to delete it
 2017-03-21 09:27:30 -07:00
Zach Fox
29e97381eb PAL open, user leaves, gray out row 2017-03-20 17:20:28 -07:00
Seth Alves
bc90e9081b Merge pull request #9957 from hyperlogic/bug-fix/tablet-scale 
Tablet scale settings now take effect soon after they are changed.
 2017-03-20 15:05:47 -08:00
Zach Fox
d16acc5a7f Stale PAL Notification 2017-03-20 15:24:49 -07:00
Anthony J. Thibault
f5c3d41f2c Tablet scale settings now take effect soon after they are changed. 2017-03-20 14:51:47 -07:00
Dante Ruiz
de24023a21 Fix edit.js from deselecting an object when trying to delete it 2017-03-20 20:43:32 +01:00
Seth Alves
8988110c3b Merge pull request #9953 from fayeli/edit-export-entities 
Adding Export Entities Functionality in Tablet Edit
 2017-03-20 11:35:18 -08:00
David Kelly
81cb63df6b new particle effect, first pass 2017-03-20 11:42:58 -07:00
Faye Li
f57905fbb3 remove code for jump to selection 2017-03-20 10:23:55 -07:00
Seth Alves
2e29ff3114 Merge pull request #9934 from fayeli/edit-import-entities 
Adding Import Entities button on the Create tab of Edit
 2017-03-20 09:13:08 -08:00
Brad Hefta-Gaub
af790d8474 Merge pull request #9875 from birarda/bug/spin-strafe 
fix double snap turn strafing
 2017-03-20 10:08:05 -07:00
Ryan Huffman
df644edde4 Fix hand controller not able to select light/particle icons 2017-03-20 09:45:50 -07:00
Thijs Wenker
a8740614e2 CR Fixes 2017-03-18 01:22:06 +01:00
Faye Li
197a06c423 changes in TWO entityList.js to register the export event 2017-03-17 16:17:21 -07:00
Atlante45
4c75680877 Set teleport target to Cancel if seat in use 2017-03-17 16:10:15 -07:00
Faye Li
1a46f18aa3 adding export button + hiding jump to selection 2017-03-17 15:56:55 -07:00
David Kelly
c425c32b8f hack somewhat different visualization in. If this is ok, will cleanup 2017-03-17 14:56:47 -07:00
Thijs Wenker
febe25511b teleport.js - ignore entity support (for boxing gloves) 2017-03-17 21:10:06 +01:00
Faye Li
6531efffbc hook up qml button to edit.js 2017-03-17 11:22:07 -07:00
David Kelly
58ac34b336 Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-17 08:46:04 -07:00
David Kelly
2758e740bf hacked in a particle effect (as entity) plus popped sphere into existence 2017-03-17 08:45:24 -07:00
Seth Alves
df84ff27e9 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-03-17 07:52:22 -07:00
Seth Alves
a5d19439f9 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-16 16:32:07 -07:00
Zach Fox
fc2a501474 Cleanup JS<->QML messaging 2017-03-16 15:38:39 -07:00
David Kelly
60000becce more careful stopping of intervals, edge case stuff 2017-03-16 13:19:17 -07:00
David Kelly
f0fad5981a Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into dk/newMessageStuff 2017-03-16 09:01:13 -07:00
Seth Alves
31e0cfe296 Merge pull request #9825 from thoys/record-fixes 
Avatar Recorder and Playback Fixes
 2017-03-16 07:27:42 -08:00
David Kelly
4f6123ee29 more messaging rework - dealing with edges 2017-03-15 16:41:07 -07:00
howard-stearns
84fd17bd88 use location.metaverseServerUrl instead of hardcoded value. 2017-03-15 16:33:23 -07:00
Dante Ruiz
a5f1fb9e9a fixed notification spelling error 2017-03-15 19:45:30 +01:00
Dante Ruiz
dac16af1df Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-notifcation 2017-03-15 19:27:11 +01:00
Dante Ruiz
4bc050e583 added tablet notification 2017-03-15 19:26:50 +01:00
David Kelly
d8719ac3a9 cleanup, switch to overlays with texture swapping, move overlay to between hands 2017-03-15 11:15:58 -07:00
Stephen Birarda
d13752a7c6 use the correct property name for useAdvancedMovementControls 2017-03-15 10:34:43 -07:00
Stephen Birarda
bfc51d8222 use property not function for advanced movement controls 2017-03-15 10:25:06 -07:00
Seth Alves
96a3e2a6d3 Merge pull request #9898 from ctrlaltdavid/21214 
Load controller scripts in their own script engine
 2017-03-15 08:42:20 -08:00
Seth Alves
b5919d89a5 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-15 08:26:10 -08:00
howard-stearns
6c88bc98b4 Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-15 09:24:30 -07:00
Triplelexx
5883bd39dc rename color to component 2017-03-15 11:17:27 +00:00
Triplelexx
41041c711f use utils.js 2017-03-15 11:09:13 +00:00
Triplelexx
9e0091ebe0 use utils.js, move easing function, use mixes 
some cleanup
 2017-03-15 11:08:54 +00:00
Triplelexx
84d157ab18 handle overlay lifetime during update, remove color conv 2017-03-15 10:31:09 +00:00
David Rowe
cb4bd58381 Load controller scripts in their own script engine 2017-03-15 14:31:13 +13:00
Stephen Birarda
7ddb5ff770 use correct boolean when changing AMC 2017-03-14 18:09:17 -07:00
Stephen Birarda
188530590a add missing curly brace to script 2017-03-14 17:16:49 -07:00
Stephen Birarda
490cb83489 move advanced movement control changes to MyAvatar 2017-03-14 15:03:01 -07:00
David Kelly
0a35fa34f9 some reworking, cleaning, bug fixing... 2017-03-14 14:22:44 -07:00
Zach Fox
5da0dfc4ac Merging from Pal_v2_Zach 2017-03-14 14:05:50 -07:00
Triplelexx
6971aeb081 additional reference information 2017-03-14 17:18:11 +00:00
David Kelly
f821ccc8c3 fix typo - doh! 2017-03-14 10:00:19 -07:00
Triplelexx
8a39ce16bd add simple easing function 
dodgy add push
 2017-03-14 16:57:45 +00:00
Triplelexx
4dd9a7c37f add simple easing function 2017-03-14 16:51:43 +00:00
David Kelly
246d2f4017 fix comments at top 2017-03-14 08:58:14 -07:00
Triplelexx
30c16984c0 change offsetPosition to use Camera.position 2017-03-14 06:07:22 +00:00
Triplelexx
c729ceccb5 change color lerp to use HSV color 2017-03-14 03:59:24 +00:00
David Kelly
7765daf382 handle cleanup, race, etc..., more to come 2017-03-13 18:57:01 -07:00
David Kelly
fa7283a6e2 initial new messaging - working but needs cleanup 2017-03-13 18:33:36 -07:00
Triplelexx
2e0cac4676 add extra safeguards 2017-03-14 01:25:39 +00:00
Triplelexx
8bd155cb86 change offsetPosition to use Camera.orientation 2017-03-14 01:23:04 +00:00
Ryan Huffman
8246dbafab Update particle explorer to work outside of entity list 2017-03-13 15:15:36 -07:00
Stephen Birarda
0926b2df2a add LX snap turn to standard mapping 2017-03-13 15:14:20 -07:00
Ryan Huffman
9880d40cfb Update edit.js light icons to now use the name entityIcon 2017-03-13 14:38:56 -07:00
David Kelly
515e6fd34e map Controller.Standard.RB so xbox controller works. whee. 2017-03-13 13:10:05 -07:00
howard-stearns
db06c2650f Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-13 11:53:48 -07:00
Triplelexx
95fcb1df7a fix spelling mistake 2017-03-13 18:32:53 +00:00
Ryan Huffman
d4ade8278c Fix js linting errors in entityIconOverlayManager.js 2017-03-13 11:27:12 -07:00
Ryan Huffman
b7783dcffe Update edit.js light/particle overlays to be clickable when behind something 2017-03-13 11:26:34 -07:00
David Kelly
e2e7573e93 handle stopping handshake part-way through 2017-03-13 11:04:51 -07:00
Zach Fox
beb848373b Update from zfox23/PALv2 branch 2017-03-13 10:15:06 -07:00
Ryan Huffman
c2564800dc Add edit.js particle + light icons 2017-03-13 10:10:53 -07:00
Ryan Huffman
dbcd7fd9e9 Fix light icon overlay not updating to represent light type 2017-03-13 10:10:53 -07:00
Ryan Huffman
42d518fafb Remove debug log in entityIconOverlayManager 2017-03-13 10:10:53 -07:00
Ryan Huffman
86116aaad7 Update light/particel icons to be shown by default in edit mode 2017-03-13 10:10:53 -07:00
Ryan Huffman
ce5ee42961 Update LightOverlayManager to work with particles 2017-03-13 10:10:53 -07:00
Seth Alves
524e4bdfbc Merge pull request #9853 from sethalves/tablet-ui-fix-edit-props-race 
Tablet ui fix edit props race
 2017-03-13 08:56:56 -08:00
Triplelexx
873a9aa39e change color swapping to be more concise 2017-03-11 07:40:32 +00:00
Brad Hefta-Gaub
23e47f2fdc added icons to the audioScope app 2017-03-10 18:13:35 -08:00
Brad Hefta-Gaub
b8a2525f9e add auto pause/resume to the Audio Scope App 2017-03-10 17:38:00 -08:00
Anthony J. Thibault
3abc78e7d3 Fix for finger/sytlus on invisible/hidden tablet. 2017-03-10 17:18:13 -08:00
Brad Hefta-Gaub
5f3ee2e98f add a basic tablet app for the audio scope 2017-03-10 17:08:54 -08:00
Anthony J. Thibault
07e10ae862 Merge branch 'tablet-ui' into feature/can-touch-this 2017-03-10 17:05:26 -08:00
Triplelexx
8a0dd55275 change naming and comment 2017-03-11 00:19:02 +00:00
Triplelexx
eb4dee0495 create audioMuteOverlay.js 
client scipt that creates an overlay to provide mute feedback
 2017-03-10 23:37:29 +00:00
Seth Alves
2098cd5b5e remove stylus and search-beams when grab script is shut down 2017-03-10 13:02:16 -08:00
Seth Alves
88e74251a1 cleanups 2017-03-10 12:51:34 -08:00
Seth Alves
411ec9a791 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-fix-edit-props-race 2017-03-10 10:22:10 -08:00
Seth Alves
fffff817a3 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-10 10:20:40 -08:00
Seth Alves
494b602d4c Merge pull request #9850 from druiz17/toolbar-MIA-afetr-snapshot 
toolbar becomes visible after taking a snapshot
 2017-03-10 10:20:01 -08:00
Seth Alves
cef4c988c4 Merge pull request #9835 from druiz17/toolbar-window-dont-close 
Close toolbar windows when reloading scripts
 2017-03-10 10:19:07 -08:00
Seth Alves
d792559d9a have edit.js resend properties of selected entity to entityProperties.js once it's ready 2017-03-10 09:59:23 -08:00
Dante Ruiz
d54005b62e no more duplicate snapshot buttons after taking reloading scripts 2017-03-10 00:17:44 +00:00
Dante Ruiz
c6c0c6d382 toolbar becomes visible after taking a snapshot 2017-03-09 22:54:22 +00:00
Anthony J. Thibault
d8f04d90a7 Merge branch 'master' into feature/can-touch-this 2017-03-09 14:24:10 -08:00
Anthony J. Thibault
6f53aaed5c Small simplification of building stylusTarget list. 2017-03-09 14:04:13 -08:00
druiz17
0069569e96 Merge branch 'tablet-ui' into 21197 2017-03-09 09:31:15 -08:00
Seth Alves
023b01814e Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-quick-summon-1 2017-03-09 09:16:37 -08:00
druiz17
007ed9fe81 Merge pull request #9836 from druiz17/2-tablets-fix 
Fixed having more than one tablet when reloading scripts
 2017-03-09 09:13:14 -08:00
Anthony J. Thibault
1acc5ea760 Finger now points when near tablet + deadspot added when touching the tablet 2017-03-08 19:03:56 -08:00
Dante Ruiz
2a275a4f4b removed tab at the end of word 2017-03-09 00:15:02 +00:00
Seth Alves
9435c58c2c Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into tablet-ui-quick-summon-1 2017-03-08 16:10:38 -08:00
Dante Ruiz
b878f164fb minimize diff again 2017-03-09 00:10:38 +00:00
Dante Ruiz
f6d799c048 minimize diff 2017-03-09 00:09:32 +00:00
Dante Ruiz
561bd27c38 minimize diff 2017-03-09 00:08:50 +00:00
Dante Ruiz
5f7a0ea8fc Close tablet when switching form HMD to desktop and vice versa 2017-03-09 00:05:26 +00:00
Seth Alves
6aac2eb338 for overlay tablets, precreate them so that they show up quickly when summoned 2017-03-08 15:31:24 -08:00
Seth Alves
de2dd7383d didn't need invis flag, after all 2017-03-08 15:30:49 -08:00
Dante Ruiz
ce105e0329 fix double tablets when reloading scripts 2017-03-08 22:21:57 +00:00
Dante Ruiz
881213259d Merge branch 'master' of github.com:highfidelity/hifi into toolbar-window-dont-close 2017-03-08 21:44:20 +00:00
Dante Ruiz
59b4fa5fd7 Close toolbar windows when scripts are reloaded 2017-03-08 21:44:04 +00:00
Seth Alves
371c20ee25 hide tablet by making it not visible rather than destroying it 2017-03-08 10:33:59 -08:00
Seth Alves
66d44ac6f0 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-08 09:26:51 -08:00
Seth Alves
a67f8ac0ed Merge pull request #9807 from Menithal/21166-remove-limit 
#9761 Cloneable Improvement
 2017-03-08 07:15:06 -08:00
David Rowe
950f91965d Merge branch 'tablet-ui-edit-js' into 21197 2017-03-08 17:35:58 +13:00
Anthony J. Thibault
836c701cb3 More accurate and responsive stylus and finger touching. 
The algorithm used to detect when and where the stylus or finger is touching the tablet has been improved.

* hovering the finger/stylus over the surface of the tablet should cause buttons to highlight.
* flicking or using the stylus like a drum stick, should more accurately click buttons on the tablet.
* stabbing the tablet quickly, should also more accurately trigger button presses.
* moving the hand/stylus from behind the tablet should be less likely to cause press events.
 2017-03-07 18:19:32 -08:00
Thijs Wenker
b21bd3afa9 Make the time and slider follow the record.js toolbar 2017-03-08 01:14:11 +01:00
Seth Alves
b938579598 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-07 11:42:44 -08:00
Andrew Meadows
1e9623e2f2 Merge pull request #9813 from druiz17/multipule-audio-fix 
removed duplicated audio devices
 2017-03-07 10:00:48 -08:00
Seth Alves
f594689fa8 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-07 09:24:50 -08:00
Dante Ruiz
fc65723d68 corrected removing duplicate devices 2017-03-06 22:14:20 +00:00
Seth Alves
4886f1cbfc don't run stylus-on-overlay code unless the overlay is a web3d overlay 2017-03-06 12:38:19 -08:00
Brad Hefta-Gaub
38668b6ce5 Merge pull request #9812 from sethalves/dont-auto-ungrab-overlays 
don't automatically unhook overlays from hands unless they were grabbable overlays
 2017-03-06 12:32:18 -08:00
Thijs Wenker
6ded937b25 Merge pull request #9809 from Menithal/21201 
WL#21201 Snap-together Magnetic blocks
 2017-03-06 21:30:53 +01:00
David Rowe
09ecb12510 Merge branch 'tablet-ui-edit-js' into 21197 
# Conflicts:
#	interface/src/ui/overlays/Web3DOverlay.cpp
 2017-03-07 08:59:40 +13:00
Seth Alves
27066e89a6 Merge branch 'dont-auto-ungrab-overlays' of github.com:sethalves/hifi into tablet-ui-edit-js 2017-03-06 11:46:19 -08:00
Seth Alves
a2d2c41f02 remove debug print 2017-03-06 11:45:49 -08:00
Seth Alves
08e2e421e4 Merge branch '21199' of github.com:ctrlaltdavid/hifi into tablet-ui-edit-js 2017-03-06 11:08:27 -08:00
Seth Alves
eb47db4441 Merge branch 'dont-auto-ungrab-overlays' of github.com:sethalves/hifi into tablet-ui-edit-js 2017-03-06 11:07:22 -08:00
Dante Ruiz
b6671d92c8 removed duplicated audio devices 2017-03-06 18:46:57 +00:00