Sam Gateau
|
3d78592bb8
|
Adding more style widgets andbringing luci1 into the panels of luci2
|
2019-04-18 00:19:19 -07:00 |
|
Sam Gateau
|
0359caec8d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into blackProp
|
2019-04-17 18:22:52 -07:00 |
|
Sam Gateau
|
9873c10353
|
Better canvas ICon qml and activation of the jobs
|
2019-04-17 17:58:48 -07:00 |
|
Shannon Romano
|
6c15719618
|
Merge pull request #15310 from danteruiz/fix-keyboard-scaling
Case 21513: Keyboad doesn't scale to avatar after reloading content
|
2019-04-17 16:59:42 -07:00 |
|
Shannon Romano
|
bbab0b59b7
|
Merge pull request #15332 from raveenajain/gltf_brainstem_fix
Case 22060 fix model
|
2019-04-17 16:29:25 -07:00 |
|
raveenajain
|
2fab5a0945
|
parents, skeleton, break fix
|
2019-04-17 21:14:44 +01:00 |
|
Shannon Romano
|
da314694b4
|
Merge pull request #15271 from amantley/overrideHandAnimsSquashed
Allow Hand Animations to be Overridden
|
2019-04-17 11:53:41 -07:00 |
|
Shannon Romano
|
5d1c1010c5
|
Merge pull request #15294 from sethalves/fix-refreshGroupsCache-asan-error
case 21977: fix asan reported error when returning QString reference to refreshGroupsCache
|
2019-04-17 11:43:12 -07:00 |
|
Anthony Thibault
|
b4a993bec6
|
Merge pull request #15033 from hyperlogic/feature/coding-standard
Added coding standard file to repo
|
2019-04-17 11:06:07 -07:00 |
|
Sam Gateau
|
e6c76cdb19
|
Merge pull request #15329 from Zvork/amc
case 22219: Improved ambient maps
|
2019-04-17 10:20:53 -07:00 |
|
amantley
|
035c8a687d
|
fixed merge conflict
|
2019-04-17 10:16:39 -07:00 |
|
Sam Gateau
|
92c1fd69c1
|
Merge branch 'master' of github.com:highfidelity/hifi into blackProp
|
2019-04-17 10:09:20 -07:00 |
|
raveenajain
|
104ed758b9
|
re-order nodes, cluster update
|
2019-04-17 17:52:48 +01:00 |
|
Shannon Romano
|
f2069a2cd7
|
Merge pull request #15344 from amantley/bugTwoBoneOverFlow
Fixed out of range error in AnimTwoBoneIK
|
2019-04-17 09:51:09 -07:00 |
|
David Back
|
d1f451ddcc
|
Merge pull request #15354 from dback2/undoEditOrderFix
Case 20960: Fix Create's undo edit order
|
2019-04-17 09:28:56 -07:00 |
|
Sam Gateau
|
4ce7d75720
|
FInding a path
|
2019-04-16 23:38:40 -07:00 |
|
Sam Gateau
|
f6001c178d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into blackProp
|
2019-04-16 18:43:30 -07:00 |
|
Sam Gateau
|
f2b747a68d
|
Adding indentation of the folder in the header and refining background color
|
2019-04-16 18:15:00 -07:00 |
|
unknown
|
2839879657
|
Merge branch 'master' of https://github.com/highfidelity/hifi into undoEditOrderFix
|
2019-04-16 15:26:47 -07:00 |
|
Shannon Romano
|
ec22f7847e
|
Merge pull request #15367 from dback2/editContinualTranslateRC82ToMaster
Case 22130: PR 15366 changes from v82 to Master
|
2019-04-16 15:17:08 -07:00 |
|
Shannon Romano
|
50f39e88d6
|
Merge pull request #15365 from hyperlogic/bug-fix/better-camera-in-head-check
Better head vs camera checks for avatar head cauterization
|
2019-04-16 15:07:46 -07:00 |
|
Shannon Romano
|
517710bcb8
|
Merge pull request #15388 from r3tk0n/running-fix
Case 22192: Adjust run speed constants.
|
2019-04-16 14:51:23 -07:00 |
|
amantley
|
ba9b539bd2
|
removed hand fbx files that will be used in the future for default hand overrides
|
2019-04-16 14:12:32 -07:00 |
|
Shannon Romano
|
adbcbe6585
|
Merge pull request #15381 from dback2/materialTargetMasterFollowup2
Case 22195: PR 15380 changes from v82 to Master
|
2019-04-16 11:48:07 -07:00 |
|
Shannon Romano
|
7de56092f8
|
Merge pull request #15376 from SimonWalton-HiFi/delayed-node-adds-tweaks
Clear delayed Node-adds upon restart
|
2019-04-16 11:27:15 -07:00 |
|
Shannon Romano
|
4b91363226
|
Merge pull request #15375 from SimonWalton-HiFi/pingpunch-lower-rate
Increase ping interval for unconnected Nodes
|
2019-04-16 11:22:30 -07:00 |
|
r3tk0n
|
d0abb86366
|
Reversed costants because no sleep. >_<
|
2019-04-15 17:26:22 -07:00 |
|
Sam Gateau
|
db9df76337
|
Merge pull request #15391 from sabrina-shanman/hfm_disable-embedded-materials_master
(master) Disable baking of embedded material textures in material entities
|
2019-04-15 15:51:41 -07:00 |
|
Shannon Romano
|
3500a1b19e
|
Merge pull request #15386 from danteruiz/fix-bubble
Case 22203: Shield/bubble animation and sound plays when other users are ignored by PAL or their own shields of RC83
|
2019-04-15 15:15:53 -07:00 |
|
Shannon Romano
|
4d255fce93
|
Merge pull request #15373 from sabrina-shanman/hfm_crash_textures
(case 21906) Fix TextureBaker failures and heap corruption in MaterialBaker
|
2019-04-15 15:12:39 -07:00 |
|
sabrina-shanman
|
8f87afd7db
|
Disable baking of embedded material textures in material entities
|
2019-04-15 15:00:14 -07:00 |
|
Shannon Romano
|
d00ba2a9f1
|
Merge pull request #15384 from roxanneskelly/Case21707
Case21707 - Wallet doesn't work if user has unicode characters in windows username
|
2019-04-15 14:48:30 -07:00 |
|
Sam Gateau
|
1fd88e8269
|
Merge branch 'master' of github.com:highfidelity/hifi into blackProp
|
2019-04-15 14:05:33 -07:00 |
|
raveenajain
|
f458427067
|
Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_brainstem_fix
|
2019-04-15 12:59:43 -07:00 |
|
Roxanne Skelly
|
3949ca2638
|
Remove logging and bump build.
|
2019-04-15 12:35:36 -07:00 |
|
raveenajain
|
3c84a46cba
|
update how nodes are initially parsed
|
2019-04-15 20:27:54 +01:00 |
|
r3tk0n
|
12d7e35722
|
Add separate constant for desktop run. HMD run affected negatively by 3x multiplier. This will need to be cleaned up in a future release.
|
2019-04-15 10:56:07 -07:00 |
|
Roxanne Skelly
|
743d626b32
|
Merge branch 'master' of https://github.com/highfidelity/hifi into Case21707
|
2019-04-15 10:27:28 -07:00 |
|
r3tk0n
|
a40fdf3f77
|
Merge branch 'master' of https://github.com/highfidelity/hifi into running-fix
|
2019-04-15 09:47:26 -07:00 |
|
Sam Gateau
|
e7e9715e10
|
merging up
|
2019-04-15 09:16:59 -07:00 |
|
Roxanne Skelly
|
8f9d8372d8
|
Public Key was getting corrupted.
|
2019-04-12 20:30:03 -07:00 |
|
Roxanne Skelly
|
e36a8fc6a2
|
Fix osx/ubuntu build error
|
2019-04-12 18:36:14 -07:00 |
|
danteruiz
|
246f11ba02
|
fixing bubble
|
2019-04-12 17:11:35 -07:00 |
|
Shannon Romano
|
d321ae9b79
|
Merge pull request #15284 from amantley/eyeRotationOverrideBug
Fixes Bug that Prevented Eye Rotation Override When Procedural Eye Movement is Disabled
|
2019-04-12 17:06:11 -07:00 |
|
Roxanne Skelly
|
3bf8fb5d95
|
Case21707 - Wallet doesn't work if user has unicode characters in windows username
|
2019-04-12 16:40:41 -07:00 |
|
unknown
|
d342d93ec9
|
fix material targets when re-opening properties to same entity
|
2019-04-12 14:49:59 -07:00 |
|
r3tk0n
|
87deb348a8
|
Adjust run speed constants.
|
2019-04-12 14:07:06 -07:00 |
|
Shannon Romano
|
a0ddadc0e7
|
Merge pull request #15320 from ctrlaltdavid/M21989
Case 21989: AvatarList and AvatarManager JSDoc
|
2019-04-12 12:27:29 -07:00 |
|
Shannon Romano
|
11e5f0a101
|
Merge pull request #15323 from ctrlaltdavid/M22052
Case 22052: Camera JSDoc
|
2019-04-12 12:26:39 -07:00 |
|
Shannon Romano
|
5e8e44f97b
|
Merge pull request #15316 from amantley/bugSetRotation
Bug fixed for MyAvatar.getJointRotation(name, quat) and MyAvatar.setJointRotation(name, quat)
|
2019-04-12 12:23:03 -07:00 |
|