Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 00:43:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
51947 commits 76 branches 59 tags 1.2 GiB
Commit graph

2244 commits

Author SHA1 Message Date
David Rowe
71ba38afb0 Process controller and script updates only when finger painting is on 2017-02-18 21:28:30 +13:00
David Rowe
05c63e16ca Send messages local only 2017-02-18 20:40:27 +13:00
David Rowe
6827a28807 Fix grab position 2017-02-18 16:36:14 +13:00
David Rowe
692fa52aca Disable drawing pointer lasers while painting 2017-02-18 15:21:48 +13:00
David Rowe
2c02b42c96 Finger paint button icon files 2017-02-18 14:21:54 +13:00
David Rowe
0689557ba5 Draw smoother lines 2017-02-18 13:39:59 +13:00
David Rowe
777a0b51c1 Ignore spurious finger tip position values 2017-02-18 13:35:16 +13:00
David Rowe
784009a9fa Merge branch 'master' into 21168 2017-02-18 13:20:39 +13:00
Seth Alves
def669364b Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid 2017-02-17 15:45:19 -08:00
Menithal
f5d266a562 Updated 2017-02-17 23:28:28 +02:00
Seth Alves
39e1edafd2 merge from upstream 2017-02-17 13:16:12 -08:00
David Rowe
2c5782e4bb Fix laser beam jumping upon grabbing entity 2017-02-18 09:11:04 +13:00
Seth Alves
5ddcbae934 save tablet web-overlay ID in HMD interface. don't trigger edit affordances if the click was intented for the tablet 2017-02-17 11:51:23 -08:00
Seth Alves
47cdade1e9 fix home-button on tablet 2017-02-17 11:47:37 -08:00
Seth Alves
0d10667bb4 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-17 09:58:33 -08:00
David Kelly
51246a2e45 first cut, pretty ugly 2017-02-17 10:24:01 -07:00
Menithal
f211f015d7 Merge branch 'master' into parent-hotkey 2017-02-17 19:22:28 +02:00
David Rowe
3712aea861 Handle trigger values of 1.0 not repeating 2017-02-17 19:31:53 +13:00
David Rowe
bdfc9fd418 Tidying 2017-02-17 19:31:40 +13:00
David Rowe
25761adf6c Erase closest line 2017-02-17 19:31:25 +13:00
David Rowe
9c1bb37a34 Paint lines 2017-02-17 19:31:11 +13:00
David Rowe
5236f123c1 Interpret trigger and grip values 2017-02-17 19:30:57 +13:00
David Rowe
7b36669d80 Point index finger while painting if tablet not displayed 2017-02-17 19:30:40 +13:00
David Rowe
867e24762b Disable lasers and grabbing while painting if tablet not displayed 2017-02-17 19:30:23 +13:00
David Rowe
bad57fa03f Controller and painting code framework 2017-02-17 19:30:04 +13:00
David Rowe
585691f71c Add finger painting button to tablet 2017-02-17 19:29:11 +13:00
Anthony J. Thibault
47e87e1ad4 Bug fix for clara.io marketplace 2017-02-16 17:41:36 -08:00
Anthony J. Thibault
2ea88012f9 Remove toolbar from tablet-goto.js 2017-02-16 17:36:16 -08:00
Anthony J. Thibault
345f0519ef Removed use of Toolbar API for most default scripts. 2017-02-16 17:29:35 -08:00
Seth Alves
b6b6ad780d allow isSpotlight to be 0 or 1 2017-02-16 17:15:52 -08:00
Anthony J. Thibault
cffdecbf68 Merge branch 'master' into feature/toolbar-tablet-switcheroo 2017-02-16 16:28:43 -08:00
Anthony J. Thibault
7f95753a1e Prevent tablet from being open while in toolbarMode 2017-02-16 16:18:51 -08:00
howard-stearns
6e3ae1fe4f cleanup some accumulated cruft in pal code 2017-02-16 10:53:02 -08:00
Menithal
afbf4bc30f Fixed Parenting/Unparenting Menu Removal and Binding 2017-02-16 10:52:42 +02:00
Menithal
d96f95a7e9 Updated edit.js and selection tool 
Last selected entity will now be yellow instead of orange
 2017-02-16 10:05:59 +02:00
