Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-07 22:40:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
81621 commits 25 branches 28 tags 1.2 GiB
Commit graph

33695 commits

Author SHA1 Message Date
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
David Rowe
57649811d7 Update JSDoc of TabletProxy internal functions 2019-09-27 09:17:48 +12: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
David Rowe
8b2d9427bb Update description of the entities available to the Entities API 2019-09-26 10:54:12 +12: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
David Rowe
605d272392 Merge branch 'master' into DOC-111 2019-09-20 10:25:21 +12:00
David Rowe
9d9317c50d Miscellaneous fixes and typos 2019-09-20 10:19:45 +12: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
David Rowe
d5e08d19e3 Fix JSDoc for miscellaneous white space issues 2019-09-20 08:17:24 +12: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
David Rowe
dff37a71eb Fix JSDoc markup HTML issues 2019-09-17 16:26:09 +12: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
amerhifi
bdfb82c072 finishing up the wrapper code implementation. 2019-09-13 13:13:54 -07:00
Shannon Romano
79d845d127
Merge pull request #16190 from danteruiz/fix-html 
BUGZ-1398: HMD Tablet Apps blocked by Web access error
 2019-09-13 12:35:29 -07:00
amerhifi
4fb31ad479 rebuilding the lost file :(. also undoing the postbuild script changes that were part on my last test 2019-09-13 12:29:46 -07:00
amerhifi
cc11bd9552 created new AudioWrapper 2019-09-13 11:24:41 -07:00
danteruiz
8491a37923 fixing WebEntities html 2019-09-13 09:57:51 -07:00
Sam Gateau
f76b6da96e Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-13 09:34:59 -07:00
Shannon Romano
bb7813631d
Merge pull request #16183 from luiscuenca/allowLeaningWhileSeated 
BUGZ-1435: Re-enable head IK when seated on HMD
 2019-09-13 09:03:17 -07:00
MiladNazeri
b8e3873e96
Merge pull request #16182 from MiladNazeri/BUGZ-1452/entity-link-property-right-button-disable 
Bugz 1452/entity link property right button disable
 2019-09-13 08:08:29 -07:00
Andrew Meadows
bc119d6c85 don't expect final kinematic simulation update 2019-09-12 17:02:19 -07:00
Sam Gateau
802326d4da Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-12 17:01:37 -07:00
Sam Gateau
68b754fc0c Changes driven by the alpha mode 2019-09-12 17:01:16 -07:00
Shannon Romano
36bc538354
Merge pull request #16181 from SimonWalton-HiFi/connection-addr-change-logic 
BUGZ-1432: Fix logic for address-change to address already being used
builds failing, now android is failing for nothing related to this PR
 2019-09-12 15:54:55 -07:00
luiscuenca
3c043309be
Detect HMD mode properly from rig, in order to enable head IK 2019-09-12 14:03:17 -07:00
Maia Hansen
53aed1e6bf
Merge pull request #16171 from sabrina-shanman/bug_oven_draco 
(BUGZ-1446) Fix oven error when baking FBX mesh with no indices
 2019-09-12 12:37:49 -07:00
Simon Walton
2d68cfa5e7 Use unique_lock::unlock() instead of unique_lock::release() 
... which actually has the opposite effect
 2019-09-12 12:04:24 -07:00
sabrina-shanman
00f7b75f34 Fix draco errors being added to wrong part of list 2019-09-12 10:45:35 -07:00
David Rowe
7bbca94d43 Doc review 2019-09-12 14:41:43 +12:00
Sam Gateau
133a8b7d5e a bunch of changes to debug why... 2019-09-11 18:21:44 -07:00
Shannon Romano
fa8c959699
Merge pull request #16133 from ctrlaltdavid/DOC-59 
DOC-59: Assets JSDoc
 2019-09-11 17:19:45 -07:00
jennaingersoll
c439358626
Merge pull request #16180 from ctrlaltdavid/DOC-163 
DOC-163: Fix up Workload JSDoc stubs
 2019-09-11 17:16:09 -07:00
milad
e56d0066a3 Merge branch 'master' of github.com:highfidelity/hifi into BUGZ-1452/entity-link-property-right-button-disable 2019-09-11 17:08:39 -07:00
milad
12b980d99d about to test if this new right click disable is working 2019-09-11 17:08:35 -07:00
David Rowe
fad1296180 Fix up Workload JSDoc stubs 2019-09-12 11:02:10 +12:00
Simon Walton
639beee6cb Fix logic for reliable service address-change when new add already used 2019-09-11 15:21:49 -07:00
luiscuenca
7c7c3cd223
merge master 2019-09-11 14:07:19 -07:00
Shannon Romano
65d0bb1342
Merge pull request #15906 from kasenvr/kpi-v1-modkit-rc 
Kasen Plugin Infrastructure v½ Codename "Modkit Mini"
 2019-09-11 13:04:01 -07:00
luiscuenca
2f33e37eb6
Angles instead dot product and fix API 2019-09-10 18:10:02 -07:00
dante ruiz
b969a9b1e0 fix tablet html loading errors 2019-09-10 16:50:50 -07:00
sabrina-shanman
65d85138cc TIL that std::vector<bool> is a bit field 
https://howardhinnant.github.io/onvectorbool.html
 2019-09-10 16:31:30 -07:00
sabrina-shanman
384b7fd629 Fix FBXBaker failing when an unbaked mesh is empty 
Error early for all model bakers for draco errors
 2019-09-10 15:22:54 -07:00
Zach Fox
b39e527b5b DEV-555: Ensure 'href' entity property supports relative paths (coordinates and named paths) 2019-09-10 11:57:02 -07:00
sabrina-shanman
5171b660ae Give better error message when draco part of model baking fails 2019-09-09 17:32:27 -07:00
David Rowe
04203b1425 File JSDoc 2019-09-10 12:01:38 +12:00
Sam Gateau
a290723583 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-09 13:43:52 -07:00
Sam Gateau
3c34443f24 where possible (in OpenGLDisplayPLugin) remove the need for the eye specific function and keep it in the HMD display plugin for the case of the POinter drawcall 2019-09-09 13:43:32 -07:00
Sabrina Shanman
3c35433f86
Merge pull request #16159 from sabrina-shanman/oven_stall 
(BUGZ-143) Fix Oven not finishing when Re-bake originals checked
 2019-09-09 13:12:49 -07:00
Shannon Romano
826fb061a4
Merge pull request #16158 from luiscuenca/offsetRotationMMDFix 
BUGZ-1394: Fix avatars with rotation offsets
 2019-09-09 11:47:43 -07:00
Sam Gateau
760eac6f83 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-09 11:33:27 -07:00
Sam Gateau
3509a797a1 Avoiding to rely on the display plugin resource in the getHUDOperator to avoid a case of unallocated resource 2019-09-09 11:33:05 -07:00
sabrina-shanman
01b29c3aac Fix DomainBaker not finishing when Re-bake originals checked and 
.baked.fbx present
 2019-09-09 10:43:08 -07:00
Shannon Romano
e1dac580b6
Merge pull request #16121 from luiscuenca/audioPosesSyncFix 
BUGZ-1234: Mitigate the effect of audio noise on talking animations
 2019-09-09 10:37:07 -07:00
luiscuenca
94e1707ab9
Fix avatars with rotation offsets 2019-09-09 10:33:51 -07:00
sabrina-shanman
0a97f2535b Fix missing return on handling TextureBaker error 2019-09-06 17:46:59 -07:00
Andrew Meadows
7a5cb0d555 fix typo 2019-09-06 17:23:38 -07:00
Andrew Meadows
e97d3df637 bump version number 2019-09-06 17:23:38 -07:00
Andrew Meadows
e546ef23a8 don't bid for sim ownership of kinematic unless grabbed 2019-09-06 17:23:38 -07:00
Andrew Meadows
227b99859d fix api for checking EntityItem grab status 2019-09-06 17:23:38 -07:00
Andrew Meadows
580b6a3b2c small optimization: check before lock 2019-09-06 17:23:38 -07:00
luiscuenca
0e4e09acb5
Add blending 2019-09-06 14:30:10 -07:00
luiscuenca
189ddf39e2
Merge branch 'master' into addLookAtThirdCamera 2019-09-06 14:29:51 -07:00
Sam Gateau
9c14838443 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-06 12:41:11 -07:00
Anthony Thibault
2857086861
Merge pull request #16136 from hyperlogic/feature/3x3-blend 
Directional Blending Support
 2019-09-06 11:10:56 -07:00
Sam Gateau
bc0f719b71 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-06 10:58:35 -07:00
Sam Gateau
85c18f1033 Adding a clamp to 0 to the computed y coordinate while unpacking the normal map 2019-09-06 10:57:54 -07:00
Sam Gateau
acf51ad217
Merge pull request #16137 from jherico/fix/bugz-1398 
BUGZ-1398: Tablet access to local HTML
 2019-09-06 09:59:22 -07:00
Anthony J. Thibault
aa848df227 warning fixes 2019-09-05 17:43:07 -07:00
luiscuenca
ff8f2c5c16
Add new LookAt camera 2019-09-05 17:04:39 -07:00
Anthony J. Thibault
c35640f739 Warning fixes and small bug fix to anim stats 2019-09-05 14:54:19 -07:00
Brad Davis
0511f87bad BUGZ-1398: Tablet access to local HTML https://youtu.be/7EWQOeQf32U 2019-09-05 11:43:43 -07:00
Anthony J. Thibault
29de8a8d9f remove ajt comment 2019-09-05 11:11:10 -07:00
Anthony J. Thibault
b6f28a6732 Switch additive animation deltas from a pre multiply to a post multiply. 2019-09-05 11:09:03 -07:00
Anthony J. Thibault
92df5cccdc AnimBlendDirectional node 2019-09-05 11:09:02 -07:00
Anthony J. Thibault
6274ab4aa7 3x3 blend wip 2019-09-05 11:09:00 -07:00
Seth Alves
404b42c41e remove unneeded call to tellNeighborsToRecopyEdges 2019-09-05 08:04:09 -07:00
humbletim
271fac4bca Merge remote-tracking branch 'upstream/master' into kasenvr-kpi-v1-modkit-rc-merge 2019-09-05 09:46:21 -04:00
HifiExperiments
97b9179144 merge with master 2019-09-05 00:46:56 -07:00
Seth Alves
d86944baf4 rework polyvox state-machine 2019-09-04 20:14:11 -07:00
David Rowe
49ab504226 Make placement of callback JSDoc consistent 2019-09-05 12:23:56 +12:00
David Rowe
06ebba554e Doc review 2019-09-05 12:23:12 +12:00
Shannon Romano
96f6793a87
Merge pull request #16118 from hyperlogic/feature/aim-offset-blend 
Additive animation support
 2019-09-04 16:55:50 -07:00
jennaingersoll
afad148894
Merge pull request #16134 from ctrlaltdavid/DOC-134 
DOC-134: Fix some miscellaneous JSDoc issues
 2019-09-04 15:21:14 -07:00
David Rowe
672e61c49d Fix typo in Entities.EntityProperties-Material example 2019-09-04 21:06:49 +12:00
David Rowe
6474705ca2 Reformat "supported script types" in Entities and Scripts signals 2019-09-04 21:06:30 +12:00
David Rowe
4e274347b4 Fix typo in Entities.getAbsoluteJointRotationInObjectFrame() JSDoc 2019-09-04 21:05:36 +12:00
David Rowe
cf01d9f1af Script.require() JSDoc fixes 2019-09-04 21:04:03 +12:00
David Rowe
f384b79bf5 Merge branch 'master' into DOC-59 2019-09-04 15:47:23 +12:00
David Rowe
9457aed631 Tidying and polishing Assets JSDoc 2019-09-04 15:43:18 +12:00
David Rowe
8820d1d76b Assets API cache methods 2019-09-04 13:48:06 +12:00
Sam Gateau
df0eb901a2 REverting the change in the jittering sequence length 2019-09-03 17:01:03 -07:00
Sam Gateau
03c5dfad3d propagating the Bloom on off correctly and fixing the problem where Luci prevents from seeing the zone and finally, update the luci.js with the newer version 2019-09-03 16:28:32 -07:00
Sam Gateau
cda2943b9a Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-03 12:01:12 -07:00
Shannon Romano
5f4b2a0080
Merge pull request #16109 from sethalves/fix-saccade-override 
apply fake eye saccades if eye joints aren't overridden
 2019-09-03 11:34:02 -07:00
jennaingersoll
037ad36262
Merge pull request #16103 from ctrlaltdavid/DOC-64 
DOC-64: ScriptDiscoveryService API JSDoc
 2019-08-30 22:35:39 -07:00
Bradley Austin Davis
8e3b337a6e
Merge pull request #16120 from jherico/fix/bugz-1365 
BUGZ-1365: prevent server scripts from accessing local files in HTML controls
 2019-08-30 13:10:09 -07:00
Bradley Austin Davis
29424ca971
Merge pull request #16113 from jherico/fix/bugz-1363 
BUGZ-1363: crash when checking for web content restrictions
 2019-08-30 13:09:49 -07:00
luiscuenca
3da2a6038d
Const ajustments 2019-08-29 16:27:54 -07:00
Anthony J. Thibault
c814176d6a Fix initialization order of members warning 2019-08-29 16:16:19 -07:00
Howard Stearns
c4c29dd093
Merge pull request #16116 from SimonWalton-HiFi/efficient-remaining-token-time 
BUGZ-1274: Use UTC with QDateTime rather than local time in AccountManager
 2019-08-29 15:20:30 -07:00
luiscuenca
265b6f57a1
Try to mitigate the effect of background mic noise when simulating talking 2019-08-29 15:19:17 -07:00
Brad Davis
428a58710d BUGZ-1365: Ensure that by default web views can't access local content 2019-08-29 13:44:49 -07:00
Brad Davis
36be00bf97 Fix android build again 2019-08-29 10:25:57 -07:00
Anthony J. Thibault
52ed0bcb71 additive blending work 2019-08-29 10:17:51 -07:00
Shannon Romano
b4d0c87654
Merge pull request #16117 from ctrlaltdavid/BUGZ-1316 
BUGZ-1316: Fix crashes in Assets API
 2019-08-29 09:07:37 -07:00
Brad Davis
af22ab55bb PR feedback 2019-08-29 08:46:46 -07:00
David Rowe
fb818c0726 Fix crash in Assets.setBakingEnabled() when callback undefined 2019-08-29 13:33:22 +12:00
David Rowe
746f97a0e0 Fix crash in Assets.getAsset() when callback undefined 2019-08-29 13:33:04 +12:00
Anthony J. Thibault
16a20a5ead AddAbsolute now works! added blendType to AnimClip 2019-08-28 18:19:35 -07:00
Simon Walton
784903fe33 Use UTC with QDateTime rather than local time 2019-08-28 17:57:09 -07:00
Shannon Romano
f63fc15d4f
Merge pull request #16115 from sabrina-shanman/crash_shutdown_running-script 
Attempt to fix crash from script running too late
 2019-08-28 15:54:10 -07:00
Shannon Romano
e07e8abc0d
Merge pull request #16106 from AndrewMeadows/less-MyAvatar-mesh-tuneling-2 
BUGZ-1325 prevent MyAvatar from pushing through mesh barrier
 2019-08-28 15:51:42 -07:00
sabrina-shanman
437f6b4096 Only say we're throwing a script error when we mean it 2019-08-28 14:58:57 -07:00
David Rowe
d52bb66048 Add missing JSDoc 2019-08-29 09:38:43 +12:00
sabrina-shanman
67a06b3a74 Attempt to fix crash from script running too late 2019-08-28 14:28:12 -07:00
Anthony J. Thibault
adda7774d3 WIP checkpoint addAbsolute still broken 2019-08-28 14:08:21 -07:00
Andrew Meadows
b7ae55ca3e smaller CCD proxy for MyAvatar 2019-08-28 11:33:51 -07:00
Brad Davis
5a6e2e5daf Add caching to the restricted value 2019-08-28 10:13:32 -07:00
Brad Davis
954773124a BUGZ-1363: crash when checking for web content restrictions 2019-08-28 09:56:45 -07:00
Andrew Meadows
1beafbdd35 comment cleanup and final tuning 2019-08-28 09:48:15 -07:00
Shannon Romano
e4bcbf60ed
Merge pull request #16110 from ctrlaltdavid/BUGZ-1357 
BUGZ-1357: Fix crashes in ScriptDiscoveryService API
 2019-08-28 09:10:29 -07:00
David Rowe
8c735ed6ae Fix ScriptDiscoveryService.scriptsModel.parent() crash for invalid index 2019-08-28 16:32:52 +12:00
David Rowe
757a4f908b Fix ScriptDiscoveryService.scriptsModel.data() crash for invalid row 
Also fixes unexpected data for invalid column > 1.
 2019-08-28 16:32:22 +12:00
Andrew Meadows
6be3750b38 use collision brake feedback to prevent tunneling 2019-08-27 20:28:56 -07:00
Seth Alves
f331b76c51 apply fake eye saccades if eye joints aren't overridden (rather than if HasProceduralEyeFaceMovement is true) 2019-08-27 16:59:31 -07:00
Seth Alves
1979e1dbc7 apply fake eye saccades if eye joints aren't overridden (rather than if HasProceduralEyeFaceMovement is true) 2019-08-27 16:47:01 -07:00
Andrew Meadows
1314430f04 more checks to prevent thrusting through mesh 2019-08-27 13:51:54 -07:00
Shannon Romano
55238200f1
Merge pull request #16104 from luiscuenca/fixRandomAnim 
DEV-327: Prevent AnimRandomSwitch from repeating same animation twice in a row.
 2019-08-27 13:00:39 -07:00
luiscuenca
55b54b02a0
Restate evaluation count on AnimContext 2019-08-27 10:59:03 -07:00
luiscuenca
acbeb326a7
Set activation when switching random states 2019-08-27 10:57:22 -07:00
luiscuenca
7f1f6dba31
Implement activation on nodes and use it to trigger random states 2019-08-27 10:25:35 -07:00
Anthony J. Thibault
ed3ba876a8 AddRelative blending support (Absolute is still not working) 2019-08-26 17:02:15 -07:00
Bradley Austin Davis
07ee9e901f
Merge pull request #16099 from jherico/fix/wake_crash 
BUGZ-1264: Support platform independent sleep/wake notifications
 2019-08-26 16:20:50 -07:00
Sabrina Shanman
0f5ef9ecb3
Merge pull request #16097 from AndrewMeadows/less-MyAvatar-mesh-tunelling 
BUGZ-1325: prevent MyAvatar from tunneling through mesh at high speeds
 2019-08-26 16:16:10 -07:00
David Rowe
3e795d9b99 Typos and improvements 2019-08-27 10:03:26 +12:00
David Rowe
c19c1c9a5d Scripts API JSDoc fixes 2019-08-27 09:24:01 +12:00
David Rowe
fff2a15960 ScriptsModel and ScriptsModelFilter classes' JSDoc 2019-08-27 09:24:01 +12:00
David Rowe
e1e74a2c34 ScriptDiscoveryService API JSDoc 2019-08-27 09:24:00 +12:00
Shannon Romano
ccfd3e2fb1
Merge pull request #16101 from roxanneskelly/bugz1276 
BUGZ-1276 - crash in soloNodeOfType
 2019-08-26 14:07:35 -07:00
Roxanne Skelly
82522b04ab missing space 2019-08-26 13:20:56 -07:00
Roxanne Skelly
b4679aa44a BUGZ-1276 - crash in soloNodeOfType 
This is suspected to be a race condition during shutdown
where a static destructor may be called before the ScriptEngine
thread stops running.  On OSX there is the possability of this.
 2019-08-26 13:05:19 -07:00
Shannon Romano
7466c3f2ca
Merge pull request #16095 from SimonWalton-HiFi/change-of-local-interface 
BUGZ-1317: Improved handling of local-interface addresses
 2019-08-26 11:57:57 -07:00
Brad Davis
e1bf3f2540 PR feedback 2019-08-26 11:51:33 -07:00
Brad Davis
dfd78a2662 Support platform independent sleep/wake notifications 2019-08-24 13:16:48 -07:00
Andrew Meadows
8135021b25 watch for tunneling events and interfere before stuck 2019-08-23 17:54:52 -07:00
Clement
a607984d4e Fix debug builds 2019-08-23 17:04:54 -07:00
Simon Walton
d9558e35c3 Fix typo in last commit; remove useless call of getGuessedLocalAddress; logging tweak 2019-08-23 13:19:31 -07:00
Andrew Meadows
b33e5a60c2
Merge pull request #16086 from AndrewMeadows/opaque-polylines 
BUGZ-1170: improved render bounding box for PolyLines; use opaque pipeline when possible
 2019-08-23 11:41:19 -07:00
Shannon Romano
74363a4382
Merge pull request #16065 from luiscuenca/fixDuplicatedJoint 
BUGZ-186: Make sure joint names are unique
 2019-08-23 10:55:58 -07:00
Simon Walton
c262b7a3b8 Merge branch 'master' into change-of-local-interface 2019-08-23 09:36:04 -07:00
Anthony J. Thibault
f1afc9e873 Bug fix & rename isRelative to relativeFlag 2019-08-23 08:46:14 -07:00
luiscuenca
07d17343bf
fix warnigns 2019-08-23 07:21:19 -07:00
Simon Walton
6a9e299981 Prefer non-link-local interface addresses; don't change port on initial address change from TCP probe 2019-08-22 17:34:41 -07:00
Shannon Romano
4d71891763
Merge pull request #16072 from luiscuenca/improveSphereCollapsing 
BUGZ-1156: Improve sphere collapsing mode
 2019-08-22 16:10:53 -07:00
luiscuenca
4b1b61ae5b
Keep new offset rotation method and resolve duplicates at the end 2019-08-22 13:16:32 -07:00
Zach Fox
330b8ceb91 Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-22 10:24:00 -07:00
Andrew Meadows
8957cc5b2b render opaque PolyLines with opaque pipepline 2019-08-22 08:13:11 -07:00
Andrew Meadows
81eaf157a6 tighter bounding box when rendering PolyLines 2019-08-22 08:13:11 -07:00
Anthony Thibault
001e4bc952 AnimClip now supports relative animations. 
Relative animations are animations that are rotation deltas from some base reference pose.
They are calculated by multiplying each frame of each joint the inverse of that joints in the base reference pose.
It is intended for use with additive blending.

Added the following fields to AnimClip node.

* isRelative (boolean)
* baseURL (string)
* baseFrame (int)
 2019-08-21 16:11:10 -07:00
Shannon Romano
3b3bce059b
Merge pull request #16080 from roxanneskelly/bugz1275 
BUGZ-1275 Additional Grapics API info was added to the system info, which overflowed the amount of info that could be sent in a packet.
 2019-08-21 15:34:31 -07:00
David Rowe
2ad1d7a2a2 Fix typos 2019-08-22 10:27:17 +12:00