samcake
e0f0cc2102
Fix the unsupported ktx format, it was coming from the BUmp map case
2017-03-14 15:49:44 -07:00
Stephen Birarda
490cb83489
move advanced movement control changes to MyAvatar
2017-03-14 15:03:01 -07:00
Stephen Birarda
1fe02477b0
fix LX behaviour in snap/advanced/basic
2017-03-14 14:21:21 -07:00
Vladyslav Stelmakhovskyi
e2a4011b05
Coloring implemented
2017-03-14 19:10:41 +01:00
Vladyslav Stelmakhovskyi
56d4bfe077
Servers stats added. TODO: coloring
2017-03-14 18:38:49 +01:00
Vladyslav Stelmakhovskyi
d9ca8a826d
TabletEntityStatistics.qml refactored. Text now wrapped. TODO: coloring, server stats
2017-03-14 17:02:09 +01:00
Vladyslav Stelmakhovskyi
99c74cec41
Merge branch 'tablet-ui' into tablet-ui-entity-statistics
2017-03-14 15:59:27 +01:00
Vladyslav Stelmakhovskyi
ee7dd458ca
Merge branch 'tablet-ui' into tablet-ui-graphics
2017-03-14 15:37:36 +01:00
Seth Alves
e8a9ff867d
merge from upstream
2017-03-13 17:57:01 -07:00
Brad Davis
eab91d061d
Merge pull request #9868 from zzmp/ktx/local-not-roaming
...
Use Local for WIN32 FileCache
2017-03-13 15:52:11 -07:00
Anthony J. Thibault
efc7fbacb1
Bug fix for potential crash when getting DebugDraw::instance
...
(cherry picked from commit b0ad9a8110
2017-03-13 15:23:10 -07:00
Ryan Huffman
8a1bd781f0
Fix overlay findRayIntersection not properly handing multiple drawInFront overlays
2017-03-13 14:44:14 -07:00
Brad Davis
3bef5ad528
Merge remote-tracking branch 'upstream/master' into smarter_textures
2017-03-13 14:30:25 -07:00
Zach Pomerantz
808973d7d2
use QStandardPaths instead of hardcoded paths
2017-03-13 17:26:42 -04:00
David Rowe
4dd7667fd7
Merge branch 'tablet-ui' into 21209
...
# Conflicts:
# interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
# interface/src/ui/overlays/Web3DOverlay.cpp
2017-03-14 08:50:01 +13:00
Vladyslav Stelmakhovskyi
9e9c64021c
Merge branch 'tablet-ui' into tablet-ui-entity-statistics
2017-03-13 19:54:40 +01:00
howard-stearns
db06c2650f
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-13 11:53:48 -07:00
Andrew Meadows
546f32431d
Merge pull request #9862 from ZappoMan/fadeInWhenOpeningNoiseGate
...
Various noise gate, scope, and audio stats improvements
2017-03-13 11:52:16 -07:00
howard-stearns
ee3ca736fd
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-13 11:51:39 -07:00
Vladyslav Stelmakhovskyi
48db6201e5
Basic statistics showed. TODO: servers statistics, coloring, wrapping
2017-03-13 19:48:50 +01:00
Andrew Meadows
6e7f4b0418
Merge pull request #9829 from ZappoMan/addDoubleClick
...
Add double click message support to entities and overlays
2017-03-13 10:44:54 -07:00
Zach Fox
beb848373b
Update from zfox23/PALv2 branch
2017-03-13 10:15:06 -07:00
Seth Alves
4f71a5b234
Merge pull request #9864 from vladest/tablet-ui-lod-settings
...
Add LOD settings to Tablet UI
2017-03-13 08:59:40 -08:00
Seth Alves
ffd4d1488c
Merge pull request #9866 from vladest/tablet-ui-lodtools
...
Fixed slider groove size calculation. Added LOD Tools to Tablet UI
2017-03-13 08:59:06 -08:00
Vladyslav Stelmakhovskyi
49055cfa5c
Some statistics showed
2017-03-13 16:31:29 +01:00
Seth Alves
b3003acb97
Merge pull request #9856 from druiz17/tablet-imporove-dialogs
...
Bring of menu window if tablet is closed on desktop
2017-03-12 12:20:29 -08:00
Brad Hefta-Gaub
a38965d628
add more audio stats
2017-03-11 09:50:30 -08:00
Vladyslav Stelmakhovskyi
81bc56f124
Fixed slider groove size calculation. Added LOD Tools to Tablet UI
2017-03-11 14:44:33 +01:00
Vladyslav Stelmakhovskyi
d70943dd6c
Add Graphics preferences to Tablet. Use TabletComboBox instead of desktop ComboBox for Tablet preferences
2017-03-11 12:23:31 +01:00
Vladyslav Stelmakhovskyi
9f7c5a1603
Add LOD settings to Tablet UI
2017-03-11 11:54:44 +01:00
David Rowe
74839b24a3
Merge branch 'tablet-ui' into 21209
2017-03-11 15:56:38 +13:00
Brad Hefta-Gaub
6ce50269ac
add audio mixer in/out stats to the client stats
2017-03-10 18:42:18 -08:00
Brad Hefta-Gaub
aa65f03509
fix mac warning and remove accidentally added whitespace
2017-03-10 18:14:00 -08:00
Brad Hefta-Gaub
7eb4b8f5f7
expose AudioScope to QML
2017-03-10 17:38:13 -08:00
Brad Hefta-Gaub
eaea718de1
add various scriping interfaces for managing the audio scope and detecting noise gate transitions
2017-03-10 17:08:19 -08:00
Anthony J. Thibault
07e10ae862
Merge branch 'tablet-ui' into feature/can-touch-this
2017-03-10 17:05:26 -08:00
Dante Ruiz
8a973dae3c
fixed bring menu dialogs in tablet
2017-03-10 23:21:29 +00:00
David Rowe
71713b10f3
Merge remote-tracking branch 'upstream/tablet-ui' into 21209
...
# Conflicts:
# interface/src/ui/overlays/Web3DOverlay.cpp
2017-03-11 09:14:06 +13:00
kunalgosar
a974282bdf
bolding timestamps on log
2017-03-10 11:55:36 -08:00
Dante Ruiz
78da936344
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-imporove-dialogs
2017-03-10 19:33:51 +00:00
Dante Ruiz
9b3810814e
fiexed putting menu items on the hud when tablet not open when on desktop screen
2017-03-10 18:40:18 +00:00
Seth Alves
fffff817a3
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-10 10:20:40 -08:00
Andrew Meadows
8ddcae2a15
restore transform of deactivated entities
2017-03-09 17:26:53 -08:00
Andrew Meadows
d4abdcb6c8
comments, namechange, and temporary debug code
2017-03-09 17:26:53 -08: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
druiz17
0069569e96
Merge branch 'tablet-ui' into 21197
2017-03-09 09:31:15 -08:00
druiz17
8750982567
Merge pull request #9785 from druiz17/menuFix
...
More dialog porting to tablet
2017-03-09 09:29:31 -08:00
Dante Ruiz
b58a27cf10
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix
2017-03-09 16:26:28 +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
Seth Alves
7f47835733
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-08 16:10:18 -08:00
David Rowe
1fc6d82456
Tablet and desktop versions of avatar attachments dialog
2017-03-09 13:04:57 +13:00
Seth Alves
28ade45f97
make maxFPS a property
2017-03-08 15:30:15 -08:00
Seth Alves
ae48dae96f
get rid of toggleTabletUI lockout period
2017-03-08 15:29:46 -08:00
Atlante45
97c376a09c
Revert "avoid unnecessary copy of priority_queue"
...
This reverts commit e54812430e
2017-03-08 14:08:58 -08:00
Atlante45
188287e345
Revert "minor cleanup"
...
This reverts commit 14e7392a89
2017-03-08 14:08:52 -08:00
Atlante45
9a9f07df71
Revert "expand avatar update time budget"
...
This reverts commit 4bbbcb61be
2017-03-08 14:08:48 -08:00
Atlante45
8bf9b70915
Revert "don't blend animations for otherAvatars"
...
This reverts commit faa272c67c
2017-03-08 14:08:33 -08:00
David Rowe
1e3c717fd4
Method to show appropriate desktop or tablet dialog
2017-03-09 09:55:47 +13:00
Brad Davis
e94f803b84
Merge remote-tracking branch 'upstream/master' into HEAD
2017-03-08 09:03:21 -08:00
David Rowe
950f91965d
Merge branch 'tablet-ui-edit-js' into 21197
2017-03-08 17:35:58 +13:00
Seth Alves
adc3581d63
remove override of locationChanged which was keeping the render-bounds of Line3DOverlays from updating during calls to editOverlay
2017-03-07 19:32:34 -08:00
Brad Hefta-Gaub
8ae6f2727d
add support for double click messages to overlays and entities
2017-03-07 17:52:55 -08:00
Thijs Wenker
b54d6cb0e1
stop avatar controller while playing back a recording, which makes it not collide anymore
2017-03-08 00:07:49 +01:00
Vladyslav Stelmakhovskyi
a02807fb26
Merge branch 'menuFix' into menuFix_AssetServer
2017-03-07 21:07:53 +01:00
Anthony J. Thibault
b0ad9a8110
Bug fix for potential crash when getting DebugDraw::instance
2017-03-07 10:03:38 -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
10ce732e91
Merge branch 'master' into menuFix
2017-03-07 16:15:54 +00:00
Brad Hefta-Gaub
b111bcb826
Merge pull request #9818 from ctrlaltdavid/21205
...
Remove Developer > Network > Bandwith Details dialog
2017-03-06 22:02:33 -08:00
David Rowe
fb1ff5be89
Port Developer > Network > Networking to tablet
2017-03-07 17:02:29 +13:00
David Rowe
51739f2f99
Remove Developer > Network > Bandwith Details dialog
2017-03-07 15:02:26 +13:00
Brad Davis
8782fe1d93
Merge branch 'master' into smarter_textures
...
Conflicts:
libraries/model-networking/src/model-networking/TextureCache.cpp
2017-03-06 15:29:41 -08:00
Zach Fox
5223f872c1
Merge pull request #9753 from zfox23/FB_3234_TakeTwo
...
Optimize AvatarMixer with respect to Identity and Avatar Data
2017-03-06 13:37:29 -08:00
Andrew Meadows
1b8f6b9835
Merge pull request #9784 from samcake/blue
...
Fixing Emissive on overlay for models (opaque and transparent)
2017-03-06 13:24:00 -08:00
Vladyslav Stelmakhovskyi
0a36ebc5a0
Remove non relevant changes
2017-03-06 22:11:46 +01:00
David Rowe
af4bdd5943
Port Developer > Audio > Buffers to tablet
2017-03-07 09:57:02 +13:00
Vladyslav Stelmakhovskyi
6d9e7de6dc
Implemented AssetBrowser in Tablet view
2017-03-06 21:45:55 +01: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
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
08e2e421e4
Merge branch '21199' of github.com:ctrlaltdavid/hifi into tablet-ui-edit-js
2017-03-06 11:08:27 -08:00
Seth Alves
4b02e550db
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-06 11:07:12 -08:00
Andrew Meadows
6ea6477c73
Merge pull request #9683 from jherico/cache_flush
...
Clear caches on domain switch
2017-03-06 11:05:44 -08:00
Zach Fox
c9c07c4269
Basically rebase and squash
2017-03-06 10:03:41 -08:00
Seth Alves
93246b24b0
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-06 08:54:49 -08:00
Dante Ruiz
d5948079c7
Merge branch 'master' of github.com:highfidelity/hifi into menuFix
2017-03-06 16:29:37 +00:00
sam
cffd838d1d
merging with master
2017-03-05 12:57:13 -08:00
Ken Cooke
50f92cb934
redo unsafe optimization
2017-03-04 15:29:23 -08:00
Ken Cooke
46c5f96113
redo unsafe optimization
2017-03-04 15:24:03 -08:00
Ken Cooke
117bba8b6a
redo unsafe optimization
2017-03-04 15:17:09 -08:00
David Rowe
6385bb2b80
Open general settings dialog in tablet from tablet menu
2017-03-04 15:57:58 +13:00
David Rowe
0333122b23
Make Save and Cancel buttons close preferences dialog
2017-03-04 15:27:31 +13:00
Anthony J. Thibault
e56f02d94f
Changed default for preferFingerOverStylus to false.
2017-03-03 14:12:04 -08:00
David Rowe
6403e51d20
Merge branch 'tablet-ui-edit-js' into 21199
2017-03-04 09:00:49 +13:00
David Rowe
48ee661f02
Merge branch 'tablet-ui-edit-js' into 21197
2017-03-04 08:58:48 +13:00
Anthony J. Thibault
45febe8565
Merge branch 'master' into feature/fingers-on-tablet
2017-03-03 09:04:43 -08:00
Seth Alves
40caa1ea49
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-03 09:01:57 -08:00
Bradley Austin Davis
efad7da508
Merge remote-tracking branch 'upstream/master' into HEAD
2017-03-03 08:59:24 -08:00
Dante Ruiz
f5324d5822
Merge branch 'master' of github.com:highfidelity/hifi into menuFix
2017-03-03 15:41:43 +00:00
Dante Ruiz
f867f4e739
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix
2017-03-03 15:40:41 +00:00
David Rowe
9384dfd89c
Merge branch 'tablet-ui-edit-js' into 21197
2017-03-03 18:05:18 +13:00
David Rowe
854292b193
Merge branch 'tablet-ui-edit-js' into 21199
2017-03-03 17:51:12 +13:00
David Rowe
b31cf23c8d
Fix tablet QML fonts path
...
This is the path for running scripts from build/install directory rather
than from source directory.
2017-03-03 17:45:23 +13:00
David Rowe
3285816fca
Fix up audio stats displayed in tablet
2017-03-03 16:45:35 +13:00
Seth Alves
807e15ade9
Merge pull request #9798 from AndrewMeadows/faster-avatar-updates-2
...
avoid animation blending for other avatars
2017-03-02 18:37:18 -08:00
Brad Hefta-Gaub
e655e442a0
Merge pull request #9799 from sethalves/steady-hand-lasers
...
Steady hand lasers
2017-03-02 18:27:39 -08:00
Seth Alves
f055711c76
refix
2017-03-02 16:47:19 -08:00
Seth Alves
3b581a8dfe
merge from upstream
2017-03-02 16:35:44 -08:00
Seth Alves
10cb7aab06
Merge pull request #9684 from Menithal/parent-hotkey
...
WL#20856 Added Parenting Hotkeys to Edit.js Among Visual tweaks
2017-03-02 16:30:43 -08:00
Seth Alves
88d6fe6a04
fix offset relative to endParent
2017-03-02 16:26:56 -08:00
Seth Alves
5f570c1ba8
fix up bounds handling in Line3DOverlay
2017-03-02 16:16:48 -08:00
Seth Alves
6a4d477381
fix up bounds handling in Line3DOverlay
2017-03-02 16:15:41 -08:00
David Rowe
b985b348ec
Merge branch 'tablet-ui-edit-js' into 21199
2017-03-03 09:43:49 +13:00
Seth Alves
9d4445fd61
Merge branch 'steady-hand-lasers' of github.com:sethalves/hifi into tablet-ui-edit-js
2017-03-02 10:07:37 -08:00
Seth Alves
cf37845f9e
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-02 10:06:38 -08:00
Seth Alves
8893c4770e
Merge branch 'master' of github.com:highfidelity/hifi into steady-hand-lasers
2017-03-02 10:02:33 -08:00
Dante Ruiz
ea804578ce
Merge branch 'master' into menuFix
2017-03-02 16:06:32 +00:00
Andrew Meadows
a55ab94cd9
other avatars use jointData no Rig animation
2017-03-02 07:52:02 -08:00
David Rowe
b592205f7e
Fix OSX warning
2017-03-02 18:45:42 +13:00
Anthony J. Thibault
4f03c06a94
Added General Preference to control stylus vs finger usage
...
By default the finger is preferred over the stylus.
2017-03-01 18:07:53 -08:00
David Rowe
e445fe551f
Fix showing wrong version of dialog in desktop mode
2017-03-02 15:00:38 +13:00
Seth Alves
7f6b803652
3d-line-overlays can now have an endParentID and endParentJointIndex
2017-03-01 17:27:32 -08:00
David Rowe
b9869264ba
Display avatar settings dialog in tablet
2017-03-02 13:16:23 +13:00
Seth Alves
7c4869eb73
fix up parenting for 3d line overlays, have handControllerGrab use a child overlay for search/far-grab so the updates are smoother
2017-03-01 16:10:07 -08:00
Bradley Austin Davis
fa5b315e09
Merge remote-tracking branch 'upstream/master' into smarter_textures
2017-03-01 15:16:18 -08:00
Anthony J. Thibault
465a9e2008
Responsiveness improvement to tablet
...
PointerEvents sent from handControllerGrab.js to the Qml window are now direct connections, instead of queued.
This should reduce latency of laser and finger pressed onto the tablet.
2017-03-01 14:31:04 -08:00
Dante Ruiz
e2479a78bd
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix
2017-03-01 16:04:12 +00:00
samcake
664163eb17
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-02-28 18:13:01 -08:00
Andrew Meadows
148100b26f
fix bug drawing avatar above ground
2017-02-28 15:10:20 -08:00
Seth Alves
c2085ebb6e
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-02-28 13:33:51 -08:00
Andrew Meadows
c6730f7c58
Merge pull request #9745 from AndrewMeadows/faster-avatar-updates
...
Faster avatar updates
2017-02-28 10:55:21 -08:00
Clément Brisset
7f9437dcc5
Merge pull request #9690 from Atlante45/feat/sit
...
Add hips pinning / Sit script
2017-02-28 10:41:22 -08:00
Dante Ruiz
d5714bfa6e
Merge branch 'master' into menuFix
2017-02-28 16:55:44 +00:00
samcake
576660f6ef
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-02-27 18:17:28 -08:00
Seth Alves
117be16c31
pull from upstream
2017-02-27 16:48:23 -08:00
Atlante45
9ce10742ec
Move avatar not joint
2017-02-27 16:38:57 -08:00
Atlante45
e9316d30d0
More IK smoothing experimentation
2017-02-27 16:38:56 -08:00
Atlante45
cbaaaa21c6
Use head orientation for sitting
2017-02-27 16:38:56 -08:00
Atlante45
e503542b6a
Fix transform computation
2017-02-27 16:38:55 -08:00
Atlante45
8c232b5abb
Initialize max offset to infinity
2017-02-27 16:38:55 -08:00
Atlante45
187cd0d5cf
Get IK error and stand up based on it
2017-02-27 16:38:55 -08:00
Atlante45
7132969083
Add hips pinning capability to MyAvatar
2017-02-27 16:38:54 -08:00
Atlante45
6821c8621f
More sit work
2017-02-27 16:38:54 -08:00
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
Dante Ruiz
19110ecfee
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix
2017-02-27 16:00:08 +00:00
Seth Alves
34c5d480c4
Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js
2017-02-27 06:35:50 -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
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
a2f527b28a
Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js
2017-02-25 08:44:03 -08:00
Seth Alves
36bcaa8d0f
delete tablet overlays when switching domains
2017-02-25 08:43:06 -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
Dante Ruiz
73c337efd0
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix
2017-02-25 00:42:22 +00:00
Dante Ruiz
835b23832f
some modal clean up
2017-02-25 00:40:38 +00:00
Seth Alves
fcd3c09404
Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js-tablet-as-overlay
2017-02-24 14:27:30 -08:00
Seth Alves
34755dd75d
notify children of an overlay when the parent overlay moves
2017-02-24 13:57:49 -08:00
Brad Davis
cd8bba47cf
Add pending texture transfer size to tracked stats
2017-02-24 12:39:38 -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
Seth Alves
f208f5e2d1
fix a couple of problems related to grabbing tablet while edit.js is active
2017-02-24 11:34:10 -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
Dante Ruiz
89f5e5112f
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix
2017-02-24 15:25:32 +00:00
Seth Alves
e43c4c17f5
in 2d mode, clicks on tablet don't get used for other things
2017-02-23 21:27:25 -08:00
sam
8e122b3357
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-02-23 21:24:47 -08:00
Seth Alves
ce717d04e9
merge in tablet-as-overlay code
2017-02-23 18:40:20 -08:00
samcake
6d59144a4f
Trying to fix the emissive for overlay in front ?
2017-02-23 17:42:02 -08:00
Seth Alves
610c20e01a
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-02-23 17:41:38 -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
Brad Davis
61e341db75
Merge remote-tracking branch 'upstream/master' into smarter_textures
2017-02-23 17:22:03 -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
Dante Ruiz
93ae93a45a
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix
2017-02-23 15:43:24 +00: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
Dante Ruiz
3ba605bf23
saving work
2017-02-23 00:28:30 +00:00
Seth Alves
a6b4f07674
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-02-22 12:07:31 -08:00
samcake
6938948501
Merge branch 'master' of https://github.com/highfidelity/hifi into texmex
2017-02-22 12:00:11 -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
Seth Alves
84b93826d0
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-02-22 09:30:16 -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
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
2b9c69926b
Merge branch 'master' of https://github.com/highfidelity/hifi into filter-pal-by-view-distance
2017-02-21 15:42:00 -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
Dante Ruiz
f58a018c64
fixing merge conflicts
2017-02-21 15:46:41 +00: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
43f47c1106
merge from upstream
2017-02-20 12:45:39 -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 Davis
07506b0078
Merge remote-tracking branch 'upstream/master' into smarter_textures
2017-02-19 14:00:52 -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
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
Chris Collins
ec07969c0b
Merge pull request #9703 from kunalgosar/logDisplayMode
...
Logging HMD/Desktop Transitions
2017-02-17 17:07:02 -08: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
Dante Ruiz
3f8ea4ac54
fixed merge conflict
2017-02-17 23:33:39 +00:00
kunalgosar
b8b5927351
Logging display mode changes
2017-02-17 13:21:01 -08:00
Seth Alves
39e1edafd2
merge from upstream
2017-02-17 13:16:12 -08: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
Dante Ruiz
dedd85d296
saving work
2017-02-17 18:47:59 +00:00
Seth Alves
4c1f5c1dc8
Merge branch 'overlays-uuid' of github.com:sethalves/hifi into tablet-ui-edit-js
2017-02-17 09:58:58 -08: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
Brad Davis
35a6359d59
Fixing transfer logic, adding stats display & profile ranges
2017-02-17 07:53:21 -08:00
Bradley Austin Davis
7fb7aa87eb
Working on new texture management strategy
2017-02-17 07:53:16 -08:00
Dante Ruiz
80551cf0dd
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix
2017-02-17 15:50:27 +00:00
Dante Ruiz
3189b44612
refreshing with master
2017-02-17 15:50:08 +00: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
Dante Ruiz
628b97bfc6
fixed merge issues
2017-02-17 00:08:31 +00:00
Dante Ruiz
afd56bbbbe
fixed qml font path issue for desktop and tablet
2017-02-17 00:01:12 +00:00
Anthony J. Thibault
8ccca86dee
Settings for Tablet Becomes Toolbar
2017-02-16 15:57:36 -08:00
Seth Alves
21b0e45b0f
don't show keyboard in edit.js unless HMD is being worn
2017-02-16 09:56:50 -08:00
Dante Ruiz
7ad8a389f6
refreshing with master
2017-02-16 08:13:17 -08:00
Dante Ruiz
2a97ebb076
updating branch with master
2017-02-16 08:11:50 -08:00
Dante Ruiz
896f9d7181
refreshing with master
2017-02-16 15:58:26 +00: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
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
Seth Alves
c0b5f7b005
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-02-15 11:36:50 -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
Seth Alves
792c7ff51f
PointerEvent will now relay keyboard modifiers
2017-02-15 10:41:56 -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
Dante Ruiz
485592751f
fixing merge changes
2017-02-15 15:38:22 +00:00
Dante Ruiz
22baab1359
updating branch with master
2017-02-15 15:24:08 +00: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
c01d0b309e
Toggle next for search on Log
2017-02-14 16:13:40 -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
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
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
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
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
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
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
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
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
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
Seth Alves
9881dd261a
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting
2017-02-03 12:57:14 -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
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
Seth Alves
43bf929e95
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting
2017-02-01 20:27:43 -08:00
Seth Alves
24510ee3fe
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting
2017-02-01 18:42:56 -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
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
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
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
Anthony J. Thibault
0f75668923
Moved Model setting of _spatiallyNestableOverride to constructor
2017-01-31 09:36:21 -08:00
Seth Alves
5131d1edf2
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting
2017-01-31 09:22:16 -08:00
Seth Alves
7c2957cfa7
merge from upstream
2017-01-31 08:57:36 -08:00
Seth Alves
88948fa2b4
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into model-scripting
2017-01-30 19:54:50 -08:00
Anthony J. Thibault
0962a15a06
Fix for one-frame lag in the tablet stylus.
2017-01-30 15:39:55 -08:00
Andrew Meadows
0809149a8c
harvest collision events before disowning
2017-01-30 13:21:23 -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
Anthony J. Thibault
a9b478888c
First cut of Web3DOverlays without FXAA applied.
2017-01-30 11:24:58 -08:00
Seth Alves
541692c5ca
start on scripting interface to allow saving polyvox meshes to obj files
2017-01-28 15:38:18 -08:00
Seth Alves
fa61bbe2a6
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-26 18:21:39 -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
db38503d57
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-26 13:48:59 -08:00
samcake
19858bda78
Merge pull request #9493 from AndrewMeadows/otherAvatars
...
optimize, prioritize, and timebox processing of avatar updates
2017-01-26 13:30:51 -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
Andrew Meadows
5783db910b
remove some unhelpful trace profiling data
2017-01-26 08:35:26 -08:00
Andrew Meadows
82f52b9658
fix bug: Avatar instance not getting deleted
2017-01-26 08:35:26 -08:00
Andrew Meadows
2264c29604
less magic
2017-01-26 08:35:26 -08:00
Andrew Meadows
0f09e60acd
remove unhelpful comment
2017-01-26 08:35:26 -08:00
Andrew Meadows
01e14eec47
remove commented out cruft
2017-01-26 08:35:26 -08:00
Andrew Meadows
ac180758ad
sort, optimize, and timebox process avatar updates
2017-01-26 08:35:26 -08:00
Andrew Meadows
d3dcc2b415
remove cruft: billboard option for Head::simulate()
2017-01-26 08:35:26 -08:00
Andrew Meadows
887707426e
remove cruft: Head::getScalePivot()
2017-01-26 08:35:26 -08:00
Andrew Meadows
69a7b1ef76
move some stuff out of Avatar::simulate()
...
call it explicity in AvatarManager::updateOtherAvatars()
2017-01-26 08:35:26 -08:00
Andrew Meadows
b8afc87ad9
remove cruft
2017-01-26 08:35:26 -08:00
Andrew Meadows
e65d9309b3
remove cruft: Avatar::setShouldDie()
2017-01-26 08:35:26 -08:00
Andrew Meadows
e363423992
compute priority of avatar and sort before update
2017-01-26 08:35:26 -08:00
Andrew Meadows
88bf126168
remove old avatar culling and LOD logic
2017-01-26 08:35:25 -08:00
Andrew Meadows
08bba5f45f
add and remove some profile data points
2017-01-26 08:35:25 -08:00
ZappoMan
3c3dcbbbaa
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-26 08:20:03 -08:00
Anthony J. Thibault
5eb7849a80
Support for Window.geometryChanged signal.
2017-01-25 16:43:35 -08:00
Seth Alves
c317ba8054
merge from upstream
2017-01-25 15:57:53 -08:00
Seth Alves
ff8d13ecc7
get button-states for toolbar buttons working again
2017-01-25 15:38:54 -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
David Rowe
74b878a276
Fix threading of message box updates
2017-01-25 17:48:58 +13:00
Seth Alves
b679d94585
remove commented-out code
2017-01-24 16:04:22 -08:00
Seth Alves
601a35a9b6
try a different way of repairing tablet after a domain change
2017-01-24 15:49:49 -08:00
Seth Alves
19cf84dd5d
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-close-tablet-upon-goto
2017-01-24 12:49:47 -08:00
Seth Alves
df9bc91f01
fix near-grab to equip handoff
2017-01-24 11:39:26 -08:00
Seth Alves
4de0b94b6c
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-close-tablet-upon-goto
2017-01-24 09:42:20 -08:00
Seth Alves
a28becfb1a
close tablet before changing domains
2017-01-24 09:42:12 -08:00
Anthony J. Thibault
432bb27119
The tablet Help button should be active if window is visible
2017-01-23 18:37:08 -08:00
Seth Alves
281b7a6eca
close tablet anytime AddressManager::hostChanged fires
2017-01-23 16:49:05 -08:00
Seth Alves
69252deb2e
close the tablet when going to a new domain
2017-01-23 16:28:56 -08:00
Seth Alves
200105c856
Merge pull request #9484 from hyperlogic/tablet-ui
...
UI navigation work with game pads
2017-01-23 16:01:45 -08:00
Anthony J. Thibault
584a9a3c98
UI navigation work with game pads
...
The tablet UI can be long lived, unlike the previous VRMenu.
So instead of using a dynamic mapping that was only enabled when the VRMenu was shown, standard_navigation.json.
standard_navigation is always active. Also, standard_navigation.json has been changed.
Left and Right click and stick events never become UINav events. Only Dpad A, B, X, Y, LB and RB are mapped to UINav events.
2017-01-23 15:22:49 -08:00
ZappoMan
81b5a3c585
more cleanup
2017-01-23 15:12:54 -08:00
ZappoMan
29fff2e556
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-23 13:09:59 -08:00
ZappoMan
292d472a59
checkpoint - got first cut at distance based rotation tolerance working
2017-01-23 13:06:29 -08:00
Seth Alves
be8bc9652b
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-23 09:44:04 -08:00
Ryan Huffman
9b1cd52fb4
Add the ability to get the context that a script is running in
2017-01-23 08:58:01 -08:00
samcake
afd3c3b504
Merge pull request #9436 from AndrewMeadows/cauterization-cleanup
...
Cleanup of code that decides not to render head when in first-person
2017-01-20 14:49:08 -08:00
Atlante45
04e81c5db7
Fix interface build
2017-01-20 10:53:57 -08:00
Seth Alves
6641f9bafd
Merge pull request #9444 from druiz17/homeButtonFix
...
Home button is now an overlay
2017-01-20 10:32:31 -08:00
Stephen Birarda
25bd6fa2c1
move recording interface to Agent/Application only
2017-01-20 10:27:08 -08:00
Seth Alves
c492319be2
merge from upstream
2017-01-20 10:14:11 -08:00
Dante Ruiz
a319db3cb4
removed duplicate code
2017-01-20 00:57:48 +00:00
Dante Ruiz
1e7e4576cc
comparing with ID instead of strings
2017-01-19 16:38:55 -08:00
Andrew Meadows
10cdea9cd8
cleanup model fade logic
2017-01-19 14:17:50 -08:00
Seth Alves
47b59ffae3
don't save tablet to Settings when logging out or switching domains
2017-01-19 14:10:48 -08:00
Andrew Meadows
9631864ae2
make soft attachments cauterized for MyAvatar
2017-01-19 12:56:07 -08:00
Andrew Meadows
5a2e337758
fix comments
2017-01-19 12:56:07 -08:00
Andrew Meadows
bfbef91f53
re-enable cauterization of meshes for MyAvatar
2017-01-19 12:56:07 -08:00
Andrew Meadows
1a3fa84985
add newline at EOF
2017-01-19 12:56:07 -08:00
Andrew Meadows
189da81bb1
fix for crash on unloaded model
2017-01-19 12:56:07 -08:00
Andrew Meadows
3dd8fd838b
move cauterization out of Model class
2017-01-19 12:56:07 -08:00
David Kelly
d9fbf832e2
Some initial analytics for PAL usage
2017-01-19 11:35:17 -08:00
Seth Alves
eb25e1c12d
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-19 09:41:49 -08:00
Brad Davis
70de00c6bf
Merge pull request #9421 from jherico/more_trace_details
...
Additional trace details for GPU timing, frame data updates
2017-01-19 09:12:34 -08:00
Dante Ruiz
30b57b62da
toggle help
2017-01-19 08:12:49 -08:00
samcake
05304c72e0
Merge branch 'master' of https://github.com/highfidelity/hifi into meta
2017-01-18 17:00:20 -08:00
Seth Alves
7c938728e5
don't do constant haptics if stylus touches tablet frame. home button triggers only once per click
2017-01-18 16:56:39 -08:00
Brad Davis
1ef4ac9a6c
Additional trace details for GPU timing, frame data updates
2017-01-18 16:19:32 -08:00
Anthony J. Thibault
bcd94203e6
Raised min fps of tablet overlay for smoother scrolling
2017-01-18 15:32:39 -08:00
Seth Alves
c6d0c0909e
avoid unthreadsafe use of getJointIndex
2017-01-18 14:54:38 -08:00
Ryan Huffman
8137c59ef7
Add support for sending requests to entity script server
2017-01-18 11:15:29 -08:00
Dante Ruiz
baff07b0f9
controller with menus finally work
2017-01-18 07:41:25 -08:00
Dante Ruiz
9a61b6030b
tabletFocus update
2017-01-18 07:40:15 -08:00
Dante Ruiz
d3fa7651c9
some what working d-pad
2017-01-18 07:40:15 -08:00
dante ruiz
865a78a8c8
saving work
2017-01-18 07:40:14 -08:00
Seth Alves
b57803057d
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-18 06:38:44 -08:00
Brad Davis
cbc89e77ab
Consume fewer resources in AssetServer when interface is running locally
2017-01-17 18:15:39 -08:00
samcake
246dcbd0c0
Removing the warning
2017-01-17 15:01:27 -08:00
David Kelly
341ac685e9
Merge pull request #9404 from davidkelly/dk/removeKilledAvatarsFromPalLists
...
remove ignored avatars from PAL when they disconnect
2017-01-17 14:21:36 -08:00
Seth Alves
be165b567e
remove XXX comments
2017-01-17 13:32:58 -08:00
Seth Alves
e76f1c5937
if another avatar has something hung from their camera, don't act like their camera is my camera
2017-01-17 13:28:13 -08:00
David Kelly
9b1aaf3bfe
CR feedback
2017-01-17 12:09:47 -08:00
Stephen Birarda
1e04aebb8d
add --fast-hearbeat command line switch for 1s stats
2017-01-17 11:25:40 -08:00
samcake
69f9053e61
Merge branch 'master' of https://github.com/highfidelity/hifi into meta
2017-01-17 10:55:10 -08:00
David Kelly
2460e89a57
CR feedback
2017-01-17 09:53:04 -08:00
Seth Alves
6bace4f451
merge from upstream
2017-01-17 09:29:30 -08:00
David Kelly
6c701bb0f0
remove ignored avatars from PAL when they disconnect
2017-01-16 18:22:53 -08:00
Seth Alves
f900629cdb
Merge pull request #9390 from sethalves/load-models-in-keyhole
...
fix physics not starting up when a model is close behind
2017-01-16 18:06:23 -08:00
samcake
83d1c3ad01
Adding support for the meta rendering
2017-01-16 17:47:58 -08:00
Stephen Birarda
1993e358d6
Merge pull request #9318 from birarda/ovr-platform-entitlement
...
handle OVR Platform entitlement checks
2017-01-16 11:16:31 -08:00
Seth Alves
bd67715cd2
don't early-exit from the loop that checks for loaded collision hulls because the check is what causes the hulls to be constructed
2017-01-16 08:54:56 -08:00
Chris Collins
2557c797af
Merge pull request #9300 from zzmp/graphics/forward-opaque
...
Add opaques/skinned to forward rendering path
2017-01-16 08:48:18 -08:00
ZappoMan
c9c311e275
checkpoint for distance joints
2017-01-15 11:47:48 -08:00
Seth Alves
36fdaa6350
avoid a little pop when grabbing something with ignore-ik as true
2017-01-15 10:10:54 -08:00
ZappoMan
c884b276e2
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-14 22:15:22 -08:00
Seth Alves
9de8144f0d
merge from upstream
2017-01-13 10:17:03 -08:00
Seth Alves
f9a36d68ad
Merge pull request #9363 from ctrlaltdavid/21127
...
Make Clara.io downloads convert textures to PNG
2017-01-13 10:14:43 -08:00
Seth Alves
481cc47f79
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-13 09:28:18 -08:00
ZappoMan
aed1b69ee0
make the avatar bounding box be avatar local and only change when it actually changes
2017-01-12 17:19:06 -08:00
Seth Alves
cc4f4ac506
fix merge from upstream
2017-01-12 17:08:14 -08:00
Seth Alves
208c4686c4
merge from upstream
2017-01-12 15:44:27 -08:00
Brad Davis
659badd8bf
Change minimum threadpool size 1
2017-01-12 14:43:31 -08:00
samcake
ca53235d54
Merge pull request #9358 from AndrewMeadows/model-cleanup
...
minor cleanup for Model rendering code
2017-01-12 14:30:16 -08:00
samcake
b9e8f7ee14
Merge pull request #9359 from jherico/cached_qml_surfaces
...
Eagerly cache QML surfaces for Web3D overlays
2017-01-12 14:28:35 -08:00
Dante Ruiz
7d84aae670
closing tablet when taking snapshot
2017-01-12 17:29:38 +00:00
Brad Davis
2de83d42bc
Add process and system CPU usage to traces
2017-01-12 09:19:08 -08:00
David Rowe
8cd7e1b377
Improve user messages
2017-01-12 15:48:25 +13:00
David Rowe
b41f8c754d
Add updateable message box to JavaScript API
2017-01-12 15:46:53 +13:00
Andrew Meadows
b3e336de3d
remove cruft: unused function arguments
2017-01-11 15:02:18 -08:00
Brad Davis
f235a52a6d
Eagerly cache QML surfaces for Web3D overlays to prevent stutter on loading the tablet
2017-01-11 14:21:29 -08:00
ZappoMan
5b76eaaf52
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-11 10:22:14 -08:00
Seth Alves
bacc796730
Merge branch 'master' of github.com:highfidelity/hifi into update-tablet-ui-again
2017-01-11 09:54:26 -08:00
Brad Davis
31f39d7eef
Allow scripts to inject tracing events
2017-01-10 14:06:39 -08:00
Anthony J. Thibault
3f0860f9c3
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui
2017-01-10 13:35:29 -08:00
Anthony Thibault
e7a88b5a3c
Merge pull request #9343 from druiz17/menuApp
...
Moved the context menu to the tablet
2017-01-10 13:34:44 -08:00
Anthony J. Thibault
9db6806026
In desktop mode, tablet is in front of camera.
...
* added a new fauxJointIndex for the camera. CAMERA_MATRIX_INDEX = -7
this can be used to attach objects to the camera.
* WebTablet.js has been changed to detect when entering and exiting HMD mode
to move the tablet appropriately.
There's a known bug with the tablet entity position lagging the camera by one frame.
2017-01-10 11:31:45 -08:00
Brad Davis
1dd2747ef9
Push some tracing into 'detail' categories for easy filtering. Add new tracing categories, add counter change tracking.
2017-01-10 10:44:04 -08:00
Faye Li
c98a8168ee
uncheck "show meter level" by default
2017-01-10 09:53:55 -08:00
Dante Ruiz
2fc76d64fd
clean up unused code and files
2017-01-10 09:13:46 -08:00
druiz17
28c8d527df
Merge pull request #9340 from fayeli/tablet-hide-yellow
...
Ability to disable yellow highlight around Web Overlays
2017-01-10 09:11:51 -08:00
ZappoMan
13198fd949
add datarate
2017-01-09 13:57:59 -08:00
ZappoMan
636ade9eb7
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-09 11:29:54 -08:00
Faye Li Si Fi
93e4f9126f
disable drawing highlight if "showKeyboardFocusHighlight" flag is false
2017-01-09 11:01:15 -08:00
Anthony J. Thibault
6794ed7cc4
Merge remote-tracking branch 'upstream/master' into tablet-ui
2017-01-09 10:37:46 -08:00
Faye Li Si Fi
2fa17ea6a7
fix missing parenthesis
2017-01-09 10:23:31 -08:00
Chris Collins
30d5f70e11
Merge pull request #9278 from jherico/cpu_opt_scene
...
More low level optimizations
2017-01-09 10:10:40 -08:00
Brad Hefta-Gaub
ef7b9bfde0
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-09 10:07:05 -08:00
Faye Li Si Fi
d0d89e216d
Add showKeyboardFocusHighlight in constructor
2017-01-09 09:54:41 -08:00
Brad Hefta-Gaub
1a7b5ab520
Merge pull request #9326 from jherico/oculus_budget_stats
...
Adding tracking of Oculus renders, submits, and frames that are over budget
2017-01-06 18:18:16 -08:00
Howard Stearns
b432ffa78d
Merge pull request #9323 from zfox23/FixPalSpaceBubbleInteraction
...
Fix the PAL & Space Bubble interaction
2017-01-06 16:47:43 -08:00
Seth Alves
ad6175857d
Merge pull request #9328 from hyperlogic/tablet-ui
...
Allow Hifi.SoundEffect to be used in all qml
2017-01-06 15:21:08 -08:00
Anthony J. Thibault
0860c50a49
Allow Hifi.SoundEffect to be used in all qml
...
Including webEntities, webOverlays and the system tablet.
We might want to add this to enable spatial sound effects for the web keyboard.
2017-01-06 14:01:13 -08:00
Zach Fox
dec41f67cc
Fix bugs and generally fix behavior
2017-01-06 13:58:23 -08:00
Seth Alves
668bc35227
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-merge
2017-01-06 13:31:13 -08:00
Brad Davis
15b9e750f9
Adding tracking of Oculus renders, submits, and frames that are over budget
2017-01-06 10:51:26 -08:00
Atlante45
428a7f3bf8
Log Dialog doesn't float on top
2017-01-05 17:49:39 -08:00
Zach Fox
495925a017
This behavior was harder to change than expected...
2017-01-05 16:58:32 -08:00
Faye Li Si Fi
e7d14b9381
Adding new property "showKeyboardFocusHighlight" to Web3DOverlay
2017-01-05 16:49:55 -08:00
Seth Alves
d072b1524a
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-05 15:27:11 -08:00
Stephen Birarda
46086cdcce
set the OCULUS_STORE property with oculus store arg
2017-01-05 14:02:35 -08:00
Brad Hefta-Gaub
acca9dbe87
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
...
Conflicts:
libraries/networking/src/udt/PacketHeaders.cpp
libraries/networking/src/udt/PacketHeaders.h
2017-01-04 18:07:22 -08:00
Clément Brisset
e34ecac843
Merge pull request #9299 from Atlante45/settings
...
Fix settings hitch
2017-01-04 17:19:44 -08:00
Brad Hefta-Gaub
f9ca41e89c
Merge pull request #9302 from jherico/expose_dropped_count
...
Expose dropped frames count to stats UI
2017-01-04 16:12:35 -08:00
Howard Stearns
3d8da683db
Merge pull request #9290 from zfox23/PersonalMute
...
Personal mute; Quasi-ignore; Reversible PAL actions
2017-01-04 14:37:09 -08:00
Brad Davis
3f2fdd1915
Expose dropped frames count to stats UI
2017-01-04 13:20:58 -08:00
Atlante45
56a25dfdee
Check setting value changed
2017-01-04 11:56:24 -08:00
Zach Fox
14def61eb8
More CR comments; 1 bug remaining re: sig slot
2017-01-03 17:32:47 -08:00
Anthony J. Thibault
3c2f9acd39
Hooked up EventBridge to TabletScriptingInterface.
2017-01-03 15:43:21 -08:00
Brad Hefta-Gaub
60d48bcd49
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-03 14:42:59 -08:00
Zach Pomerantz
01cf48807c
change Render.RenderForwardTask to Render.Forward
2017-01-03 14:47:48 -05:00
Zach Pomerantz
26cfc83e20
Merge branch 'master' into graphics/fetch-cull-sort
2017-01-03 14:04:39 -05:00
Anthony J. Thibault
00980366d6
Merge branch 'master' into tablet-ui
2017-01-03 09:45:23 -08:00
Brad Hefta-Gaub
84eca0159e
Merge branch 'master' of https://github.com/highfidelity/hifi into improveInterval
...
Conflicts:
tests/networking/src/ResourceTests.cpp
2016-12-29 16:42:52 -08:00
Brad Hefta-Gaub
0c22fcb5c4
better handling of timers
2016-12-29 16:41:14 -08:00
