amantley
|
36093926d0
|
added fake android defines for running the new ik on pc
|
2019-02-15 15:00:39 -08:00 |
|
amantley
|
3f9b761e42
|
updating the android only if defs
|
2019-02-15 14:05:42 -08:00 |
|
amantley
|
7119bc5972
|
reverted the scale optimization in animspline.cpp
|
2019-02-15 10:54:02 -08:00 |
|
amantley
|
0fcaa695ba
|
Merge remote-tracking branch 'upstream/master' into animArmIK
|
2019-02-15 10:35:33 -08:00 |
|
amantley
|
d6dfaacf6f
|
adding ifdef for android os
|
2019-02-15 10:35:25 -08:00 |
|
David Back
|
af25a7bf6e
|
Merge pull request #14919 from dback2/selectAllClearAll
Case 19930: Entity List - add select/clear all to entity type dropdown
|
2019-02-15 10:12:30 -08:00 |
|
Anthony Thibault
|
702f1c8e74
|
Merge pull request #14925 from hyperlogic/bug-fix/revert-anim-pose-optimization
Revert anim pose optimization
|
2019-02-15 09:42:27 -08:00 |
|
Simon Walton
|
748747da2d
|
Merge pull request #14864 from SimonWalton-HiFi/pal-sort-loudness-persist
Case 19724: If sorting PAL by loudness re-sort upon loudness updates
|
2019-02-15 09:24:34 -08:00 |
|
amantley
|
425413419a
|
fixed merge conflict in avatar.h
|
2019-02-15 08:26:54 -08:00 |
|
Angus Antley
|
07af2c525e
|
tweaked ulnar radial limit and extend limit
|
2019-02-15 07:31:28 -08:00 |
|
Angus Antley
|
382a03929e
|
changed back to regular 2 bone Ik for arms in json and cleaned up rig.cpp and polevector constraint
|
2019-02-15 07:06:43 -08:00 |
|
Angus Antley
|
f8554d10a8
|
starting cleanup
|
2019-02-14 23:45:45 -08:00 |
|
amantley
|
40196dcb40
|
wrist action works in rig now
|
2019-02-14 18:17:31 -08:00 |
|
amantley
|
5c26bbec5c
|
moving the theta calculation to rig
|
2019-02-14 18:06:20 -08:00 |
|
Shannon Romano
|
f267043953
|
Merge pull request #14838 from SamGondelman/billboardMode
Case 20962: Billboard mode improvements
|
2019-02-14 17:44:48 -08:00 |
|
David Back
|
e944e284a6
|
design feedback
|
2019-02-14 17:37:58 -08:00 |
|
Shannon Romano
|
3b5b077a3e
|
Merge pull request #14887 from AndrewMeadows/shape-garbage-collector
Case 21066: restore shape caching in ShapeManager
|
2019-02-14 17:33:33 -08:00 |
|
David Back
|
f6baa2432a
|
design feedback
|
2019-02-14 17:27:05 -08:00 |
|
Anthony Thibault
|
a3407b96b0
|
Merge branch 'master' into bug-fix/revert-anim-pose-optimization
|
2019-02-14 16:56:17 -08:00 |
|
Sam Gateau
|
6168001ad4
|
Merge pull request #14909 from AndrewMeadows/update-collision-group-after-grab-80
Case 21159: fixes for more grab bugs
|
2019-02-14 16:52:03 -08:00 |
|
David Back
|
46ff3a8405
|
add select/clear all buttons to entity type dropdown
|
2019-02-14 16:16:33 -08:00 |
|
Anthony Thibault
|
39b4eaac34
|
Revert "AnimPose operator* optimizations"
This reverts commit 569bef50fd.
|
2019-02-14 16:13:00 -08:00 |
|
Anthony Thibault
|
f0e163b4df
|
Revert "AnimPose::inverse() optimization"
This reverts commit 5c7e81584c.
|
2019-02-14 16:10:26 -08:00 |
|
Simon Walton
|
75901a1e37
|
Merge pull request #14853 from SimonWalton-HiFi/installer-removes
Case 20496: Windows (NSIS) installer shouldn't remove unselected component upon reinstall
|
2019-02-14 15:41:25 -08:00 |
|
Shannon Romano
|
453c081d9b
|
Merge pull request #14901 from huffman/fix/dropdown-close-on-click
Case 19999: Update edit.js to auto close dropdowns when clicking outside
|
2019-02-14 14:48:03 -08:00 |
|
Bradley Austin Davis
|
d45d87031d
|
Merge pull request #14782 from SamGondelman/NOverlaysFinal
Case 20723, Case 20334: Internally, replace all overlays with local entities
|
2019-02-14 13:49:47 -08:00 |
|
Sam Gateau
|
969c62d0df
|
Merge pull request #14907 from danteruiz/fix-qml-crash-on-mac
Case 21157: Fix Desktop.qml crash on local mac build
|
2019-02-14 12:15:50 -08:00 |
|
Sam Gateau
|
384d4fb959
|
Merge pull request #14809 from highfidelity/commandLineAndroid
case 19113: Recreated changes due to CLA issue in previous pr. Adding args to int…
|
2019-02-14 12:10:08 -08:00 |
|
John Conklin II
|
5e177c31ee
|
Merge pull request #14912 from NissimHadar/21185-protectNitpickFromBadFilename
Case 21185: protect nitpick from bad filename
|
2019-02-14 11:25:36 -08:00 |
|
NissimHadar
|
6752092899
|
Removed unnecessary member variable.
|
2019-02-14 10:38:19 -08:00 |
|
NissimHadar
|
701c18c9eb
|
Correction to recursive scripts.
|
2019-02-14 08:58:09 -08:00 |
|
Angus Antley
|
1924018d2c
|
added code to convert theta to a projected pole vector
|
2019-02-14 07:15:58 -08:00 |
|
NissimHadar
|
58c0078188
|
Reversed order of recursive calls.
|
2019-02-13 21:07:25 -08:00 |
|
NissimHadar
|
301b4215e5
|
Fixed gcc warning.
|
2019-02-13 19:13:08 -08:00 |
|
Angus Antley
|
aa0c52abd7
|
fixed wrap around 180 degrees
|
2019-02-13 18:33:01 -08:00 |
|
NissimHadar
|
be5f9b211b
|
Add nitpick to production (but not stable) builds
|
2019-02-13 18:09:06 -08:00 |
|
Andrew Meadows
|
efe2767f3f
|
Merge pull request #14913 from SamGondelman/pal
Case 21147, Case 20944: Fix setTextures (pal, etc.)
|
2019-02-13 17:50:08 -08:00 |
|
amantley
|
fc978f0ee7
|
fixed twist angle bug. need to fix wrap around 180 to -180 behaviour
|
2019-02-13 17:31:48 -08:00 |
|
Andrew Meadows
|
72b5fa1968
|
Merge pull request #14857 from Atlante45/fix/ess-parenting
Case 15420: Fix ESS sometimes not getting the parents/children of entities with scripts.
|
2019-02-13 17:26:57 -08:00 |
|
amantley
|
c6da7cc41d
|
everything looks pretty good now but need to move the code to rig and need to get rig of wrap around problem with the twist decomp
|
2019-02-13 17:12:28 -08:00 |
|
SamGondelman
|
3f8bfc5475
|
CR and fix deadlock
|
2019-02-13 16:19:39 -08:00 |
|
SamGondelman
|
9e002c59d4
|
fix pal
|
2019-02-13 15:24:55 -08:00 |
|
NissimHadar
|
56483f4884
|
Check that zipped folder name is in correct format.
|
2019-02-13 15:18:07 -08:00 |
|
NissimHadar
|
86aaba016f
|
Narrow filter on zip folder selection.
|
2019-02-13 15:15:46 -08:00 |
|
NissimHadar
|
12c122ce9c
|
Bump up version number.
|
2019-02-13 15:14:36 -08:00 |
|
NissimHadar
|
77b679606f
|
Corrected bug in zip folder name.
|
2019-02-13 15:13:55 -08:00 |
|
danteruiz
|
562e159ab4
|
the proper fix for browser qml issues
|
2019-02-13 10:45:07 -08:00 |
|
Shannon Romano
|
8a07e2b31a
|
Merge pull request #14895 from ctrlaltdavid/M21132
Case 21132: Add "Avatar Script" classification to relevant JSDoc APIs
|
2019-02-13 10:35:00 -08:00 |
|
Andrew Meadows
|
ba91bab224
|
remove cruft
|
2019-02-13 10:05:32 -08:00 |
|
Andrew Meadows
|
c79e3e5a6d
|
add some trace contexts for easier debugging
|
2019-02-13 10:02:58 -08:00 |
|