Andrew Meadows
de21391062
add script to measure cost of entity lookup by id
2017-07-13 13:30:57 -07:00
David Rowe
ab6e278a48
Intersect and hover overlay handles with laser
2017-07-13 17:01:56 +12:00
David Rowe
9cbde6d99e
Hover intersected handle
2017-07-13 15:05:04 +12:00
David Rowe
e644aabaf7
Intersect overlays with hands
2017-07-13 15:04:25 +12:00
David Rowe
23ebb791e8
Fix don't scale with hands if scaling multiple entities with handles
2017-07-12 19:22:08 +12:00
David Rowe
1fc2d7ed1b
Display corner scale handles
2017-07-12 18:44:08 +12:00
David Rowe
972cf1a1be
Size handles to compensate for physical distance
2017-07-12 16:11:59 +12:00
David Rowe
2c3cd53f8d
Display face scale handles only for single entities
2017-07-12 15:30:13 +12:00
David Rowe
850b94220f
Display face scale handles
2017-07-12 15:22:44 +12:00
David Rowe
196f5a43b1
Don't scale with hands if scaling with handles
2017-07-12 12:18:59 +12:00
David Rowe
db37417ccd
Tidying
2017-07-12 11:15:55 +12:00
David Rowe
68cdc23530
Display selection bounding box for scaling with handles
2017-07-12 11:04:02 +12:00
rick@ghostpunch.com
8cf60df5b0
Address #21402 Added a handler to Sit.js script for the onLoadComplete signal to which re-applys the siting animation rol overrides. This works around a bug that shows up if the user switches avatars while the current avatar has overloaded anim roles.
2017-07-11 18:24:19 -04:00
Liv
62be0af32d
string pass on Chat.js
2017-07-11 14:57:11 -07:00
David Rowe
657ac1aaeb
Fix enumeration of entity tree
2017-07-11 21:16:21 +12:00
David Rowe
3450d64bed
Hover with "scale" color if in scale-with-handles mode
2017-07-11 17:37:09 +12:00
David Rowe
ed3c0cdced
Use grip click to toggle scale-with-hands / scale-with-handles
2017-07-11 17:16:38 +12:00
David Rowe
283976fd87
Merge branch 'master' into vr-edit-a
2017-07-11 14:51:25 +12:00
Brad Hefta-Gaub
121cf76ee3
Merge pull request #10914 from sethalves/dont-think-during-mouse-move
...
Dont think during mouse move
2017-07-10 10:36:03 -07:00
LaShonda Hopper
3ee9d8b766
[Worklist #21420 ] Ran lint on edit script (details below).
...
Prior to and after addressing Worklist Item #21420 , it was observed that the
tool bar buttons popping in and out during load. Taking a while to become visible.
Ran JSHint on the edit.js script to see if something stood out.
Testing with the various lint fixes the odd loading behavior wasn't observed locally any longer.
Pushing this up for testing. This may be what @CainFoool was seeing regarding the create button
not appearing when testing a different PR as at times it took quite some time for the buttons
to load properly.
JSHint Issues Addressed:
* Resolved instance of \"Use the function form of \"use strict\"\"
** Moved use strict declaration to the file function level.
** This fixed various unknown or not defined errors.
* Resolved instances of \"\'const\' is available in ES6 (use 'esversion: 6') or Mozilla JS extensions (use moz).\"
** Switched const to var to avoid using keywords respected by only a subset of browsers.
* Resolved various multiply defined vars.
** Notable callouts being position var and properties var.
** This should fix issues where the same var was being used though the intent of use may have varied.
* Resolved instances of missing semi-colons
PreFix: 51 JSHint issues detected
PostFix: 0 JSHint issues detected.
Changes to be committed:
modified: scripts/system/edit.js
2017-07-10 12:23:28 -04:00
Mike Moody
53f581c3d4
Fixed Icons not being selectable while not highlighted.
2017-07-08 02:52:27 -07:00
David Rowe
a447e07ba5
Merge branch 'master' into vr-edit-a
2017-07-08 12:33:55 +12:00
David Rowe
e8d8a5c0a2
Rotate entity selection while scaling
2017-07-08 12:27:48 +12:00
David Rowe
73c6414f93
Natural scale of entity selection with hands / lasers
2017-07-08 12:07:20 +12:00
Andrew Meadows
57842ce5a5
Merge pull request #10878 from mnafees/21355
...
CR for Job #21355 - Clean up and remove menu hotkeys
2017-07-07 14:01:21 -07:00
Zach Fox
e222753aac
Merge pull request #10911 from zfox23/PAL_adminFix2
...
Set admin status even if QML can't find user in PAL
2017-07-07 10:24:53 -07:00
Seth Alves
e4aa4823f9
Merge branch 'master' of github.com:highfidelity/hifi into dont-think-during-mouse-move
2017-07-07 08:51:38 -07:00
Zach Fox
ea77557e38
Correctly close PAL when switching domains
2017-07-07 08:09:19 -07:00
Mike Moody
d9706452ac
added ability to drag ParticleEffects and Light Entities around via Overlay Icon.
2017-07-06 23:32:22 -07:00
Mike Moody
be68d99bed
added ability to drag ParticleEffects and Light Entities around via Overlay Icon.
2017-07-06 23:17:23 -07:00
David Rowe
a35d5fe128
Different color highlight for about-to-scale
2017-07-07 15:49:52 +12:00
David Rowe
5da8fe19de
Fix highlights not moving when entities being moved by other hand
2017-07-07 15:10:07 +12:00
David Rowe
998d27d66d
Logic and stub for grab versus scale
2017-07-07 15:06:18 +12:00
David Rowe
0ba11ffdc9
Make each hand aware of other
2017-07-07 14:51:20 +12:00
David Rowe
cab2caaf27
Apply edit and highlight after calculating both hands' inputs
2017-07-07 14:45:49 +12:00
Zach Fox
8945b75cda
Merge pull request #10903 from zfox23/PAL_fixAdminColumn
...
Ensure admins see PAL admin column
2017-07-06 13:38:10 -07:00
LaShonda Hopper
85111131da
[Worklist #21420 ] Resolves issue where domain changes didn't refresh the icon (details below).
...
* Adds a local message/event: "Toolbar-DomainChanged"
** This message is sent by the application via its registered domain handlers:
*** hostnameChanged
*** connectedToDomain
*** disconnectedFromDomain
* edit.js subscribes to the "Toolbar-DomainChanged" event and updates the Create
button icon as long as there's a valid known valid create button.
Item Ticket Link: https://worklist.net/21420
Changes to be committed:
modified: interface/src/Application.cpp
modified: scripts/system/edit.js
2017-07-06 15:27:15 -04:00
Zach Fox
a5c7324ec5
Ensure admins see PAL admin column
2017-07-06 12:15:44 -07:00
ZappoMan
c3c9df0cd0
restore old camera state
2017-07-06 10:41:46 -07:00
ZappoMan
10341af819
Merge branch 'master' of https://github.com/highfidelity/hifi into godview
2017-07-06 09:39:33 -07:00
LaShonda Hopper
9cae868492
[Worklist #21420 ] Implement Create button disabled state (details below).
...
* The create button icon is set to its disabled resource when the user
enters a domain where they have _neither_ Rez or TempRez permissions.
** If the user has either of the Rez permission levels then the normal edit-i.svg
icon is used and the user is able to create items as before.
* When the user clicks the button in this state, the INSUFFICIENT_PERMISSIONS_ERROR_MSG
is shown and creation menu is not shown.
* The disabled icon, edit-disabled.svg, is based on the edit-i.svg and is set to 33% opacity.
Item Ticket Link: https://worklist.net/21420
Changes to be committed:
new file: interface/resources/icons/tablet-icons/edit-disabled.svg
modified: scripts/system/edit.js
2017-07-06 10:53:46 -04:00
David Rowe
c2159bc52a
Fix laser not disappearing when lose hand tracking
2017-07-06 16:44:58 +12:00
David Rowe
b042f8615b
Fix highlight position for entity with non-center registration point
2017-07-06 16:36:22 +12:00
David Rowe
3e96df5436
Precalculate laser sphere bright color
2017-07-06 16:24:15 +12:00
David Rowe
732e3d224a
Merge branch 'master' into vr-edit-a
2017-07-06 15:46:31 +12:00
Seth Alves
55b7c2d767
avoid doing a lot of work during mouse-move event-handlers
2017-07-05 15:50:05 -07:00
David Rowe
72529cf90b
Highlight hand when it intersects an entity
2017-07-06 10:49:17 +12:00
Zach Fox
6f2e7f5b83
Tweak the Snapshot 'Share' button to make its purpose more clear
2017-07-05 12:39:15 -07:00
Seth Alves
d917878638
fix whitespace
2017-07-05 11:29:09 -07:00
Seth Alves
ab340530b8
don't do a lot of processing during the mouse-move event handler
2017-07-05 11:27:13 -07:00
David Rowe
38e7ee3096
Hover and select entities that hand intersects
2017-07-05 22:38:59 +12:00
David Rowe
e6e619f0d8
Hover only editable entities
2017-07-05 22:36:18 +12:00
Mohammed Nafees
eb354a4333
Cleanup menu shortcut keys
2017-07-05 14:50:48 +05:30
David Rowe
24b1963257
Tidying
2017-07-05 16:00:42 +12:00
David Rowe
1e76729d59
Lock laser distance while editing
2017-07-05 15:52:22 +12:00
David Rowe
75bc0f8b3f
Translate and rotate selected entities
2017-07-05 15:47:08 +12:00
David Rowe
c85df15bad
Display bounding boxes as highlights when hovering
2017-07-05 14:21:47 +12:00
David Rowe
dd1116092e
Collect entities in parent-child tree that hovered entity belongs to
2017-07-05 14:20:29 +12:00
David Rowe
f9ee21525d
A laser for each hand
2017-07-05 12:53:54 +12:00
David Rowe
bf722f084e
A controller object for each hand
2017-07-05 12:49:36 +12:00
David Rowe
dcbf3ceeb9
Update loop
2017-07-05 12:40:45 +12:00
David Rowe
a24a0265f9
Improve communication with hand controller script
2017-07-04 16:24:17 +12:00
David Rowe
cadd4685ee
No haptic pulse in edit modes when hand enters near-grab distance
2017-07-04 15:59:04 +12:00
David Rowe
83a78aa407
No handControllerGrab.js lasers while in VR edit mode
2017-07-04 15:54:33 +12:00
ZappoMan
d5acc8a6f9
Merge branch 'master' of https://github.com/highfidelity/hifi into godview
2017-07-03 12:21:29 -07:00
Brad Davis
31d2c9980e
Merge pull request #10797 from ctrlaltdavid/21396
...
Make Leap Motion a plugin
2017-06-30 14:37:23 -07:00
Brad Davis
3f48c7aef5
Merge pull request #10855 from jherico/snapshot
...
Fix snapshot connection errors
2017-06-30 12:58:48 -07:00
utkarshgautamnyu
82597ac424
Update snapshot.js
2017-06-30 10:22:05 -07:00
David Rowe
a863e37eb5
Communicate VR edit enabled state to hand controller script
2017-06-30 12:11:06 +12:00
Burt Sloane
2b111358e1
extra quote
2017-06-29 16:49:00 -07:00
Brad Davis
6e5eff9407
Fix snapshot connection errors
2017-06-29 10:01:48 -07:00
David Rowe
84e11db772
VR edit app script and button
2017-06-29 16:58:56 +12:00
utkarshgautamnyu
e6be838e79
Update snapshot.js
2017-06-28 15:30:49 -07:00
Brad Davis
de88a34e97
Fix toolbar button activation states
2017-06-26 23:33:32 -07:00
Ryan Huffman
209a4f33b5
Merge pull request #10784 from huffman/feat/pal-replicated
...
Disable silence + ban buttons for replicated users
2017-06-26 12:50:23 -07:00
Chris Collins
19d3646fef
Merge pull request #10817 from kencooke/audio-scripting-fix
...
Audio scripting fixes
2017-06-26 10:01:52 -07:00
Brad Hefta-Gaub
a32f7b2395
Merge pull request #10743 from humbletim/21383
...
CR 21383: Integrate attachments into doppleganger mirror
2017-06-26 09:54:04 -07:00
Ken Cooke
fba1a8ddaa
Fix halfDuplex script
2017-06-26 08:28:29 -07:00
Ken Cooke
db2b702221
Fix reverbTest script
2017-06-26 08:08:52 -07:00
David Rowe
bed0e8ef87
Merge branch 'master' into 21396
...
# Conflicts:
# interface/src/avatar/MySkeletonModel.cpp
2017-06-26 12:07:25 +12:00
anshuman64
9d9f4ee64a
Merge pull request #10811 from ctrlaltdavid/21414
...
EZRECORD app
2017-06-24 22:46:30 -07:00
anshuman64
d1891069d2
Merge pull request #10763 from hyperlogic/feature/puck-attach
...
Added script that will attach an entity to a vive sensor
2017-06-24 22:35:45 -07:00
David Rowe
48caad1ad2
Add user activity logging
2017-06-24 16:03:55 +12:00
David Rowe
3de1c0a312
Make and save recording
2017-06-24 15:57:57 +12:00
David Rowe
bae04966f9
Add "REC" indicator
2017-06-24 14:35:28 +12:00
David Rowe
6543b74b52
Add beeps
2017-06-24 14:26:01 +12:00
David Rowe
ce32f1704e
Start/cancel/finish recording logic
2017-06-24 13:22:00 +12:00
David Rowe
1ddae1c61a
Change keyboard shortcut to avoid conflict
2017-06-24 13:19:25 +12:00
David Rowe
ced9473eb3
Icon toggling and keyboard shortcut
2017-06-24 12:49:45 +12:00
David Rowe
b546d977f4
"EZRECORD" app script and button
2017-06-24 12:07:20 +12:00
Anthony J. Thibault
aabbcfd23d
code review feedback
2017-06-23 16:47:53 -07:00
Ryan Huffman
b56cfa56c7
Merge branch 'master' of github.com:highfidelity/hifi into feat/pal-replicated
2017-06-23 14:23:20 -07:00
David Rowe
9d0407cbdf
Merge branch 'master' into 21396
2017-06-23 16:52:04 +12:00
Brad Hefta-Gaub
7668fbb7a0
Merge pull request #10755 from seefo/fb5278
...
Fixed an issue where toolbar buttons duplicated themselves when reloading scripts
2017-06-22 13:35:05 -07:00
Anthony J. Thibault
e531468ac7
Fix for html url
2017-06-22 13:14:47 -07:00
Burt Sloane
f1485afccc
public script
2017-06-22 13:01:11 -07:00
Anthony J. Thibault
3184d4e9d1
Puck attach only shows available tracked objects.
2017-06-22 12:17:22 -07:00
Anthony J. Thibault
6e10a6fc60
Merge branch 'master' into feature/puck-attach
2017-06-22 11:32:59 -07:00
David Rowe
6ff8aed5e3
Merge branch 'master' into 21396
2017-06-22 23:54:15 +12:00
Brad Hefta-Gaub
4f632005b6
Merge pull request #10372 from rabelaiis/21300
...
Add entity script for balloon spawner and sample json entity with us…
2017-06-21 12:50:52 -07:00
Ryan Huffman
0e7ddfd29f
Disable silence/ban buttons in PAL if avatar is replicated
2017-06-21 09:49:16 -07:00
Sam Cake
1e168a5f6d
Remove extra logging
2017-06-21 00:23:24 -07:00
Sam Cake
a78018345b
Fixing the last scripts maybe
2017-06-21 00:15:29 -07:00
Sam Cake
189ad9c706
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-06-20 22:42:40 -07:00
samcake
d853a76376
Fixing the scripts and investigating the scripting
2017-06-20 17:23:44 -07:00
Anthony J. Thibault
b78e278102
adjusted print statements
2017-06-20 17:19:57 -07:00
Anthony J. Thibault
e84d0358cc
updated images
2017-06-20 17:18:35 -07:00
Anthony J. Thibault
287dc3e1b8
updated license and button name
2017-06-20 17:10:53 -07:00
Anthony J. Thibault
cd1beceb75
Added script that will attach an entity to a vive sensor.
2017-06-20 17:02:50 -07:00
Zach Pomerantz
8e1cf763e3
Merge pull request #10756 from zzmp/audio/input-level
...
Update chrome for the audio input level meter
2017-06-20 15:33:17 -07:00
Thijs Wenker
b22b45461f
Merge pull request #10754 from ctrlaltdavid/21405
...
Fix import of JSON with parent-child relationships
2017-06-20 20:48:01 +02:00
Zach Pomerantz
c826858458
revamp tablet MicBar
2017-06-20 11:43:02 -07:00
seefo
00a3fc77a1
Fixed an issue where toolbar buttons duplicated themselves when reloading scripts
2017-06-20 11:18:22 -07:00
Brad Hefta-Gaub
cbded766b1
Merge pull request #10676 from NeetBhagat/21369
...
WL 21369 - Implement parts of the JS "console" object
2017-06-20 11:06:34 -07:00
Sam Cake
5b6f6ab84f
Trying to fix the getCOnfig from QML...
2017-06-20 00:25:51 -07:00
David Rowe
513e0cd232
Fix import of JSON with parent-child relationships
2017-06-20 16:44:25 +12:00
samcake
ba9dbbb4d4
Fix the local lights issue, and correct the script relying on the Render.getConfig(), this one is on me...
2017-06-19 17:34:50 -07:00
humbletim
89ebf4998f
relocate/archive original doppleganger mirror into unpublishedScripts/marketplace/doppleganger-mirror
2017-06-19 10:28:56 -04:00
Stephen Birarda
39e8510ccb
Merge pull request #10720 from seefo/fb5386
...
Fixed a bug where you could not print polaroids if you took a gif
2017-06-16 15:03:45 -07:00
NeetBhagat
2909aa9ac8
Resolve comments of @zappoman.
...
-- Rename "asserts" to "assert"
-- Log printing methods will accept lists of objects or strings.
2017-06-17 01:00:32 +05:30
Chris Collins
f160034bf0
Merge pull request #10681 from zzmp/audio/parity
...
Revamp audio device selection
2017-06-16 10:31:55 -07:00
seefo
a4d008eec9
Fixed a bug where you could not print polaroids if you took a gif
2017-06-16 08:57:27 -07:00
Burt Sloane
4f7a1a6e2e
got rid of tabs
2017-06-15 16:35:53 -07:00
Burt Sloane
7022c4009f
midi in and out
2017-06-15 15:18:06 -07:00
Zach Pomerantz
3093a73ce1
Merge branch 'master' of github.com:highfidelity/hifi into audio/parity
2017-06-15 15:04:06 -04:00
Seth Alves
023ca85623
remove chat from default scripts
2017-06-15 09:27:43 -07:00
NeetBhagat
a6b1b17d45
Merge branch 'master' into 21369
2017-06-15 11:04:22 +05:30
David Rowe
a8501a7ac6
Remove old Leap Motion code
2017-06-15 14:45:40 +12:00
David Rowe
16bebdd409
Rename identifiers
2017-06-15 09:20:55 +12:00
David Rowe
e3b4e4aa20
Disable print statements
2017-06-14 15:37:36 +12:00
David Rowe
395d40f0f9
Fix script default to match C++ default
2017-06-14 12:21:19 +12:00
David Rowe
05f19d54f4
Add HMD roll control JavaScript API
2017-06-14 11:55:04 +12:00
Zach Pomerantz
a8f69bb2e0
Merge branch 'master' of github.com:highfidelity/hifi into audio/parity
2017-06-13 17:41:52 -04:00
Zach Pomerantz
e7da007acd
only show Audio menu title when appropriate
2017-06-13 17:13:39 -04:00
Zach Pomerantz
20c0dac8e8
update QML with Audio.muted
2017-06-13 16:10:16 -04:00
Zach Pomerantz
337b6bca14
update JS with Audio.muted
2017-06-13 16:02:58 -04:00
Anthony Thibault
0d46b78bff
Merge pull request #10541 from Menithal/21324
...
Reworked Particle Editor UI
2017-06-13 13:00:54 -07:00
NeetBhagat
9646eba873
Complete console.trace and added a testcases for all 13 functions.
2017-06-13 23:52:48 +05:30
Matti Lahtinen
35f83afd09
Removed unneccessary print
2017-06-13 20:43:14 +03:00
Menithal
c2c1e607c0
Formating
2017-06-13 20:31:41 +03:00
Menithal
395cc55fb2
Fixed formatting
2017-06-13 20:20:54 +03:00
Menithal
020760cc97
21324: Fixed accidental inccorect bracket
2017-06-13 20:16:56 +03:00
Menithal
00701eb5c7
Merge remote-tracking branch 'origin/master' into 21324
2017-06-13 19:08:37 +03:00
Menithal
0edb763dac
21324: Formatting and PR Feedback Changes
2017-06-13 19:06:47 +03:00
NeetBhagat
b0e9c62c12
Merge branch 'master' of https://github.com/highfidelity/hifi into 21369
2017-06-13 10:10:44 +05:30
Zach Pomerantz
b37a0239b0
up to reverb (needs cherry-picking)
2017-06-12 18:00:52 -04:00
Bradley Austin Davis
1968ecbc8f
Simplify eventBridge mechanism exposing functionality to web pages
2017-06-12 14:46:37 -07:00
Andrew Meadows
321e307c9f
Merge pull request #10609 from 1P-Cusack/21317
...
WL21317 helper functions for getting into avatar coordinate space
2017-06-12 11:18:29 -07:00
NeetBhagat
e6a5930365
Merge branch 'master' into 21369
2017-06-12 11:17:26 +05:30
Seth Alves
92fe8145be
Merge pull request #10616 from vladest/create_button_sticked
...
Set active button property isActive before Home menu redraw. Makes su…
2017-06-11 13:43:41 -07:00
