Stephen Birarda
956cc411d5
Merge branch 'RC66.1' of github.com:highfidelity/hifi into sixty-six-one-mergeback
2018-04-25 14:33:23 -07:00
MiladNazeri
0f87e53902
Merge pull request #12963 from MiladNazeri/docs/DocsToJSDocsUpdate
...
Docs/docs to js docs update
2018-04-25 12:26:19 -07:00
John Conklin II
f04200a620
Merge pull request #12976 from ctrlaltdavid/21856
...
Docs to JSDoc
2018-04-25 11:36:34 -07:00
Bradley Austin Davis
ea0ef20416
Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently"
2018-04-25 09:43:20 -07:00
milad nazeri
4c736b2d62
Fixed defaults
2018-04-24 21:38:48 -07:00
David Rowe
cae9447ac5
Doc review
2018-04-25 15:09:47 +12:00
luiscuenca
165c3214a7
Avatar Scripts
2018-04-24 18:43:53 -07:00
samcake
f2c76abafa
Apply the noAA /popJittering on the WebOverlay
2018-04-24 14:18:44 -07:00
Brad Hefta-Gaub
497c3fac4d
Merge pull request #12971 from Atlante45/fix/crashes-hotfix
...
Add memory corruption crash handler
2018-04-24 14:01:09 -07:00
Dante Ruiz
29fce488e4
make some changes
2018-04-24 14:00:52 -07:00
Dante Ruiz
b2925c5843
fixing attachments not being visible when coming out of first person
2018-04-24 13:32:30 -07:00
milad nazeri
23d07fa292
fixed spacing issue
2018-04-24 13:14:55 -07:00
Clement
0804abcca6
Heap corruption crashes CR
2018-04-24 12:47:13 -07:00
Sam Gateau
da154d3e00
Merge pull request #12969 from jherico/fix/web_crash
...
Attempt to shutdown web surfaces more consistently
2018-04-24 10:15:25 -07:00
Brad Davis
a144de54e7
Attempt to shutdown web surfaces more consistently
2018-04-24 10:06:20 -07:00
milad nazeri
1121fe8da0
fix tabs
2018-04-23 21:47:53 -07:00
David Rowe
98f43b6a70
Interim JSDoc for MyAvatar - stubs for remainder
2018-04-24 10:47:33 +12:00
Brad Davis
861200db27
Attempt to shutdown web surfaces more consistently
2018-04-23 14:32:38 -07:00
David Rowe
719062dd9f
Interim JSDoc for MyAvatar - first pass
2018-04-24 09:10:59 +12:00
Atlante45
f2c471558c
CR
2018-04-23 13:14:21 -07:00
Atlante45
bc251115ed
Add special handler for heap corruption
2018-04-23 13:14:21 -07:00
Clement
fb496156ce
Fix threaded force crashes
2018-04-23 13:14:21 -07:00
SamGondelman
1deb38f06d
fix copy error
2018-04-23 12:05:30 -07:00
Gabriel Calero
ccb5e1e06c
Commenting out display plugin activation/desactivation
2018-04-23 15:29:51 -03:00
Seth Alves
1dbcbbcced
cleanups
2018-04-23 11:05:06 -07:00
Gabriel Calero
001cd5e937
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-04-23 14:25:26 -03:00
Sam Gateau
7842ee8eac
Merge pull request #12962 from SamGondelman/menu
...
Android: Hide menu and fix shader compilation
2018-04-23 09:51:20 -07:00
milad nazeri
4ac06fe99f
Updating previous jsdocs
2018-04-22 22:22:33 -07:00
David Rowe
941e9360dd
JSDoc fixes
2018-04-23 16:09:56 +12:00
David Rowe
497cb4dab6
Interim JSDoc for Selection
2018-04-23 13:53:35 +12:00
David Rowe
96ddeb4e99
Interim JSDoc for SpeechRecognizer
2018-04-23 11:37:27 +12:00
milad nazeri
e9b9c05b5d
removed cruft
2018-04-22 08:51:47 -07:00
David Rowe
34d0a892a0
Point to example using Hardware.Application item
2018-04-21 15:01:46 +12:00
David Rowe
748052614f
Doc review
2018-04-21 12:45:00 +12:00
SamGondelman
d59f368ad6
hide menu, fix shaders
2018-04-20 17:38:38 -07:00
Seth Alves
6fc02638d7
control verbose logging with a menu-item in developer menu
2018-04-20 16:08:57 -07:00
Seth Alves
bec39369f7
remove some uncatagorized logging, suppress some categories by default
2018-04-20 16:08:57 -07:00
David Rowe
7087abd201
Merge branch 'master' into 21815
2018-04-21 10:49:56 +12:00
John Conklin II
39ad8be1b8
Merge pull request #12743 from SimonWalton-HiFi/short-id
...
Use 16-bit local IDs for Nodes in NL packets
2018-04-20 15:28:18 -07:00
John Conklin II
4705472960
Merge pull request #12889 from Atlante45/fix/threaded-crashes
...
Fix threaded force crashes
2018-04-20 13:20:40 -07:00
Seth Alves
c20346ca53
Merge pull request #12937 from SamGondelman/startup
...
Make Audio.cpp threadsafe
2018-04-20 11:36:08 -07:00
Simon Walton
9f9a68188d
Merge remote-tracking branch 'upstream/master' into short-id
2018-04-20 11:10:21 -07:00
Seth Alves
512b1911eb
Merge pull request #12858 from ctrlaltdavid/21836
...
Update location.hostname JSDoc per serverless domains
2018-04-20 10:27:09 -07:00
SamGondelman
3b4b43cf66
try to fix audio crash on startup
2018-04-20 10:23:47 -07:00
Ken Cooke
a9c5edcb2f
Merge pull request #12942 from kencooke/audio-devices-crfix
...
Minor changes to meet coding standard
2018-04-20 08:20:32 -07:00
Gabriel Calero
adfbaac18f
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-04-19 19:40:00 -03:00
David Rowe
08defea755
Merge branch 'master' into 21836
2018-04-20 09:20:56 +12:00
milad
42471c539b
initial fixes from ctralt david's comments
2018-04-19 13:40:57 -07:00
Gabriel Calero
f2184bf456
Handle android back button. Remove unused resources. Fix compilation errors.
2018-04-19 17:31:25 -03:00
Sam Gateau
1e086332cc
Merge pull request #12911 from jherico/feature/splash
...
Pre-requisite changes for splash screen rendering
2018-04-19 09:19:05 -07:00
Gabriel Calero
c8fe45eb8f
Remove debug statements and unused code. Put JNI code in a separated file.
2018-04-19 11:41:59 -03:00
Ken Cooke
764aa00069
Coding standard fixes
2018-04-19 07:33:14 -07:00
milad
364d193499
audio added
2018-04-18 21:04:57 -07:00
milad
3f129bda13
More done on audio
2018-04-18 20:04:41 -07:00
Stephen Birarda
c4ad93bafb
Merge pull request #12782 from SimonWalton-HiFi/qregexp
...
Replace LogHandler repeated regex scheme with assigned ID tracking scheme
2018-04-18 17:28:48 -07:00
Gabriel Calero
472cc1b29a
Fix code spacing
2018-04-18 16:44:49 -03:00
John Conklin II
710bfb894a
Merge pull request #12907 from AndrewMeadows/more-correct-stats-002
...
more correct stats names
2018-04-18 10:50:38 -07:00
John Conklin II
005b6a6b1f
Merge pull request #12893 from ctrlaltdavid/21843
...
Fix overlay toggling
2018-04-18 10:49:05 -07:00
Atlante45
7e6d45ead7
CR
2018-04-17 16:25:07 -07:00
Stephen Birarda
95c172f418
Merge branch 'stable' of github.com:highfidelity/hifi into merge-back-stable-66
2018-04-17 15:34:46 -07:00
Zach Fox
3b8e52ea41
Merge pull request #12862 from zfox23/discovery_April2018
...
Discovery: April 2018 (Huge PR; see description)
2018-04-17 15:11:50 -07:00
Atlante45
a626e9f6f3
Add special handler for heap corruption
2018-04-17 15:09:10 -07:00
Brad Davis
d478204722
Working on splash rendering
2018-04-17 14:17:41 -07:00
David Rowe
e3edc45081
Document NavigationFocused
2018-04-18 07:04:55 +12:00
David Rowe
c1ede6ef58
Merge branch 'master' into 21815
...
# Conflicts:
# tools/jsdoc/plugins/hifi.js
2018-04-17 11:54:56 +12:00
David Rowe
9f83c606e9
Controller API JSDoc
2018-04-17 11:46:40 +12:00
Anthony J. Thibault
0a162e62b0
transmit sendAll packet in nodeActivated signal callback
...
(cherry picked from commit 9f1a8290148da12849935c916b2e0a59864cb49b)
2018-04-16 16:16:56 -07:00
Anthony J. Thibault
c29bf51226
Fix for avatar glitches, head and legs folding into chest.
...
As a form of compression, when encoding avatar data we only send joints that have changed significantly from the previous packet.
Also, if a joint has the same value as the avatar's default pose, we don't send the full value, instead we mark it with a single bit.
This particular issue is caused by an interaction between the default value flag and the joint changed culling.
When connecting to a domain for the first time, it's possible that a I-frame or 'full' packet will not be sent for several seconds.
In this case, the AvatarMixer has no previous history for values that have not changed recently.
This causes the AvatarMixer to broadcast incorrect values to other clients.
Keep in mind that the AvatarMixer does not have access to the avatar FBX file, so it cannot make an educated guess for this value and uses zero values instead.
(0, 0, 0) for translation and (0, 0, 0, 1) for rotation.
When a translation value of zero is received for the lower legs it will cause the legs to fold into the avatar's chest.
Also, we've uncovered a bug where sometimes values were not sent to the AvatarMixer even when the value was previously default.
This would also exhibit the same issue where zero translation values would be sent.
I've done three things to help mitigate this issue.
1) On first connect to a new AvatarMixer, the Avatar now sends a 'full' packet.
2) When a joint rotation or translation changes from the default value, we transmit it. No questions asked.
3) Once a SkeletonModel has finished loading we initialize the avatar's _jointData with the proper
translations from the default pose. This will help the case where a client receives a non default value, but has no previous history.
(cherry picked from commit 94efdf76a6454f316985f95d6a221adb24788d66)
2018-04-16 14:58:33 -07:00
Andrew Meadows
a80cf49eb3
split 'ETRupdate' out of 'postPhysics' stat context
2018-04-16 13:31:36 -07:00
Andrew Meadows
ace32193b4
more correct stat names
2018-04-16 13:31:36 -07:00
Zach Fox
0504220171
Abide by new backend code
2018-04-16 13:01:31 -07:00
John Conklin II
5705bac87f
Merge pull request #12723 from ctrlaltdavid/21801
...
HMD API JSDoc
2018-04-16 11:12:26 -07:00
Gabriel Calero
e3b94b163c
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-04-16 14:55:16 -03:00
Sam Gateau
3ac4a1db2d
Merge pull request #12850 from SimonWalton-HiFi/early-trace
...
Enable Interface tracing from earliest execution point
2018-04-16 10:24:55 -07:00
Zach Fox
071bf35683
Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018
2018-04-16 10:11:44 -07:00
David Rowe
df31d20430
Fix overlay toggling
2018-04-14 17:06:34 +12:00
Clement
bd59ff1573
Fix threaded force crashes
2018-04-13 15:11:49 -07:00
John Conklin II
3982472cf2
Merge pull request #12851 from druiz17/rc66-spwan-fix
...
serverless-domain named landing-points(RC66)
2018-04-13 14:58:36 -07:00
samcake
b88b668a06
Exposing more texture memory budget options
2018-04-13 12:19:53 -07:00
samcake
e6085a90d6
Exposing more texture memory budget options
2018-04-13 12:17:50 -07:00
Melissa Brown
fd7b3b75f9
Merge pull request #12884 from Atlante45/fix/build-instructions
...
Update docs with correct qt version
2018-04-13 11:12:06 -07:00
Seth Alves
a56f3f4a10
code review
2018-04-12 19:06:12 -07:00
John Conklin II
fc487ea322
Merge pull request #12831 from ctrlaltdavid/21829
...
Model overlay fixes
2018-04-12 17:04:55 -07:00
Simon Walton
76468f7f26
Use existing DISABLE_WATCHDOG global to turn off thread entirely
2018-04-12 16:58:13 -07:00
Clement
157ca8cd68
Update docs with correct qt version
2018-04-12 16:21:26 -07:00
Gabriel Calero
bd4a7ce4fa
Hide jump button while moving. Fix jump button right alignment in pixel
2018-04-12 19:02:03 -03:00
Sam Gateau
77a27b2be7
Merge pull request #12835 from NissimHadar/speedUp1
...
ktxInitialDataRequestFinished call to qcDebug(networking) - only in DEBUG
2018-04-12 11:48:09 -07:00
Simon Walton
a584d67acd
Tweaks for clang error and gcc warning
2018-04-12 10:44:41 -07:00
John Conklin II
7bcaa12c50
Merge pull request #12679 from FlameSoulis/getAnimatationRoles-fix
...
Typo corrected: getAnimatationRoles to getAnimationRoles
2018-04-12 10:32:09 -07:00
Simon Walton
5c141aa5e9
Add --disableWatchdog command-line option
...
Watchdog still runs but doesn't abort on timeout.
Also fixes for previous tracing improvements.
2018-04-12 09:28:28 -07:00
David Rowe
c2f0f7ef5f
Doc review
2018-04-12 10:54:35 +12:00
Sam Gateau
f355bd86c2
Merge pull request #12783 from samcake/blue
...
Hack: Adding more budget options for memory texture
2018-04-11 15:46:08 -07:00
David Rowe
7a9e3388fa
Merge branch 'master' into 21801
2018-04-12 09:48:51 +12:00
David Rowe
c836014d21
Fix JSDoc typo noticed in passing
2018-04-12 09:24:10 +12:00
Cristian Luis Duarte
d993e4938e
Merge remote-tracking branch 'hifi/master' into android_goto_splash
2018-04-11 18:03:16 -03:00
John Conklin II
7a905ed420
Merge pull request #12777 from ctrlaltdavid/21813
...
Fix Window API position and size reporting
2018-04-11 13:48:21 -07:00
John Conklin II
854d3d7804
Merge pull request #12765 from ctrlaltdavid/21822
...
Fix text sizing per text3d overlay lineHeight property
2018-04-11 12:16:51 -07:00
MiladNazeri
9f7a765ec3
Merge pull request #12729 from ctrlaltdavid/21814
...
Settings API JSDoc
2018-04-11 11:48:15 -07:00
Zach Fox
0c9d65bc15
Merge pull request #12758 from zfox23/commerce_fixCertificateInfoError
...
Commerce: Fix Certificate Info error
2018-04-11 09:38:43 -07:00
Zach Fox
095b4ba5f2
Reduce logging from some Commerce/Discovery features
2018-04-10 16:02:58 -07:00