Seth Alves
12b8a77488 in edit.js, convert entity property ID to be a text-field so the data can be copied 2017-02-15 16:29:50 -08:00
Seth Alves
3d7733219c edit's open-asset-browser button works, again 2017-02-15 16:15:18 -08:00
Seth Alves
e030a4a518 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-15 15:20:14 -08:00
Seth Alves
33c1c3ac11 when a new particle-entity is created, hook the particle explorer to it 2017-02-15 15:19:49 -08:00
Seth Alves
076b0ed3ab get particle explorer working, again 2017-02-15 15:00:25 -08:00
Menithal
856cdcbd28 Merge remote-tracking branch 'origin' into parent-hotkey 2017-02-16 00:38:01 +02:00
Menithal
c3021ae60d Fixing Menu Items for Parenting / Unparenting 2017-02-15 22:21:29 +02:00
Seth Alves
3ea0f6d2d2 allow lasers to scroll tablet while in edit-mode 2017-02-15 11:34:48 -08:00
David Kelly
5184cbe615 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2 2017-02-15 12:08:55 -07:00
Seth Alves
a19bc31a78 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-15 10:51:22 -08:00
Seth Alves
792c7ff51f PointerEvent will now relay keyboard modifiers 2017-02-15 10:41:56 -08:00
Faye Li
2388ec65fe Merge pull request #9659 from fayeli/users-fix 
Tablet Users Fixes
 2017-02-15 10:25:06 -08:00
Faye Li
8aae2aa5f0 simpler filter code 2017-02-15 10:23:36 -08:00
Faye Li
5ece3f1e1a use new users icon 2017-02-15 10:16:20 -08:00
Menithal
655c49d9c0 edit.js: started to work on Parenting via hotkey 2017-02-15 19:50:15 +02:00
Menithal
7b02d1073a Added a generic Window Notification for Feedback 
This allows to use the existing Pop-up notifications for generic
notification messages
 2017-02-15 19:49:31 +02:00
Seth Alves
219e569014 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-15 07:25:39 -08:00
Philip Rosedale
01bdac49d0 Merge pull request #9672 from ctrlaltdavid/21121 
Fix far grabbing making entity jump upon grab
 2017-02-14 17:02:42 -08:00
Anthony J. Thibault
912e8aa04a Tablet buttons now work in toolbar. 
Switching between tablet and toolbar is not as dynamic as I'd like but it's a start.
 2017-02-14 15:37:24 -08:00
Anthony J. Thibault
f8055a027e Refactor of pal.js to dynamically switch between toolbar and tablet. 2017-02-14 15:34:24 -08:00
Seth Alves
838d7f6f10 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-14 13:58:18 -08:00
Seth Alves
3a23ec86d5 handles etc work better 2017-02-14 13:57:48 -08:00
David Rowe
625f5efdf8 Merge branch 'master' into 21164 
# Conflicts:
#	scripts/system/audio.js
 2017-02-15 10:00:52 +13:00
Chris Collins
442e8d68ef Merge pull request #9650 from kunalgosar/browserFix 
Added isAway (paused) property to myAvatar
 2017-02-14 11:16:07 -08:00
Dante Ruiz
46cfa7cf13 saving work 2017-02-14 07:46:31 -08:00
Dante Ruiz
61912b6ff0 saving work 2017-02-14 07:46:31 -08:00
Seth Alves
d40402faae Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-14 06:53:34 -08:00
Seth Alves
4393bc3c2e Merge pull request #9656 from humbletim/21114-part1 
CR-1 21114 -- ScriptCache/ScriptEngine cleanup, loader states, accessible load errors
 2017-02-14 06:49:05 -08:00
Seth Alves
30c46b89a0 Merge pull request #9668 from hyperlogic/feature/remove-tablet-color-effect 
Removed ColorOverlay from TabletButton, added more icon & text states
 2017-02-14 06:16:59 -08:00
