Commit graph

73361 commits

Author SHA1 Message Date
Angus Antley
11bb448f9f merged luis code with the fbx having the jointOffsets now 2018-11-09 00:46:32 -08:00
Angus Antley
e36ab9efd6 cleaned up for merge with luis 2018-11-09 00:44:52 -08:00
Angus Antley
244b768b9a fixed the absolute default joint poses so they work for the 2 joint avatar 2018-11-08 23:42:50 -08:00
amantley
2cd3575e32 merged with master with hfm file changes 2018-11-08 17:31:49 -08:00
amantley
8735b409ab in the process of changing the rotation application to being absolute joints not local 2018-11-08 17:12:10 -08:00
luiscuenca
2586811e76 Merge with master 2018-11-08 18:05:19 -07:00
John Conklin II
3fabe557c2
Merge pull request #13948 from danteruiz/3d-keyboard
3D Keyboard.
2018-11-08 13:35:13 -08:00
Jeff Clinton
d349c1e672
Merge pull request #14336 from huffman/fix/horizontal-vertical-angle-particles
Fix horizontal and vertical props in entity properties being swapped
2018-11-08 12:42:48 -08:00
Jeff Clinton
cc7ce83f28
Merge pull request #14328 from roxanneskelly/Case19373
Case 19373 - Lowering volume on another user in PAL mutes them
2018-11-08 12:07:20 -08:00
Jeff Clinton
ea8dc8ae68
Merge pull request #14334 from danteruiz/interstitial-bug-fixes
Interstitial bug fixes
2018-11-08 11:43:38 -08:00
John Conklin II
ab9c494fef
Merge pull request #14367 from SamGondelman/tablet
Case 17284: Fix tablet culling
2018-11-08 11:14:12 -08:00
Ryan Huffman
1ff644b619
Merge pull request #14256 from ctrlaltdavid/M17008
Fix Interface crash importing JSON with duplicate entity IDs in file
2018-11-08 11:04:43 -08:00
Roxanne Skelly
0dc8a798a1 Merge branch 'master' of https://github.com/highfidelity/hifi into Case19373 2018-11-08 10:51:21 -08:00
Jamil Akram
7c22a1954c
Merge pull request #14237 from NissimHadar/addNoLogin
case 18450: Do not show login dialog if requested not to on the command line.
2018-11-08 10:43:21 -08:00
Jeff Clinton
62e3e87ba6
Merge pull request #14325 from huffman/fix/new-model-dynamic
Fix new models not obeying dynamic checkbox
2018-11-08 10:22:12 -08:00
Jeff Clinton
30ff3f676a
Merge pull request #14310 from thoys/fix/create/tooltips-refinement
Create APP tooltip / Adressed CR comments / Regression
2018-11-08 10:03:17 -08:00
Dante Ruiz
358aa547b1 feedback changes 2018-11-08 09:58:53 -08:00
Dante Ruiz
f664421fe0 addressing code review feedback 2018-11-08 09:58:53 -08:00
Dante Ruiz
501746b156 3D Keyboard 2018-11-08 09:58:53 -08:00
Zach Fox
b97fd6eb95
Merge pull request #14255 from zfox23/textToSpeech
Text to Speech App
2018-11-08 09:44:59 -08:00
Jeff Clinton
49bf01294a
Merge pull request #14320 from huffman/fix/default-collision-values
Update the default edit.js collidesWith to include myAvatar
2018-11-08 09:17:40 -08:00
amantley
6b4620b4a1 working on the input mapper problem for the offset rotations 2018-11-07 17:32:23 -08:00
Sam Gateau
4489efa58b
Merge pull request #14346 from AndrewMeadows/fix-crash-19654
Case 19654: fix crash in btCollisionWorld::updateSingleAabb()
2018-11-07 16:09:36 -08:00
Shannon Romano
7e96ceb222
Merge pull request #14254 from samcake/black-bis
Case 19140: Clean up Luci ui to aggregate more tools
2018-11-07 15:10:48 -08:00
Zach Fox
cee1454f6e CR feedback - thanks Ken! 2018-11-07 15:09:53 -08:00
SamGondelman
d316fe15ce fix tablet culling 2018-11-07 15:02:32 -08:00
Zach Fox
48d3450c5a Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-11-07 14:59:23 -08:00
Zach Fox
3cbaec818d
Merge pull request #14360 from zfox23/MS19743_updateCheckoutBug
Fix MS19743: Fix case where user couldn't update certain items
2018-11-07 14:57:35 -08:00
Jeff Clinton
e507e91bfd
Merge pull request #14227 from ElderOrb/FB19396
FB19396 - QML warning qrc:///qml/hifi/tablet/WindowRoot.qml:132: Type…
2018-11-07 13:36:41 -08:00
sam gateau
c40ded598d REmoving any attempt to fix anything in this pr 2018-11-07 12:18:52 -08:00
sam gateau
9ada9a7ad3 Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-11-07 12:07:15 -08:00
Jeff Clinton
63bf077776
Merge pull request #14263 from ElderOrb/better_imports_for_controls_and_styles
Better imports for controls and styles
2018-11-07 11:19:55 -08:00
Sam Gateau
e6cd9a4ffa
Merge pull request #14301 from NissimHadar/fixPath
case 19636 - Make path to VCPKG relative  to ENV variable
2018-11-07 10:58:56 -08:00
Sam Gateau
e28560a9c7
Merge pull request #14311 from SamGondelman/interstitial
Case 19682: Disable interstitial on android
2018-11-07 10:47:31 -08:00
Sam Gateau
d15c8a8854
Merge pull request #14313 from SamGondelman/macFix
Case 19686: Possibly fix mac debug deferred issue
2018-11-07 10:33:41 -08:00
Sam Gateau
8cda3f729b
Merge pull request #14316 from AndrewMeadows/workload-views-include-MyAvatar
Case 19394: always keep entities near MyAvatar in physics simulation
2018-11-07 10:26:47 -08:00
Sam Gateau
5d0be31fe7
Merge pull request #14354 from SamGondelman/deadlock
Case 19735: Fix ResourceCache mutex issues
2018-11-07 09:55:41 -08:00
amantley
dfd0ce69cb more head ik 2018-11-06 17:36:05 -08:00
amantley
1dbccc814b working on the ik dislocation caused by the offsets, head is what I am working on 2018-11-06 17:35:53 -08:00
Zach Fox
8776028259
Prepend "root" to "currentUpdatesPage" 2018-11-06 16:10:49 -08:00
Zach Fox
f22bbff505 Fix MS19743: Fix case where user couldn't update certain items 2018-11-06 15:47:47 -08:00
amantley
e52f2ab7d6 works for two joints now 2018-11-06 14:14:57 -08:00
Zach Fox
378bf911d4 Fix another build error 2018-11-06 12:48:17 -08:00
SamGondelman
1444b3a186 resource mutex issues
(cherry picked from commit 750629a6194ec98534746a377b3ba027c1dcc20e)
(cherry picked from commit fc5ab3289a5f88f245c2825edd085532bd4c97ca)
2018-11-06 11:57:57 -08:00
Zach Fox
c33f9b6ea3 Fix build error 2018-11-06 11:26:09 -08:00
Zach Fox
53742e90f5 Cleanup after merge 2018-11-06 10:30:10 -08:00
Zach Fox
58dd690c0a Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-11-06 10:29:05 -08:00
luiscuenca
e0d1ef3be3 Fix debug output 2018-11-06 11:11:16 -07:00
luiscuenca
599b7761b2 Read quats from fst 2018-11-06 11:09:56 -07:00
Alexander Ivash
a3dfc873b7 rsolve rebase conflict 2018-11-06 14:21:14 +05:30