Seth Alves
df034ea6da
remove commented-out code
2017-02-27 11:27:59 -08:00
Seth Alves
8110921abf
git rid of _mouseToOverlays until I remember why I thought I needed it
2017-02-27 11:11:04 -08:00
Ryan Huffman
5b59939195
Merge pull request #9602 from huffman/feat/shortbow-entity-server
...
Add shortbow to marketplace scripts
2017-02-27 11:09:52 -08:00
samcake
699d177b20
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-02-27 09:18:20 -08:00
Seth Alves
1864975c51
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay
2017-02-27 06:35:22 -08:00
Andrew Meadows
dbd1526d56
Merge pull request #9757 from kunalgosar/EntityFocusFix
...
Fix for Web Entity not leaving Focus
2017-02-26 16:35:55 -08:00
Philip Rosedale
4925b3c47c
Merge pull request #9756 from ctrlaltdavid/21122
...
Point index finger and raise thumb if not touching controller
2017-02-25 14:59:48 -08:00
sam
7a4ec35b99
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-02-25 13:01:09 -08:00
sam
a53d5e8fbd
adjusted the PLumber shape keys to coever non material shapes in main pass
2017-02-25 13:00:37 -08:00
Seth Alves
36bcaa8d0f
delete tablet overlays when switching domains
2017-02-25 08:43:06 -08:00
David Kelly
baa7f81d79
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting
2017-02-24 18:38:57 -08:00
samcake
9ffdc03dc9
setting the shaeKeys for the overly properly because most of them are CustomPipleline
2017-02-24 18:25:24 -08:00
kunalgosar
d6c1f1c99a
Fixed Wed Entity not leaving Focus
2017-02-24 18:18:48 -08:00
David Rowe
0cc499b08b
Point index fingers and raise thumbs if not touching controls
2017-02-25 14:20:23 +13:00
David Rowe
a205d2a00c
Use animation for pointing index finger instead of setting joint angles
2017-02-25 11:36:06 +13:00
Seth Alves
34755dd75d
notify children of an overlay when the parent overlay moves
2017-02-24 13:57:49 -08:00
David Kelly
d6f0d8c960
styling changes, first pass
2017-02-24 11:45:03 -08:00
Seth Alves
71ab6a1a84
fix a couple of problems related to grabbing tablet while edit.js is active
...
Conflicts:
scripts/system/controllers/handControllerGrab.js
2017-02-24 11:38:42 -08:00
Seth Alves
70060eb464
in 2d mode, clicks on tablet don't get used for other things
...
Conflicts:
scripts/system/libraries/entitySelectionTool.js
2017-02-24 11:37:04 -08:00
Seth Alves
73774a6590
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay
2017-02-24 11:34:59 -08:00
Howard Stearns
a9b8045697
Merge pull request #9720 from howard-stearns/filter-pal-by-view-distance
...
Filter pal by view distance
2017-02-24 11:10:13 -08:00
David Kelly
d399f648d5
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting
2017-02-24 10:32:43 -08:00
sam
8e122b3357
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-02-23 21:24:47 -08:00
David Kelly
4a4c914ca8
First cut at new styling
2017-02-23 18:53:22 -08:00
samcake
6d59144a4f
Trying to fix the emissive for overlay in front ?
2017-02-23 17:42:02 -08:00
Andrew Meadows
faa272c67c
don't blend animations for otherAvatars
2017-02-23 17:36:45 -08:00
Andrew Meadows
4bbbcb61be
expand avatar update time budget
2017-02-23 17:36:45 -08:00
Andrew Meadows
14e7392a89
minor cleanup
2017-02-23 17:36:45 -08:00
Andrew Meadows
e54812430e
avoid unnecessary copy of priority_queue
2017-02-23 17:36:45 -08:00
Seth Alves
a286c72b3b
cleanups
2017-02-23 15:12:45 -08:00
Brad Hefta-Gaub
1b7ec7d61e
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements
...
Conflicts:
libraries/avatars/src/AvatarData.cpp
2017-02-23 13:50:16 -08:00
Seth Alves
2c42309aaa
perfer tablet over other overlays for mouse-clicks
2017-02-23 13:32:24 -08:00
Seth Alves
84d9af14b0
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay
2017-02-23 10:40:18 -08:00
Chris Collins
de84e07281
Merge pull request #9714 from thoys/fix-recorder-js-playback
...
Fix recorder.js playback in interface
2017-02-23 09:59:37 -08:00
Thijs Wenker
5033e7be11
CR fixes
2017-02-23 18:22:36 +01:00
Howard Stearns
cddba43837
Merge branch 'master' into filter-pal-by-view-distance
2017-02-23 08:25:16 -08:00
Seth Alves
37004e4347
steps toward making mouse work on tablet
2017-02-23 08:11:31 -08:00
Brad Hefta-Gaub
06f0087459
wire up radius properly
2017-02-22 22:36:37 -08:00
Seth Alves
41ef7b8dbb
add setting to control if tablet is an entity or overlay
2017-02-22 21:13:42 -08:00
Seth Alves
1b26c3469f
fix signed/unsigned joint index problem
2017-02-22 20:39:34 -08:00
Seth Alves
b4be942348
trying to get tablet overlay to show up in the right place
2017-02-22 19:18:03 -08:00
Seth Alves
273f0130f3
fix sphere vs box check for grabbing overlays. fix newly introduced equipping bug.
2017-02-22 17:43:09 -08:00
Andrew Meadows
6ac33dbf61
count avatar joint updates and non-updates
2017-02-22 17:23:36 -08:00
Seth Alves
bfc4853947
make overlays near-grabbable. make tablet be an overlay
2017-02-22 16:50:02 -08:00
howard-stearns
de3a0d3d0c
button styling
2017-02-22 13:02:05 -08:00
howard-stearns
023a32563c
work around .qml settings issues
2017-02-22 12:59:40 -08:00
Chris Collins
c967f9383a
Merge pull request #9706 from ZappoMan/avatarMixerLoopImprovements
...
Multi-core Avatar Mixer
2017-02-22 11:20:28 -08:00
Brad Hefta-Gaub
05995163cf
add support for tuning sorting
2017-02-22 09:49:47 -08:00
Brad Hefta-Gaub
01fd0860bf
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements
...
Conflicts:
interface/src/avatar/AvatarManager.cpp
2017-02-22 08:47:03 -08:00
Seth Alves
a8de6c8c93
Merge pull request #9723 from hyperlogic/bug-fix/tablet-ui-reload-script-bug
...
Fix for system toolbar hiding when scripts are reloaded
2017-02-22 07:34:20 -08:00
Anthony J. Thibault
379b7bc56d
Fix for system toolbar hiding when scripts are reloaded
2017-02-21 17:24:22 -08:00
Brad Hefta-Gaub
97fc88491f
Merge pull request #9718 from AndrewMeadows/sort-avatars-correctly
...
fix sorting algorithm for avatar render updates
2017-02-21 16:14:12 -08:00
howard-stearns
a20590a2f9
fixed myCard width in all cases (admin or not)
2017-02-21 16:03:59 -08:00
howard-stearns
2b9c69926b
Merge branch 'master' of https://github.com/highfidelity/hifi into filter-pal-by-view-distance
2017-02-21 15:42:00 -08:00
howard-stearns
1ddc7de581
remove debugging (and fix missing brace)
2017-02-21 15:41:17 -08:00
howard-stearns
f21e17d512
new buttons
2017-02-21 15:32:41 -08:00
Andrew Meadows
dd447689e0
expose avatar sort coefficients for fine tuning
2017-02-21 15:09:44 -08:00
Brad Hefta-Gaub
2017ea4491
hacking on using sorted avatars for bandwidth budget
2017-02-21 14:18:00 -08:00
Seth Alves
3b181eb803
code review
2017-02-21 13:56:28 -08:00
howard-stearns
aff44d682e
Merge branch 'master' of https://github.com/highfidelity/hifi into filter-pal-by-view-distance
2017-02-21 13:45:25 -08:00
Andrew Meadows
27dd82b517
fix sorting algorithm for avatar render updates
2017-02-21 13:34:07 -08:00
howard-stearns
15d8041683
snapshot working, before button change
2017-02-21 13:14:45 -08:00
Thijs Wenker
13b2b6086f
Fix recorder.js playback in interface
2017-02-21 19:47:26 +01:00
David Kelly
76229905f2
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting
2017-02-21 09:24:22 -08:00
Brad Hefta-Gaub
ec8a95037d
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements
2017-02-20 17:01:29 -08:00
Seth Alves
70c9853189
Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid
2017-02-20 12:38:13 -08:00
Seth Alves
4a650ff2bb
Overlays::getOverlayAtPoint was depending on the order in which the overlays were added
2017-02-19 18:37:35 -08:00
Brad Hefta-Gaub
598e79f697
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements
2017-02-19 13:29:37 -08:00
Brad Hefta-Gaub
fa0749b494
Merge pull request #9696 from ctrlaltdavid/21168
...
Add finger painting script
2017-02-19 11:37:25 -08:00
Menithal
d9f86612de
Fixed view toggle, Added new Notifications
...
- View Toggle now only toggles if no other modifiers are pressed
- More notification, and cases for notification
- Parenting to existing parent
- Unparenting when there is no parent
- Unparenting single entities
2017-02-19 20:18:11 +02:00
Seth Alves
ea03f41b57
Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid
2017-02-18 10:32:11 -08:00
Brad Hefta-Gaub
42d916a719
fix warnings
2017-02-17 21:58:48 -08:00
Brad Hefta-Gaub
291b823cfa
const cleanup and fix crash
2017-02-17 18:28:07 -08:00
David Rowe
2c02b42c96
Finger paint button icon files
2017-02-18 14:21:54 +13:00
Chris Collins
ec07969c0b
Merge pull request #9703 from kunalgosar/logDisplayMode
...
Logging HMD/Desktop Transitions
2017-02-17 17:07:02 -08: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
Seth Alves
d7bb6f105b
make tablet part IDs available through qApp
2017-02-17 15:43:20 -08:00
kunalgosar
b8b5927351
Logging display mode changes
2017-02-17 13:21:01 -08:00
Seth Alves
47cdade1e9
fix home-button on tablet
2017-02-17 11:47:37 -08:00
Anthony J. Thibault
5963c6ddc3
Fix for toolbar visibility after snapshots.
2017-02-17 11:04:04 -08:00
David Kelly
d938c70b48
volume goes 0-9 now
2017-02-17 11:11:08 -07:00
Seth Alves
2b02998fae
hook up overlaysToDiscard and overlaysToInclude in Overlays::findRayIntersection
2017-02-17 09:47:40 -08:00
Seth Alves
81f6344023
allow overlays to be parents
2017-02-17 09:36:00 -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
585691f71c
Add finger painting button to tablet
2017-02-17 19:29:11 +13:00
Seth Alves
05c135b9d8
uuid keys for overlays appears to work
2017-02-16 21:22:23 -08:00
Seth Alves
c1e41311fc
working toward using uuids for overlay IDs
2017-02-16 17:18:09 -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
8ccca86dee
Settings for Tablet Becomes Toolbar
2017-02-16 15:57:36 -08:00
Anthony J. Thibault
5b1f150171
Fix for race condition when switching between Main Menu and Audio Menu
2017-02-16 12:52:46 -08:00
howard-stearns
6e3ae1fe4f
cleanup some accumulated cruft in pal code
2017-02-16 10:53:02 -08:00
Menithal
7a5665ff4f
Hotkey change to make AudioScope similar to earlier
2017-02-16 10:09:19 +02:00
Menithal
ff2c344eaa
Migrated Audioscope Hotkeys to use F2 instead of P
...
Apparently ctrl + shift + P which was planned to be used in the client
for unparenting entities did not work out, as the command went out of
the main view.
Migrating to ctrl + F2 and ctrl + alt + F2
2017-02-16 10:05:01 +02:00
Anthony J. Thibault
03b6280ed0
Fix for empty toolbar issue
2017-02-15 16:50:08 -08:00
Anthony J. Thibault
67302cbd2b
toolbar work to better support tablet buttons
2017-02-15 15:53:08 -08:00
Brad Davis
127a014b46
Clear caches on domain switch
2017-02-15 15:21:08 -08:00
Menithal
856cdcbd28
Merge remote-tracking branch 'origin' into parent-hotkey
2017-02-16 00:38:01 +02:00
Anthony J. Thibault
ed11edad56
EventBridge support
2017-02-15 13:59:04 -08:00
Clément Brisset
eba6a8f028
Merge pull request #9674 from Atlante45/fix/mac-macro
...
Fix SSE2 macros for Macs
2017-02-15 11:29:55 -08:00
Menithal
ded365ca22
Merge remote-tracking branch 'origin' into parent-hotkey
2017-02-15 19:53:07 +02:00
Menithal
6302ae6bd5
Changed AudioScope Hotkeys, Allowing User Hotkeys
...
AudioScope Open Hotkey changed from Ctrl + P to Ctrl + Alt + P and
Audioscope Pause Hotkey changed from Ctrl + Shift + P to Ctrl + Shift +
Alt + P
2017-02-15 19:48:29 +02:00
kunalgosar
4579ac4998
Changed button margin
2017-02-14 16:43:55 -08:00
kunalgosar
91a73b2689
Button styling
2017-02-14 16:13:40 -08:00
kunalgosar
5e5d76ead7
Implemented toggle prev search button
2017-02-14 16:13:40 -08:00
kunalgosar
2dd2018d7d
change next button style properties
2017-02-14 16:13:40 -08:00
kunalgosar
c01d0b309e
Toggle next for search on Log
2017-02-14 16:13:40 -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
4503923665
Initial version of TabletProxy.toolbarMode boolean
...
Copies all tablet buttons between the tablet and the system toolbar.
To test type this in the console:
Tablet.getTablet("com.highfidelity.interface.tablet.system").toolbarMode = true;
2017-02-14 15:36:03 -08:00
Anthony J. Thibault
5e25d073f3
WIP commit
2017-02-14 15:36:01 -08:00
Atlante45
1201932ee9
Fix SSE2 macros for Macos
2017-02-14 14:10:53 -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
Seth Alves
e323971062
Merge pull request #9671 from druiz17/general
...
Moved general preference settings to the tablet
2017-02-14 10:11:33 -08:00
Brad Hefta-Gaub
f433347362
Merge pull request #9652 from sethalves/avatar-as-child-fixes
...
some fixes for when an avatar is a child of something else
2017-02-14 09:07:47 -08:00
Dante Ruiz
968ba1e03d
updated file headers
2017-02-14 16:08:25 +00:00
Dante Ruiz
aa164bbf8f
diff minimize
2017-02-14 15:55:32 +00:00
Dante Ruiz
9d5f392be3
removed more qml log errors
2017-02-14 07:46:34 -08:00
Dante Ruiz
773ade5b61
removing qml errors
2017-02-14 07:46:34 -08:00
Dante Ruiz
8fbcead6d1
removed/renamed some files
2017-02-14 07:46:33 -08:00
Dante Ruiz
948352cdb6
general preferences work on tablet
2017-02-14 07:46:33 -08:00
Dante Ruiz
888d4ff706
basic prefreneces done
2017-02-14 07:46:32 -08:00
Dante Ruiz
46cfa7cf13
saving work
2017-02-14 07:46:31 -08:00
Seth Alves
ba025d44e0
Merge pull request #9642 from AndrewMeadows/beware-humbletim
...
fix performance problem for invalid "avatarEntityData"
2017-02-14 06:33:48 -08:00
Seth Alves
2e2a3c60d0
Merge branch 'master' of github.com:highfidelity/hifi into avatar-as-child-fixes
2017-02-14 06:26:20 -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
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
Anthony J. Thibault
adc50dd30f
Added active versions of each tablet image, with black bg.
2017-02-13 13:55:33 -08:00
Atlante45
512bb4765f
Add entity clicks capture capabilities
2017-02-13 11:34:30 -08:00
Seth Alves
bc5f563f57
make _parentID and _parentJointIndex private to avoid accidental direct access
2017-02-12 11:37:29 -08:00
Seth Alves
1164a1b3bf
some fixes for when an avatar is a child of something else
2017-02-12 08:27:39 -08:00
Kunal Gosar
c3f2f5779a
fix if else syntax
2017-02-11 15:46:49 -08:00
Kunal Gosar
975d844eee
syntax fix
2017-02-11 15:01:02 -08:00
Kunal Gosar
18e776bd29
emit signal only on change
2017-02-11 13:58:23 -08:00
David Rowe
77f0fb1491
Change the "Mute" tablet button to "Audio"
2017-02-11 22:40:19 +13:00
kunalgosar
9c537726e5
Fix stuck in pause error with browsers
2017-02-10 18:13:09 -08:00
David Rowe
a08347936e
Make clicking the tablet mic icon or audio bar toggle the mute state
2017-02-11 15:11:27 +13:00
kunalgosar
691f61983a
added isAway property to MyAvatar
2017-02-10 17:28:12 -08:00
David Rowe
acaf8c69c6
Better tablet mic muted and unmuted iconography
2017-02-11 11:07:31 +13:00
Andrew Meadows
d2315c15a1
avoid duplicate parse of AvatarEntityData entries
2017-02-10 13:14:20 -08:00
Andrew Meadows
563bf65e89
fix bug: performance problem for avatarEntities
2017-02-10 13:14:20 -08:00
Andrew Meadows
ee702f945f
cleanup around when to send identityPacket
2017-02-10 13:14:20 -08:00
David Rowe
b5b92c1508
Make the tablet's mic icon reflect the current mute state
2017-02-11 09:53:02 +13:00
Atlante45
3a30de79aa
CR
2017-02-09 13:04:43 -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
Atlante45
0f39356e94
Only users with perm rez can see the log
2017-02-09 13:04:43 -08:00
Atlante45
35f8afe456
Handle domain reconnections
2017-02-09 13:04:43 -08:00