David Rowe
2672b8d10a Fix tabs 2017-02-14 17:30:56 +13:00
David Rowe
61f8631a2b Fix far grabbing making entity jump upon grab 2017-02-14 17:30:20 +13:00
Faye Li
a57a0435c1 fix overlapping issue with the delete button 2017-02-13 15:13:10 -08:00
Anthony J. Thibault
1c783031b1 Removed ColorOverlay from TabletButton, added more icon & text states 
Now uses separate images for each state. Now tabletButtonProxy has 4 state properties, one for icon and images.

  * icon
  * hoverIcon
  * activeIcon
  * activeHoverIcon

  * text
  * hoverText
  * activeText
  * activeHoverText

Updated scripts to set new button states, if necessary.
 2017-02-13 15:09:46 -08:00
Faye Li
f981f21aa4 fix for ozan's domain 2017-02-13 11:47:58 -08:00
Atlante45
512bb4765f Add entity clicks capture capabilities 2017-02-13 11:34:30 -08:00
Faye Li
27057190ce display users even if they dont have a domain name 2017-02-13 11:01:37 -08:00
Faye Li
8cc8f2c7fd highlight current visibility option 2017-02-13 10:51:01 -08:00
Faye Li
6e0d7bb3cf make visibility settings into a modal for better readability 2017-02-13 10:42:07 -08:00
David Kelly
92ee823ef3 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2 2017-02-13 10:22:42 -07:00
humbletim
831bf93500 * refactor ScriptCache per FIXMEs 
* include error details in BatchLoader results
* update EntityServerScript properties in edtior to reflect more granular statuses
* ScriptEngine plumbing in prep for require/module integration
 2017-02-11 04:47:31 -05:00
David Rowe
77f0fb1491 Change the "Mute" tablet button to "Audio" 2017-02-11 22:40:19 +13:00
kunalgosar
a8f223518c modified away script to use MyAvatar.isAway property 2017-02-10 17:28:12 -08:00
Faye Li
65ca0c7e4a sticky header bar 2017-02-10 17:27:02 -08:00
Seth Alves
bd0b64c775 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-10 16:57:25 -08:00
Seth Alves
44aa3e044b make it so near grabbing while edit is active doesn't select a new entity 2017-02-10 16:56:53 -08:00
Faye Li
e28e16ea5e make drop down text a little bit bigger 2017-02-10 16:56:13 -08:00
Faye Li
0ba934f543 sort online users array alphabetically 2017-02-10 16:39:14 -08:00
Faye Li
8f43ceed9d filter out yourself from users online list 2017-02-10 16:22:30 -08:00
Seth Alves
fead52f626 put new-entity buttons in a tab of the edit app 2017-02-10 15:18:01 -08:00
Seth Alves
0b358a2ac7 finish hooking up new-model dialog 2017-02-10 13:29:06 -08:00
David Rowe
b5b92c1508 Make the tablet's mic icon reflect the current mute state 2017-02-11 09:53:02 +13:00
Seth Alves
3171ce1602 hook up more of new-model dialog 2017-02-10 12:03:26 -08:00
Brad Hefta-Gaub
765500ebce remove debug and fix bug in test script 2017-02-10 10:09:03 -08:00
Brad Hefta-Gaub
f6d4dbb7a4 some debugging 2017-02-10 09:18:04 -08:00
David Rowe
8a995cc1d2 Display list of audio input devices before list of audio output devices 2017-02-10 20:14:52 +13:00
David Rowe
9e3d8b0b6d Move the audio devices list into the root audio dialog 2017-02-10 20:11:20 +13:00
Brad Hefta-Gaub
7fba30f0dd add a test script to show binary message passing 2017-02-09 22:21:51 -08:00
David Kelly
5ca80803c0 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2 2017-02-09 20:01:43 -07:00
Seth Alves
7a63b07462 attempting to handle new-model dialog 2017-02-09 17:14:10 -08:00
Seth Alves
24fc9bbe67 honor HUDUIEnabled setting 2017-02-09 15:12:01 -08:00
Seth Alves
e12c77e576 move the edit tabs into tablet 2017-02-09 14:43:44 -08:00
Seth Alves
c4ac719d2c merge from upstream + cleanups 2017-02-09 14:26:29 -08:00
Seth Alves
4c3a6842a5 start on moving edit.js to tablet 2017-02-09 14:03:01 -08:00
Atlante45
72ed1add94 CR log spam cleanup 2017-02-09 13:04:43 -08:00
Atlante45
6fbe3c9187 Windows specific changes 2017-02-09 13:04:43 -08:00
Atlante45
43d2501993 Add HMD friendly window for the ESS log 2017-02-09 13:04:43 -08:00
Brad Hefta-Gaub
bc22326ec8 Merge pull request #9640 from ZappoMan/avatarSimulationStats 
New stats for avatar simulation
 2017-02-09 12:58:30 -08:00
