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
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
Atlante45
191121888c
Add log window to the ESS log
2017-02-09 13:04:43 -08:00
Atlante45
2962dd6dc2
Factor LogDialog
2017-02-09 13:04:43 -08:00
Atlante45
fcb74bce10
First draft for entity script server log streaming
2017-02-09 13:04:43 -08:00
Brad Hefta-Gaub
74f10a1e7f
Merge pull request #9603 from huffman/feat/trace-thread-script
...
Add thread names and scripts to chrome traces
2017-02-09 13:00:05 -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
bb4654506a
CR
2017-02-09 11:37:21 -08:00
Brad Hefta-Gaub
57e0dadd65
CR
2017-02-09 11:35:00 -08:00
samcake
850be620f9
Merge pull request #9606 from samcake/blue
...
More intrumentation, Pixel Format clean up and minor improvments in texture transfers
2017-02-09 11:18:09 -08:00
Seth Alves
b34341b48e
Merge pull request #9631 from AndrewMeadows/workaround-avatar-update-dos
...
Remove avatarEntityData cruft from settings
2017-02-09 10:40:00 -08:00
Brad Hefta-Gaub
dd2ddcc291
cleanup
2017-02-09 09:57:32 -08:00
Dante Ruiz
ff60058cbe
checking if desktop exists
2017-02-09 17:54:41 +00:00
Brad Hefta-Gaub
ae071aec0d
add a bunch more stats for avatar processing
2017-02-09 09:52:09 -08:00
samcake
c62108c3c8
Resolve merging conflict
2017-02-09 09:49:59 -08:00
Dante Ruiz
6bc685b02a
saving work
2017-02-09 07:13:29 -08:00
Dante Ruiz
5c5ace7c7b
goto in tablet
2017-02-09 07:13:29 -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
Seth Alves
908df7ee8a
Merge pull request #9637 from thoys/FixHiddenCursorForBrowseAndSaveDialogs
...
Fix for hidden cursor while using Export Entities / Import Entities form
2017-02-08 19:42:33 -08:00
Brad Hefta-Gaub
41dc498888
add inView simulation stats
2017-02-08 18:32:39 -08:00
Anthony J. Thibault
090f632189
Pal: Moved keyboard tray to be flush with bottom of window.
2017-02-08 18:16:48 -08:00
Anthony J. Thibault
7cc3079328
Tightened up margins for the tablet.
2017-02-08 17:58:24 -08:00
Anthony J. Thibault
a209d0372a
First cut of pal on tablet.
2017-02-08 17:34:03 -08:00
Brad Hefta-Gaub
c2171ca08f
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarSimulationStats
...
Conflicts:
libraries/avatars/src/AvatarData.h
2017-02-08 16:52:38 -08:00
Brad Hefta-Gaub
6c41a25032
more stats
2017-02-08 16:51:00 -08:00
Thijs Wenker
6957ac5f8b
Fixes cursor being hidden while Window.browse(), Window.save() are being called from the defaultScript.js thread
2017-02-09 01:31:07 +01:00
Brad Hefta-Gaub
b399420190
CR
2017-02-08 15:42:59 -08:00
Brad Hefta-Gaub
357cc052e1
first cut at simulation stats
2017-02-08 15:32:48 -08:00
Andrew Meadows
e02810458b
clear old avatarEntityData when saving settings
2017-02-08 14:14:48 -08:00
Brad Hefta-Gaub
07cf87749f
Merge branch 'master' of https://github.com/highfidelity/hifi into betterBots
2017-02-08 13:41:33 -08:00
Brad Hefta-Gaub
89368afd68
add back accidentally removed line
2017-02-08 12:52:17 -08:00
Brad Hefta-Gaub
eedfc4fd38
fix various bot related bugs
2017-02-08 12:35:00 -08:00
samcake
363db8a834
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-02-08 11:52:18 -08:00
Andrew Meadows
cc301d1c1a
remove legacy empty avatarEntityData settings
2017-02-08 11:50:15 -08:00
mike
6cba2049dd
Made jumping easier on the Vive
2017-02-07 19:46:16 -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
Clément Brisset
eb0a316b6f
Merge pull request #9604 from hyperlogic/feature/allow-multiple-instances
...
Allow multiple instances to run if environment variable is set
2017-02-07 15:32:31 -08:00
samcake
2975f73fc9
merging
2017-02-07 13:13:21 -08:00
Dante Ruiz
27e1bd50d0
reworded text
2017-02-06 19:52:51 +00:00
Dante Ruiz
5ff91c018b
snapshot fix
2017-02-06 19:39:57 +00:00
samcake
9fd1d5114c
Merge branch 'master' of https://github.com/highfidelity/hifi into purple
2017-02-06 10:16:41 -08:00
samcake
c864e57855
first pass on a working image class and the mip generation
2017-02-06 08:51:04 -08:00
samcake
e8cdee71ed
avoid assertion on mac
2017-02-03 22:49:41 -08:00
Dante Ruiz
dd8f095bd8
minimize diff
2017-02-04 00:36:41 +00: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
Anthony J. Thibault
f8e6bd8c6b
Allow multiple instances to run if environment variable is set
...
If the environment variable HIFI_ALLOW_MULTIPLE_INSTANCES is present, the value is ignored,
then you can have multiple copies of interface running on the same machine.
2017-02-03 10:53:26 -08:00
Ryan Huffman
0cc137d26b
Remove unintentionally added fps + download profiling
2017-02-03 10:14:34 -08:00
Ryan Huffman
537f639d16
Revert "Update scriptengine update rate to match displayPlugin target framerate"
...
This reverts commit d5effc89776b0b2480db364f21384a245bdcd4f0.
2017-02-03 10:14:33 -08:00
Ryan Huffman
97719cd128
Update scriptengine update rate to match displayPlugin target framerate
2017-02-03 10:01:02 -08:00
Ryan Huffman
ce9f8bed1b
Remove duplicate fps/downloads PROFILE_COUNTER
2017-02-03 09:41:48 -08:00
Ryan Huffman
9d4fdfa38a
Add Test.profileRange
2017-02-03 09:19:10 -08:00
Ryan Huffman
e181c2a16e
Add script_udpate_rate to trace
2017-02-03 09:19:03 -08:00
Ryan Huffman
f2638637f7
Add thread names to traces
2017-02-03 09:18:58 -08: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
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
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
Dante Ruiz
2cc1ee008d
added clicking sounds to tablet menus
2017-02-02 17:46:42 +00:00
Seth Alves
f907af1b9b
Merge pull request #9587 from hyperlogic/bug-fix/tablet-ui-network-2d-tablet
...
Tablet-ui: fix tablet orientation for users in 2d desktop mode
2017-02-01 20:17:40 -08:00
Anthony J. Thibault
de55a5dfe6
tablet-ui: reduced volume of button click
2017-02-01 18:47:50 -08:00
Anthony J. Thibault
9d124983a6
Tablet-ui: fix tablet orientation for users in 2d desktop mode
...
Double 180 flip. Once before to account for -z forward of camera.
Once after to account for avatar 180 flip.
2017-02-01 17:48:28 -08:00
Chris Collins
eabd41d0e9
Merge pull request #9579 from hyperlogic/bug-fix/tablet-ui-keyboard-focus
...
tablet-ui: Fix for keyboard focus
2017-02-01 15:26:02 -08:00
Anthony J. Thibault
2760065ee1
Bug fix for previous commit
2017-02-01 13:51:31 -08:00
Anthony J. Thibault
9be6fe2192
tablet-ui: Fix for keyboard focus box still being visible sometimes
2017-02-01 13:44:12 -08:00
Zach Fox
8b1161b0b0
Fix it
2017-02-01 12:32:30 -08:00
Anthony J. Thibault
ca79397ee8
tablet-ui: Fix for keyboard focus
...
Don't allow clicks on non-web entities from stealing focus away from web overlays.
2017-02-01 11:22:17 -08:00
Seth Alves
ab8be15ce0
Merge pull request #9570 from highfidelity/tablet-ui
...
Tablet ui
2017-02-01 09:38:13 -08:00
Anthony J. Thibault
8f362861eb
tablet-ui: button icon images now work with http urls.
2017-01-31 16:53:25 -08:00
Seth Alves
645aad7bb0
Merge pull request #9557 from hyperlogic/tablet-ui
...
Fix for one-frame lag in the tablet stylus.
2017-01-31 13:37:56 -08:00
Brad Hefta-Gaub
2fc6b4b0af
Merge pull request #9544 from humbletim/fix-rightclick-menu
...
Hide webview context menus when clicked
2017-01-31 13:03:50 -08:00
Anthony J. Thibault
0f75668923
Moved Model setting of _spatiallyNestableOverride to constructor
2017-01-31 09:36:21 -08:00
Seth Alves
7c2957cfa7
merge from upstream
2017-01-31 08:57:36 -08:00
Brad Hefta-Gaub
b597f3e098
Merge pull request #9267 from AndrewMeadows/report-all-collision-events
...
fix for missed START collision events
2017-01-31 08:54:58 -08:00
Seth Alves
7d80679652
Merge pull request #9566 from sethalves/tablet-ui
...
Tablet ui
2017-01-31 05:03:51 -08:00
