Brad Davis
|
8724106685
|
Trying to fix mac build:
|
2019-09-27 14:55:42 -07:00 |
|
Sam Gateau
|
ecd940e0e6
|
Addressing warnings
|
2019-09-27 14:01:00 -07:00 |
|
Howard Stearns
|
f513b65e9d
|
Merge pull request #16256 from SimonWalton-HiFi/supress-repeated-socket-logging
BUGZ-1543: Suppress repeated socket logging
|
2019-09-27 12:45:17 -07:00 |
|
Sam Gateau
|
57f8095506
|
Pass 4 on cleaning up that pr, put the SortFIlterModel.qml in the new skit/qml lib, setting the opacityMappMode correctly from script
|
2019-09-27 12:00:45 -07:00 |
|
Sam Gateau
|
25bcc31b72
|
Merge branch 'master' of github.com:highfidelity/hifi into yellow
|
2019-09-27 09:24:25 -07:00 |
|
Brad Davis
|
403499bf32
|
Cleaning up android build warnings
|
2019-09-27 09:19:52 -07:00 |
|
Sam Gateau
|
4d94cbe0d8
|
Pass 3rd of the hope to clean it up...
|
2019-09-27 00:29:10 -07:00 |
|
Sam Gateau
|
24cc302a8b
|
second pass of cleaning on the code to make it ready for merge
|
2019-09-26 16:56:00 -07:00 |
|
Simon Walton
|
93a1cbdcf9
|
Use direct initialization instead of copy initialization for atomics
|
2019-09-26 16:45:29 -07:00 |
|
Andrew Meadows
|
f3aa534327
|
Merge pull request #16239 from AndrewMeadows/cleanup-mortal-entities
BUGZ-1510: don't forget to cleanup expired mortal entities
|
2019-09-26 16:20:27 -07:00 |
|
Simon Walton
|
f17a1c17f3
|
Only print Qt event-queue size on change of error code
|
2019-09-26 15:46:11 -07:00 |
|
Simon Walton
|
85c9f4d95f
|
Use the FCDEBUG mechanism to throttle udt::Socket log-spam
|
2019-09-26 12:10:59 -07:00 |
|
Sam Gateau
|
675dbc3f7f
|
Merge branch 'master' of github.com:highfidelity/hifi into yellow
|
2019-09-26 12:06:09 -07:00 |
|
Sam Gateau
|
9d999baab2
|
FIrst pass to clean up before pushing a pr:
|
2019-09-26 11:59:01 -07:00 |
|
Simon Walton
|
bbf43050b1
|
Merge pull request #16244 from SimonWalton-HiFi/connection-class-ignored-unused
BUGZ-1503: Don't move unused Connection class upon address change
|
2019-09-26 11:42:50 -07:00 |
|
Sam Gateau
|
ba11c3e702
|
Merge branch 'master' of github.com:highfidelity/hifi into yellow
|
2019-09-25 17:54:21 -07:00 |
|
Sam Gateau
|
dc40c530a3
|
INstrumenting the code more...
|
2019-09-25 17:53:59 -07:00 |
|
Amer
|
1e94a82ee6
|
Merge pull request #16196 from amerhifi/dev469
DEV-469: Default Audio device
|
2019-09-25 16:28:00 -07:00 |
|
Atlante45
|
ff3f26eeae
|
Limit the amount of account settings pull retries
|
2019-09-25 14:55:44 -07:00 |
|
amer cerkic
|
73f14d812f
|
addressing cr comments
|
2019-09-25 13:22:50 -07:00 |
|
Simon Walton
|
6ccfc37f27
|
Merge remote-tracking branch 'upstream/master' into connection-class-ignored-unused
|
2019-09-25 13:06:32 -07:00 |
|
Brad Hefta-Gaub
|
06c7a92c27
|
Merge pull request #16243 from Atlante45/fix/account-settings
DEV-648: Add flag for account settings feature
|
2019-09-25 11:20:14 -07:00 |
|
Brad Hefta-Gaub
|
068fb0e177
|
Merge pull request #16240 from ctrlaltdavid/BUGZ-577
BUGZ-577: Implement Recording.setPlayerVolume()
|
2019-09-25 10:31:57 -07:00 |
|
Simon Walton
|
6d7f711990
|
Remove typo that somehow got into a comment
|
2019-09-25 09:33:49 -07:00 |
|
David Rowe
|
16c33ebbec
|
Clarify frustum property values used by Entities.findEntitiesInFrustum()
|
2019-09-25 19:29:20 +12:00 |
|
Sam Gateau
|
0d9cd69d94
|
SImplifying Page.js, and adding a REsourceInspector
|
2019-09-24 18:10:57 -07:00 |
|
Clement
|
5067729c52
|
Add flag for account settings feature
|
2019-09-24 17:40:34 -07:00 |
|
Clement
|
96b58756b1
|
Add flag for account settings feature
|
2019-09-24 16:50:10 -07:00 |
|
Simon Walton
|
4f11e46b5e
|
Don't move Connection class to changed address until it's used
|
2019-09-24 16:39:59 -07:00 |
|
amer cerkic
|
9daf670678
|
Merge branch 'master' into dev469
|
2019-09-24 15:38:07 -07:00 |
|
Andrew Meadows
|
50f0c90519
|
don't forget to cleanup expired mortal entities
|
2019-09-24 14:00:21 -07:00 |
|
David Rowe
|
2fe24b39db
|
Code review
|
2019-09-25 07:50:56 +12:00 |
|
Sam Gateau
|
69ccc47bda
|
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
|
2019-09-23 18:59:20 -07:00 |
|
David Rowe
|
b174e002a9
|
Implement Recording.setPlayerVolume()
|
2019-09-24 12:52:51 +12:00 |
|
amerhifi
|
fbc68e7f69
|
removed clang format issue, removed old attempt at getting defaults to startup correctly
|
2019-09-23 15:07:04 -07:00 |
|
Shannon Romano
|
48c55d05c7
|
Merge pull request #16210 from Atlante45/feat/account-settings
DEV-544: Add account settings to the AccountManager
|
2019-09-23 13:00:23 -07:00 |
|
Sam Gateau
|
3c2809b9ed
|
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
|
2019-09-21 08:52:13 -07:00 |
|
Sam Gateau
|
4480d56433
|
Rendering just the overlay layer and improving the resoruceCache inspector to sort
|
2019-09-20 19:00:03 -07:00 |
|
Clement
|
1924dad51b
|
CR changes
|
2019-09-20 13:30:08 -07:00 |
|
Shannon Romano
|
bd488f0196
|
Merge pull request #16144 from luiscuenca/addLookAtThirdCamera
DEV-391: Keyboard Input Controls Camera Not Avatar Orientation
|
2019-09-20 13:03:03 -07:00 |
|
Anthony Thibault
|
fecef584c9
|
Merge pull request #16226 from danteruiz/fix-snap-html-issue
BUGZ-1522: Snap app on tablet is blocked when saving/canceling out of its Settings page
|
2019-09-20 12:39:01 -07:00 |
|
Shannon Romano
|
22dffa5ce8
|
Merge pull request #16217 from Atlante45/fix/flush-timer
BUGZ-489: Make sure the flush timer is not spawned too early
|
2019-09-20 12:35:39 -07:00 |
|
amer cerkic
|
64f14dd6ba
|
fixing selection issues
|
2019-09-20 11:32:57 -07:00 |
|
Sabrina Shanman
|
460eaf523a
|
Merge pull request #16202 from AndrewMeadows/trace-stats-for-workload
DEV-594: add trace stats for workload region sizes
|
2019-09-20 10:37:45 -07:00 |
|
dante ruiz
|
fe2a4c3600
|
fix fix-snap-html-issue
|
2019-09-19 18:20:08 -07:00 |
|
luiscuenca
|
365aa1bf03
|
Add jdoc to camera modes and fix variable namings
|
2019-09-19 17:30:01 -07:00 |
|
Sam Gateau
|
ee5de175eb
|
Better monitoring of the resource loading in flights
|
2019-09-19 16:56:55 -07:00 |
|
amerhifi
|
7fbce46e30
|
fixing android build, I removed a function thinking it was unused. also added android ifdef guards for name since default does to exist on that device. Simplified getting a default device
|
2019-09-19 15:57:38 -07:00 |
|
amerhifi
|
8d7c28fe83
|
fixed audio switching issues. removed risky access to properties. adressing comments
|
2019-09-19 14:19:43 -07:00 |
|
Clement
|
282aa70db3
|
Sync settings on logout/shutdown
|
2019-09-19 13:45:34 -07:00 |
|
luiscuenca
|
279e25ca70
|
Merge master
|
2019-09-19 13:21:49 -07:00 |
|
Sam Gateau
|
6fe2b7a3d1
|
Merge pull request #16218 from AndrewMeadows/fix-avatar-entities-in-void
BUGZ-1457: scripted edits of avatar entites should succeed when in the void
|
2019-09-19 13:15:39 -07:00 |
|
Zach Fox
|
80414a6f1c
|
DEV-613: Remove unnecessary audio injector logging
|
2019-09-19 11:17:39 -07:00 |
|
luiscuenca
|
6d98537a20
|
Clean up code and refactor avatar-animation.json
|
2019-09-19 10:45:20 -07:00 |
|
amerhifi
|
9cc3b7a5c7
|
addressing pr comments
|
2019-09-19 10:08:30 -07:00 |
|
Sam Gateau
|
6154611b05
|
Merge branch 'master' of github.com:highfidelity/hifi into yellow
|
2019-09-19 09:10:38 -07:00 |
|
Shannon Romano
|
a5fdf5bb40
|
Merge pull request #16214 from hyperlogic/bug-fix/additive-blend-scale-fix
Fix additive blending on avatars with non identity scale.
|
2019-09-19 09:04:28 -07:00 |
|
Sam Gateau
|
819c942056
|
Merge branch 'master' of github.com:highfidelity/hifi into yellow
|
2019-09-19 09:01:19 -07:00 |
|
Andrew Meadows
|
ab419ddd23
|
beware null sessionID
|
2019-09-19 08:25:01 -07:00 |
|
Sam Gateau
|
a87db2636c
|
SOme stuff workbetter
|
2019-09-18 18:25:42 -07:00 |
|
amer cerkic
|
be2fff13d2
|
fixed wrong device in if block
|
2019-09-18 17:10:12 -07:00 |
|
Clement
|
527b27b32d
|
Make sure the flush timer is not spawned too early
|
2019-09-18 17:05:05 -07:00 |
|
Shannon Romano
|
e7001c3f1b
|
Merge pull request #16157 from sethalves/vive-pro-groundwork
DEV-605: Vive pro groundwork
|
2019-09-18 16:36:12 -07:00 |
|
Anthony J. Thibault
|
41978aa4a4
|
Fix additive blending on avatars with non identity scale.
Some avatars that have non 1.0 scale values were incorrectly being scaled during additive blends, this fixes that.
|
2019-09-18 14:42:57 -07:00 |
|
amer cerkic
|
ecca898db8
|
fixed some more vs clang reformatting
|
2019-09-18 14:39:55 -07:00 |
|
amer cerkic
|
d4dc06d2e7
|
fixed issue with null device on load.
|
2019-09-18 12:44:03 -07:00 |
|
Clement
|
86196cfd62
|
Add account settings to the AccountManager
|
2019-09-17 18:48:14 -07:00 |
|
Sam Gateau
|
c0660329a3
|
Exposing the REsource Caches through a bit of ui, adding MaterialCache to the family
|
2019-09-17 18:06:08 -07:00 |
|
luiscuenca
|
1054e8fcde
|
Selfie camera and updated camera menus
|
2019-09-17 17:15:16 -07:00 |
|
amer cerkic
|
46b9496965
|
fixing mac build error
|
2019-09-17 16:02:20 -07:00 |
|
Andrew Meadows
|
434f5ff300
|
fix comment
|
2019-09-17 15:57:20 -07:00 |
|
Andrew Meadows
|
5ad0dd20ac
|
update QueryAACube of unowned moving physical entities
|
2019-09-17 15:43:53 -07:00 |
|
Andrew Meadows
|
54d3ceda28
|
update QueryAACube of kinematic things with known parentage
|
2019-09-17 15:31:16 -07:00 |
|
Andrew Meadows
|
1119b9f29c
|
update local QueryAACube on deactivation
|
2019-09-17 15:05:37 -07:00 |
|
amer cerkic
|
c1854d3438
|
fixing gnu warnings and removing debug output
|
2019-09-17 14:42:35 -07:00 |
|
amer cerkic
|
7a9020a429
|
renamed file to match class
|
2019-09-17 14:16:25 -07:00 |
|
amer cerkic
|
a777757c48
|
fixed android build
|
2019-09-17 12:46:38 -07:00 |
|
amer cerkic
|
05a8c7853c
|
added file info. moved pragma
|
2019-09-17 10:03:54 -07:00 |
|
Seth Alves
|
8875453585
|
remove old/unused eyetracker code
|
2019-09-17 09:43:32 -07:00 |
|
Seth Alves
|
a288c0a52d
|
remove old/unused eyetracker code.
|
2019-09-17 09:43:21 -07:00 |
|
Seth Alves
|
5c570d28a0
|
remove old/unused eyetracker code
|
2019-09-17 09:43:20 -07:00 |
|
Seth Alves
|
943348ba51
|
input action channels for eyes and eyelids and fingers. connect eyelid input actions to blendshapes.
|
2019-09-17 09:43:20 -07:00 |
|
Seth Alves
|
7fa24efca0
|
add a way to query Rig to see if a joint has been overridden by a script
|
2019-09-17 09:43:20 -07:00 |
|
Seth Alves
|
b64ff70d6c
|
add show-lookat-targets DebugDraw. remove old/unused eyetracker code.
|
2019-09-17 09:43:19 -07:00 |
|
Seth Alves
|
954aeb5e25
|
AxisValue action channels now have a 'valid' flag, like Poses do
|
2019-09-17 09:43:19 -07:00 |
|
Seth Alves
|
73e6be9c37
|
allow drawing DebugDraw spheres with a specific size
|
2019-09-17 09:43:19 -07:00 |
|
Seth Alves
|
64e4ff88e6
|
findClosestApproachOfLines will find where two lines get the closest to each other
|
2019-09-17 09:43:18 -07:00 |
|
amerhifi
|
46f654114a
|
for real, changing location
|
2019-09-17 08:03:51 -07:00 |
|
amerhifi
|
065df442f3
|
changing work location
|
2019-09-17 08:01:05 -07:00 |
|
amerhifi
|
66725f5f1b
|
working on swapping default devices on system change
|
2019-09-17 07:50:22 -07:00 |
|
Sam Gateau
|
3d199ff444
|
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
|
2019-09-16 21:34:56 -07:00 |
|
Sam Gateau
|
18226e64f8
|
Add a read lock where we think it s needed and banging my head on the problem
|
2019-09-16 18:06:43 -07:00 |
|
Andrew Meadows
|
f2534078a9
|
add trace stats for workload region sizes
|
2019-09-16 15:37:46 -07:00 |
|
amerhifi
|
e689531410
|
added unique identifier to device for comparison. Because a default device had a different name, but same underlying device. So comparing with device name is not necessarily the same device. Possibly fixed select issue with multiple devices same name
|
2019-09-16 15:31:44 -07:00 |
|
amerhifi
|
92d1f7bdcb
|
removed clang formatting issues :"
|
2019-09-16 13:09:14 -07:00 |
|
amerhifi
|
aa6cf466d9
|
fixing jenkins warning. Added pseudo device and fixed issues with names
|
2019-09-16 11:52:04 -07:00 |
|
amerhifi
|
68cd8cc8a6
|
getting wrapper to correctly detect default and fixed clang formatting changes by vs19
|
2019-09-16 10:32:22 -07:00 |
|
Sam Gateau
|
3ec812d5c3
|
Cleaner way maybe
|
2019-09-13 18:45:16 -07:00 |
|
amerhifi
|
0de7628d48
|
fix typo
|
2019-09-13 13:19:32 -07:00 |
|
Maia Hansen
|
9811f54c94
|
Merge pull request #16189 from AndrewMeadows/ess-with-simulation-fallout-001
BUGZ-1459: don't rely on final simulation update for kinematic entities
|
2019-09-13 13:16:05 -07:00 |
|