Brad Hefta-Gaub
ae071aec0d add a bunch more stats for avatar processing 2017-02-09 09:52:09 -08:00
Dante Ruiz
0e83e5da06 minimize diff 2017-02-09 07:13:30 -08:00
Dante Ruiz
580216c3d2 adding tablet-goto.js 2017-02-09 07:13:30 -08:00
Dante Ruiz
5c5ace7c7b goto in tablet 2017-02-09 07:13:29 -08:00
Philip Rosedale
c9c04a9afc Merge pull request #9638 from PhilipRosedale/fixRescale 
Fix rescale avatar bug
 2017-02-08 22:09:41 -08:00
Seth Alves
2ec4f118fd Merge pull request #9639 from hyperlogic/feature/tablet-pal 
Ported PAL to tablet
 2017-02-08 21:17:38 -08:00
Anthony J. Thibault
c2b832fb9c removed debug prints from pal.js 2017-02-08 18:55:22 -08:00
Brad Hefta-Gaub
41dc498888 add inView simulation stats 2017-02-08 18:32:39 -08:00
Philip Rosedale
e94e41698e remove debug 2017-02-08 18:04:55 -08:00
Anthony J. Thibault
a209d0372a First cut of pal on tablet. 2017-02-08 17:34:03 -08:00
Brad Hefta-Gaub
6c41a25032 more stats 2017-02-08 16:51:00 -08:00
Philip Rosedale
dc957d09d8 remove comment 2017-02-08 15:45:29 -08:00
Philip Rosedale
fe92d38b60 Fixed scaling of self 2017-02-08 15:42:10 -08:00
Brad Hefta-Gaub
357cc052e1 first cut at simulation stats 2017-02-08 15:32:48 -08:00
Clément Brisset
91bfa65fe2 Merge pull request #9586 from Triplelexx/21146 
21146
 2017-02-08 11:07:27 -08:00
David Kelly
61e558e568 Entity Edit Filters for zones 
Part 1 - just put them in the zones entities.  Next I'll hook them
up and actually filter...
 2017-02-08 09:53:25 -07:00
Seth Alves
47976406fc Merge pull request #9607 from hyperlogic/bug-fix/better-haptics 
More consistent haptics on web overlays and entities
 2017-02-08 05:47:05 -08:00
Anthony J. Thibault
244437d971 set WANT_DEBUG_STATE back to false 2017-02-07 23:50:06 -08:00
Seth Alves
e1a3b0c551 Merge pull request #9629 from hyperlogic/feature/tablet-2d-window-pos 
In desktop mode create tablet near mouse click location.
 2017-02-07 19:51:05 -08:00
Anthony J. Thibault
cb58c567b8 In desktop mode create tablet near mouse click location. 
But prevent the tablet from being displayed off screen.
 2017-02-07 18:18:34 -08:00
howard-stearns
2e88f1ab1f conserving audio interval 2017-02-07 16:21:14 -08:00
howard-stearns
23fc9b6fb3 Merge branch 'master' of https://github.com/highfidelity/hifi into pal-performance 2017-02-07 16:00:08 -08:00
howard-stearns
3bd11978aa low-hanging fruit on pal performance 2017-02-07 15:59:38 -08:00
Seth Alves
90fa8bf572 Merge pull request #9612 from druiz17/users 
some tweaks to users and menus got tablet
 2017-02-07 15:38:43 -08:00
Triplelexx
e7244b47a9 increase LETTER_OFFSET value 
allow more room for characters, could be improved by detecting each one
 2017-02-07 21:55:55 +00:00
howard-stearns
9a44f63b74 update crowd-agent and summon for bubble, avatar-mixin optimizations. 2017-02-07 13:14:15 -08:00
Chris Collins
d2feb4202b Merge pull request #9621 from sethalves/tablet-ui-track-opens-and-closes 
send UserActivityLogger events when tablet is opened or closed
 2017-02-07 08:23:09 -08:00
