NissimHadar
|
684f9929a9
|
Improved error message.
|
2019-03-07 12:22:07 -08:00 |
|
NissimHadar
|
8acec5c9e9
|
Increased threshold to 0.9999
|
2019-03-07 12:21:40 -08:00 |
|
NissimHadar
|
53d682d40e
|
Merge branch 'master' of github.com:highfidelity/hifi into 21559-increaseComparisonThreshold
|
2019-03-07 11:32:12 -08:00 |
|
Sam Gateau
|
6841668040
|
Merge pull request #15071 from NissimHadar/21507-replaceQNetworkAccessManagerWithPython
Case 21507: replace Qt network access manager with python
|
2019-03-07 10:04:26 -08:00 |
|
amantley
|
fcf1e34175
|
Merge pull request #15114 from amantley/ikEnabledFix
Ik enabled fix
|
2019-03-06 20:29:38 -05:00 |
|
Shannon Romano
|
d068630728
|
Merge pull request #15108 from sabrina-shanman/crash_physics-fst
(case 21585) Fix crash when FST model used as both graphics and physics model
|
2019-03-06 17:06:38 -08:00 |
|
amantley
|
474a97d0fc
|
now update the ikOverlayAlpha every frame
|
2019-03-06 15:15:30 -08:00 |
|
Roxanne Skelly
|
a54171d60c
|
Merge pull request #15104 from roxanneskelly/79hero-master
merge PR 15026 15051 15067 15070 from v0.79.HERO-rc into master
|
2019-03-06 13:06:45 -08:00 |
|
NissimHadar
|
4e7f558af8
|
Merge branch 'master' of github.com:highfidelity/hifi into 21507-replaceQNetworkAccessManagerWithPython
|
2019-03-06 13:02:36 -08:00 |
|
Shannon Romano
|
fc2f1ff994
|
Merge pull request #14955 from thoys/fix/create/reloadCrash
Case 18299: Remove workaround for Interactive window crash now that it is fixed
|
2019-03-06 12:46:00 -08:00 |
|
Shannon Romano
|
bde6ced7c8
|
Merge pull request #15049 from thoys/fix/fst/materialRelativePaths
Case 21474: relative paths in FST material parsing
|
2019-03-06 12:38:13 -08:00 |
|
Shannon Romano
|
3600b98bd0
|
Merge pull request #15013 from thoys/feat/avatarTools/avatarDoctorProjectStatus
Case 21340: avatar doctor project page status
|
2019-03-06 12:36:18 -08:00 |
|
amantley
|
e72cc8b16e
|
put the ik optimized part of the conditional inside a android build define statement
|
2019-03-06 12:09:53 -08:00 |
|
Sam Gateau
|
f203d71159
|
Merge pull request #15069 from NissimHadar/21482-addSSIMResultsImage
Case 21482: add SSIM results image
|
2019-03-06 12:01:33 -08:00 |
|
Thijs Wenker
|
a84a43320c
|
added spacing between lines
|
2019-03-06 19:15:01 +01:00 |
|
amantley
|
48f512a553
|
Merge remote-tracking branch 'upstream/master' into ikEnabledFix
|
2019-03-06 10:07:28 -08:00 |
|
Thijs Wenker
|
59200103af
|
Not for sale explanation
|
2019-03-06 07:06:48 +01:00 |
|
amantley
|
442da66583
|
debugging tiny hulk problems
|
2019-03-05 17:44:36 -08:00 |
|
sabrina-shanman
|
7ad8b3a610
|
Fix FST models being copied improperly in the ModelCache
|
2019-03-05 16:59:36 -08:00 |
|
Anthony Thibault
|
7585391642
|
Merge pull request #15031 from luiscuenca/upVectorFBXFix
Read and apply the upVector parameter when importing FBX files
|
2019-03-05 16:27:42 -08:00 |
|
NissimHadar
|
ab227f210d
|
Increased threshold to 0.990
|
2019-03-05 16:21:32 -08:00 |
|
Shannon Romano
|
4f3d593d90
|
Merge pull request #15072 from SamGondelman/clear
Case 11775: Don't clear my avatar entities on domain switch
|
2019-03-05 15:42:51 -08:00 |
|
Roxanne Skelly
|
fae6393663
|
Merge commit '743d1a58e2c4d07fa26f61b1512190263225fa42'
|
2019-03-05 15:11:25 -08:00 |
|
Roxanne Skelly
|
cca36e4a89
|
Merge commit '135c7b667eb126bcc4ebab948fa7450327209ae8'
|
2019-03-05 15:09:56 -08:00 |
|
Roxanne Skelly
|
d0ecc6d792
|
Merge commit '16eb3444c11c6513ff0d8a1d73a50c9856bf432b'
|
2019-03-05 15:09:20 -08:00 |
|
Roxanne Skelly
|
38981a5f25
|
Merge commit 'a804d3532e6b04fb86e5e520147bd34c331b3f36'
|
2019-03-05 15:08:39 -08:00 |
|
Roxanne Skelly
|
3ef02085ff
|
Merge commit '041a561dbcaa7280fd2c14ba2051b2add756ca6f'
|
2019-03-05 15:07:49 -08:00 |
|
Sam Gondelman
|
94cc5b83ac
|
Merge pull request #15088 from SamGondelman/create
Case 21541: Fix mouse on create in HMD
|
2019-03-05 13:07:49 -08:00 |
|
Shannon Romano
|
3eff5d269f
|
Merge pull request #15008 from ctrlaltdavid/M21128-a
Case 21128: AccountServices, HifiAbout, and WalletScriptingInterface JSDoc review
|
2019-03-05 11:58:37 -08:00 |
|
John Conklin II
|
4729c8737e
|
Merge pull request #15095 from amerhifi/master
case 21563: adding modelScale initialization so that it does not fail the validSc…
|
2019-03-05 11:46:32 -08:00 |
|
Sam Gondelman
|
fd5e2b4672
|
Merge pull request #15082 from SamGondelman/modelCrash
Case 21528: Possible fix for model crash
|
2019-03-05 11:27:46 -08:00 |
|
amer cerkic
|
fab343a1d4
|
correcting spacing
|
2019-03-05 10:52:54 -08:00 |
|
amer cerkic
|
36e9c604e9
|
fixed based on comment
|
2019-03-05 10:45:15 -08:00 |
|
NissimHadar
|
66125e1f01
|
Updated version.
|
2019-03-05 10:21:49 -08:00 |
|
amer cerkic
|
29a308dcaa
|
adding modelScale initialization so that it does not fail the validScale check assert
|
2019-03-05 10:07:33 -08:00 |
|
Simon Walton
|
743d1a58e2
|
Style tweaks from review
|
2019-03-05 09:34:29 -08:00 |
|
Simon Walton
|
122b62a5b8
|
Remove some debug output
|
2019-03-04 17:32:18 -08:00 |
|
SamGondelman
|
f2c248c0a2
|
disable href and entity script events when in edit mode
|
2019-03-04 17:10:20 -08:00 |
|
SamGondelman
|
fd88ec0d16
|
need to copy meshStates on main thread
|
2019-03-04 15:25:02 -08:00 |
|
SamGondelman
|
12f5a735d9
|
simplifying mouse events and fix mouse on create
|
2019-03-04 14:50:09 -08:00 |
|
luiscuenca
|
b2d08e9d42
|
apply axis rotation to translation and meshes
|
2019-03-04 15:33:21 -07:00 |
|
Shannon Romano
|
29d5574d93
|
Merge pull request #15036 from SimonWalton-HiFi/connect-class-in-nodelist-thread
Connection class should run in NodeList thread
|
2019-03-04 12:30:24 -08:00 |
|
Shannon Romano
|
45099a5db6
|
Merge pull request #15076 from SamGondelman/laserWidth
Case 21514: Lasers scale with avatar
|
2019-03-04 11:26:08 -08:00 |
|
amantley
|
e955c02e07
|
Merge pull request #15046 from amantley/bugRootHips
Bug Fix for the Hips not translating correctly when Hips and Root have the same location
|
2019-03-04 14:05:33 -05:00 |
|
Shannon Romano
|
6d297d91f6
|
Merge pull request #15073 from danteruiz/fix-tablet-button-rotation
Case 21512: Very difficult to use the close button on the tablet (0.81.0)
|
2019-03-04 10:49:16 -08:00 |
|
Shannon Romano
|
06d89dc81a
|
Merge pull request #15077 from SamGondelman/resourceCrash
Case 21344: Fix resource crash on invalid resource
|
2019-03-04 10:47:57 -08:00 |
|
Shannon Romano
|
d56b460d11
|
Merge pull request #15030 from wayne-chen/clockOnTablet
Case 21456, Case 21463: Clock On Tablet (81.0/master)
|
2019-03-04 10:45:34 -08:00 |
|
SamGondelman
|
708632ee82
|
possible fix for model crash
|
2019-03-04 10:00:26 -08:00 |
|
Shannon Romano
|
4437b64ef3
|
Merge pull request #15081 from r3tk0n/fargrab-interrupt
Prevent HUD and Web Surface lasers from interrupting FarGrab.
|
2019-03-04 09:47:21 -08:00 |
|
r3tk0n
|
12ffa41984
|
Prevent HUD and Web Surface lasers from interrupting FarGrab.
|
2019-03-02 13:55:06 -08:00 |
|