Anthony Thibault
2f09be5ead Merge pull request #9605 from druiz17/tabletClicking 
enforce more button clicking logic
 2017-02-06 20:23:16 -08:00
Seth Alves
e3af5032c0 send UserActivityLogger events when tablet is opened or closed 2017-02-06 16:49:26 -08:00
Seth Alves
68de18a3bb Merge pull request #9610 from sethalves/tablet-ui-use-models-from-s3-again 
use tablet models from s3 until relative model urls work
 2017-02-03 18:34:28 -08:00
Dante Ruiz
0c28776ea2 some tweaks to users and menus got tablet 2017-02-04 00:13:39 +00:00
Seth Alves
9f04a72a38 Merge pull request #9599 from hyperlogic/feature/tablet-ui-button-sort-order 
tablet-ui: Added sortOrder property to buttons
 2017-02-03 15:20:53 -08:00
Seth Alves
f635cd8a07 use tablet models from s3 until relative model urls work 2017-02-03 15:17:33 -08:00
Anthony J. Thibault
6738c0eade More consistent haptics on web overlays and entities 2017-02-03 12:05:30 -08:00
Dante Ruiz
2a3d0b6b17 enforce more button clicking logic 2017-02-03 19:13:57 +00:00
Chris Collins
bac5bd5c0e Merge pull request #9595 from hyperlogic/bug-fix/tablet-ui-bugfixes 
tablet-ui: Bug fixes
 2017-02-02 17:53:47 -08:00
Anthony J. Thibault
6bef9e888b Merge branch 'master' into bug-fix/tablet-ui-no-domain 2017-02-02 17:21:20 -08:00
Anthony J. Thibault
85e01e3922 tablet-ui: Added sortOrder property to buttons 
By default user created buttons will appear after system buttons.
 2017-02-02 17:18:22 -08:00
Seth Alves
f40285c688 Merge pull request #9597 from druiz17/tabletStylus 
better scrolling and fixed button touching
 2017-02-02 16:56:13 -08:00
Anthony Thibault
be4fbb63cf Merge pull request #9583 from sethalves/fix-post-tablet-edit-buttons 
fix the edit.js toolbar buttons so they don't vanish when moused-over or clicked
 2017-02-02 16:01:56 -08:00
Anthony Thibault
59b33bbc53 Merge pull request #9585 from sethalves/use-local-tablet-model 
use tablet model from distribution rather than from s3
 2017-02-02 16:01:15 -08:00
Dante Ruiz
0ec8071288 better scrolling and fixed button touching 2017-02-02 23:16:39 +00:00
Anthony J. Thibault
b44e5b5a1f tablet-ui: preferences for tablet ui scaling 
One for the tablet in HMD mode, one for desktop mode.
The default desktop mode scaling factor is now 75%, which should
reduce the size of the for users with low resolution monitors,
while still being somewhat readable.
 2017-02-02 14:05:07 -08:00
Anthony J. Thibault
5890503ec0 Can now grab tablet in 2d mode even when it embedded in geometry 2017-02-02 10:56:56 -08:00
Anthony J. Thibault
9df887de2a You can no longer scale the tablet with double-grab 2017-02-02 10:16:02 -08:00
Dante Ruiz
2af72f1a50 fixed tablet buliding up when flying fast 2017-02-02 17:03:53 +00:00
Seth Alves
4ae163ac60 hook pal audio meter up again 2017-02-01 19:01:55 -08:00
Triplelexx
05e3acf1a3 Merge remote-tracking branch 'upstream/master' into 21146 2017-02-02 01:16:51 +00:00
Triplelexx
1a58dad3ad change age check 
check for equal to -1 instead of < 1, think this would be more suitable
if undefined is returned.
 2017-02-02 01:12:55 +00:00
Seth Alves
d9bdbb92ef use tablet model from distribution rather than from s3 2017-02-01 16:55:29 -08:00
Seth Alves
6671324a33 fix the edit.js toolbar buttons so they don't vanish when moused-over or clicked 2017-02-01 16:29:12 -08:00
Faye Li
4f04865963 load tablet users in default scripts 2017-02-01 15:37:54 -08:00
Faye Li
80c8748046 Revert "replace old user.js" 
This reverts commit 2340f56b53.
 2017-02-01 15:37:01 -08:00
Faye Li
2340f56b53 replace old user.js 2017-02-01 15:26:40 -08:00
Faye Li
c24b6e5e5e missing words 2017-02-01 15:13:52 -08:00
Faye Li
c16a9a955e display correct username 2017-02-01 14:53:03 -08:00
Faye Li
9a22055c27 initialise the toggle button with correct info 2017-02-01 14:30:16 -08:00
Faye Li
3c3ff908b4 handling the visibility toggle event 2017-02-01 14:22:13 -08:00
Faye Li
6d55b3c82d visibility toggle drop down 2017-02-01 13:45:17 -08:00
Faye Li
378fdaec8b the missing commit - fix typo and added user info 2017-02-01 11:27:48 -08:00
Faye Li
d78c274472 Merge branch 'master' into users-jump-to 2017-02-01 10:59:32 -08:00
Faye Li
4e209399da fix conflict 2017-02-01 10:58:03 -08:00
Faye Li
5946339782 move my changes to a different file 2017-02-01 10:52:37 -08:00
Faye Li
3f84e5778c jump to the selected user 2017-02-01 10:45:18 -08:00
Faye Li
fc1e588588 sending and recieving jump to event 2017-02-01 10:34:54 -08:00
Seth Alves
ab8be15ce0 Merge pull request #9570 from highfidelity/tablet-ui 
Tablet ui
 2017-02-01 09:38:13 -08:00
Triplelexx
5bf29f4657 improve dimensionsFromName implementation 2017-02-01 12:59:40 +00:00
Triplelexx
b5d2926605 make text entity smaller and allow dynamic resizing based on name length 2017-02-01 12:49:41 +00:00
Anthony J. Thibault
3c04f54e75 more fixes to third person tablet usage. 2017-01-31 18:22:38 -08:00
Anthony J. Thibault
008a58f9d7 Only reposition the tablet when camera mode changes, in HMD mode. 2017-01-31 18:03:48 -08:00
Anthony J. Thibault
c147b9bec0 Fix for tablets in third-person HMD mode. 2017-01-31 18:00:18 -08:00
Faye Li
59aea60be0 fill confirmation modal with data of the selected user 2017-01-31 16:16:40 -08:00
Faye Li
fda20694b3 jump to user confimation modal 2017-01-31 15:47:51 -08:00
Seth Alves
3a6a7bcc8a put tablet version of users.js into a different file 2017-01-31 14:44:09 -08:00
Faye Li
06d797bb3b load bootstrao 2017-01-31 14:27:17 -08:00
Triplelexx
be68f84100 update nameTag.js comments 2017-01-31 22:14:39 +00:00
Anthony J. Thibault
e2e19884bb Tablet should work even when not connected to any domain. 
handControllerGrab.js and WebTablet.js now parents objects to the
AVATAR_SELF_ID parentID, instead of using MyAvatar.sessionUUID, which
is unavailable when not connected to any domain.

I removed several early returns handControllerGrab.js that prevented
grabbing from working if MyAvatar.sessionUUID was invalid.

There were places in the EntityItem.cpp and EntityScriptingInterface.cpp
C++ that would log an error if parentID was set to AVATAR_SELF_ID.
This was to prevent AVATAR_SELF_ID from ever going over the network.
Instead, we now prevent this by replacing all outgoing references of
AVATAR_SELF_ID with the sessionID of the current node.
 2017-01-31 13:52:12 -08:00
Seth Alves
d835de2fec Merge pull request #9547 from druiz17/tabletBug 
Grabbing tablet while in edit mode
 2017-01-31 13:37:11 -08:00
Seth Alves
ec67cabaf5 Merge pull request #9540 from fayeli/new-users-js 
Rework Users.js for Tablet
 2017-01-31 13:36:53 -08:00
Triplelexx
f159d4c91d create nameTag.js script 
Running the script creates a text entity that will hover over the users
head showing their display name.
 2017-01-31 20:45:35 +00:00
Brad Hefta-Gaub
cff49ea5f3 Merge pull request #9556 from samcake/blue 
Adding support for disabling texturing from the material
 2017-01-31 10:39:44 -08:00
Dante Ruiz
7a4a769015 fix more editing bugs 2017-01-31 16:53:57 +00:00
samcake
3c56bd2960 Adding support for disabling texturing from the material 2017-01-30 15:03:04 -08:00
Dante Ruiz
b264d84385 minimize git diff 2017-01-30 13:27:25 -08:00
Dante Ruiz
57a9d34cda minimize git diff 2017-01-30 13:27:25 -08:00
Dante Ruiz
8879727d88 ability to grab tablet in edit mode 2017-01-30 13:27:25 -08:00
Anthony J. Thibault
98b53d1d29 Don't allow mouse dragging the tablet in HMD mode. 2017-01-30 12:07:18 -08:00
Faye Li
8e64de26a9 Merge branch 'tablet-ui' into new-users-js 2017-01-30 11:25:58 -08:00
Anthony J. Thibault
39d68828ab Disable FXAA on tablet overlay in desktop mode. 
This introduces the "isAA" property to 3d overlays. When false, the overlay is rendered after
the "Antialiasing" render pass.  Ironically, disabling FXAA makes the text more readable, which is
essential in 2D desktop mode.

Two new shaders were introduced.

simple_opaque_web_browser_overlay.slf
simple_transparent_web_browser_overlay.slf

These are tailored to write into the main framebuffer instead of the g-buffer.
 2017-01-30 11:24:59 -08:00
Faye Li
ff1c4995af removed unused code 2017-01-27 15:44:07 -08:00
Faye Li
ea366dd227 removed unused code 2017-01-27 15:38:49 -08:00
Faye Li
8091b0ced4 button style 2017-01-27 13:33:07 -08:00
Dante Ruiz
2c7cbb1bd9 close tablet with mouse in HMD 2017-01-27 20:58:36 +00:00
Faye Li
bf51ba7195 button brings up add/remove friends page 2017-01-27 11:34:38 -08:00
Faye Li
bfbee20f43 display friends 2017-01-27 10:19:20 -08:00
Seth Alves
fa61bbe2a6 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-26 18:21:39 -08:00
Seth Alves
95d5c64e83 put a schmitt trigger in place to de-bounce tablet clicks 2017-01-26 15:09:35 -08:00
Seth Alves
c0f169e242 allow tablet-stabbers to more easily click buttons 2017-01-26 14:54:32 -08:00
ZappoMan
4c80422a73 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-26 14:34:58 -08:00
Seth Alves
e3d4cae515 avoid having the snapshot script be multi-activated by a single button-click 2017-01-26 14:29:49 -08:00
Seth Alves
d85d892057 Merge pull request #9522 from fayeli/PAL-to-PEOPLE 
Tablet Button name from PAL to PEOPLE
 2017-01-26 12:58:16 -08:00
Faye Li
44fc8a5fbf update button name 2017-01-26 11:23:06 -08:00
Seth Alves
0b51b1d566 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-26 11:00:02 -08:00
Brad Hefta-Gaub
5ada689ab7 Merge pull request #9497 from ctrlaltdavid/fix-clara-download 
Fix intermittent Clara.io download crashes
 2017-01-26 10:58:27 -08:00
Seth Alves
68de5c9757 Users to USERS in button 2017-01-26 10:23:38 -08:00
Seth Alves
e2b1f4b2ab include tablet fbx with interface distribution rather than get it from s3 2017-01-26 10:20:46 -08:00
ZappoMan
3c3dcbbbaa Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-26 08:20:03 -08:00
Faye Li
6a4a9bcb32 end of day commit 2017-01-25 17:53:32 -08:00
Faye Li
0a3a0e817e polling users and displaying user count 2017-01-25 17:36:50 -08:00
Seth Alves
9497b2b7c5 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-01-25 17:16:12 -08:00
Seth Alves
129fe6ea49 dammit, emacs 2017-01-25 17:15:54 -08:00
Faye Li
b5b781f4a5 tab content switching 2017-01-25 16:59:16 -08:00
Anthony J. Thibault
2af59630fb Better legibility of tablet in 2D with small window sizes. 2017-01-25 16:43:36 -08:00
Seth Alves
204652514e fix some fallout from toolbar changes 2017-01-25 16:29:36 -08:00
Faye Li
5ad522668a tabs header for everyone and friends 2017-01-25 16:29:25 -08:00
Seth Alves
c317ba8054 merge from upstream 2017-01-25 15:57:53 -08:00
Seth Alves
f382b541c7 merge from upstream 2017-01-25 15:42:33 -08:00
Seth Alves
ff8d13ecc7 get button-states for toolbar buttons working again 2017-01-25 15:38:54 -08:00
Faye Li
6f46136699 reorder buttons to match mockup 2017-01-25 15:02:55 -08:00
Faye Li
49a8964c4e reference new users icon art 2017-01-25 14:43:39 -08:00
Faye Li
ce0ee610ea a test on polling friends 2017-01-25 14:32:36 -08:00
Seth Alves
98f1664a46 use a setting to decide which UI is enabled 2017-01-25 14:17:45 -08:00
Atlante45
f540c94113 Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr 2017-01-25 13:06:49 -08:00
Seth Alves
f18094f565 make use of tablet or HUD depend on a single variable. avoid some duplicated code 2017-01-25 12:00:34 -08:00
Faye Li
f02b2ef40a auto poll users when page loads 2017-01-25 11:59:31 -08:00
Faye Li
c7a0e609fc created a friends button for metaverse friends page 2017-01-25 11:41:07 -08:00
Seth Alves
11d01a0c00 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-HUD-ui 2017-01-25 09:42:59 -08:00
Ryan Huffman
2bb7a7a4a6 Remove entity server script status log spam from edit.js 2017-01-25 09:32:25 -08:00
Seth Alves
7d370fb791 Merge pull request #9507 from cozza13/tablet-ui 
Changes to tablet formatting
 2017-01-25 09:29:16 -08:00
Dante Ruiz
c811839163 tablet is not selectable in edit mode 2017-01-25 16:46:17 +00:00
Dante Ruiz
bc75cf5bed removed tabs 2017-01-25 16:11:37 +00:00
Dante Ruiz
bda8b65e79 fixing spaceing 2017-01-25 16:06:40 +00:00
Dante Ruiz
a147ce3f5f fixed load script issue 2017-01-25 08:00:41 -08:00
Chris Collins
df9bfa6eff Changes to tablet formating 
Changes to QML and .js formating to match style of mockup.
 2017-01-25 07:41:04 -08:00
David Rowe
dcd632013f Better variable name 2017-01-25 16:37:35 +13:00
David Rowe
7e56d0fae6 Fix up Clara.io error handling 2017-01-25 16:36:06 +13:00
Seth Alves
4335bbe4fe provide a way to switch mostly back to HUD-based ui 2017-01-24 18:48:11 -08:00
Seth Alves
ced1b61b70 close rather than attempt to repair the tablet after a domain change 2017-01-24 16:03:22 -08:00
Seth Alves
827ae7ad4d Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-close-tablet-upon-goto 2017-01-24 15:50:12 -08:00
Seth Alves
601a35a9b6 try a different way of repairing tablet after a domain change 2017-01-24 15:49:49 -08:00
Faye Li
71b6096644 toggle menu item 2017-01-24 15:12:46 -08:00
Faye Li
5bed68ac4c button toggle 2017-01-24 14:56:58 -08:00
Faye Li
95a92fc5eb added tablet button 2017-01-24 14:42:28 -08:00
David Rowe
1b05ae8a82 Make handling of Clara.io download-ready state transition more robust 2017-01-25 11:00:07 +13:00
Anthony J. Thibault
432bb27119 The tablet Help button should be active if window is visible 2017-01-23 18:37:08 -08:00
Anthony J. Thibault
e30d77eba1 Tablet goto button now properly tracks address bar shown state 2017-01-23 18:37:07 -08:00
Seth Alves
353b38286a Merge pull request #9490 from hyperlogic/tablet-ui 
For for Tablet Tilt and Oculus Touch A B buttons sending UINav events
 2017-01-23 18:14:53 -08:00
Seth Alves
3496e4cc7a Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-23 16:50:41 -08:00