Merge branch 'topic/rc-v3.1.4' into topic/merge-rc-3.1.4
Conflicts: CMakeLists.txt src/FootTrajectoryGeneration/FootTrajectoryGenerationMultiple.cpp src/FootTrajectoryGeneration/FootTrajectoryGenerationMultiple.hh src/FootTrajectoryGeneration/FootTrajectoryGenerationStandard.hh src/FootTrajectoryGeneration/OnLineFootTrajectoryGeneration.cpp src/FootTrajectoryGeneration/OnLineFootTrajectoryGeneration.h src/Mathematics/PLDPHerdt.cpp src/Mathematics/PLDPSolverHerdt.hh src/Mathematics/intermediate-qp-matrices.cpp src/Mathematics/intermediate-qp-matrices.hh src/Mathematics/relative-feet-inequalities.cpp src/Mathematics/relative-feet-inequalities.hh src/PatternGeneratorInterfacePrivate.cpp src/PreviewControl/LinearizedInvertedPendulum2D.h src/PreviewControl/SupportFSM.cpp src/PreviewControl/SupportFSM.h src/ZMPRefTrajectoryGeneration/OrientationsPreview.cpp src/ZMPRefTrajectoryGeneration/OrientationsPreview.h src/ZMPRefTrajectoryGeneration/ZMPVelocityReferencedQP.cpp src/ZMPRefTrajectoryGeneration/ZMPVelocityReferencedQP.h src/ZMPRefTrajectoryGeneration/generator-vel-ref.cpp src/ZMPRefTrajectoryGeneration/generator-vel-ref.hh src/ZMPRefTrajectoryGeneration/mpc-trajectory-generation.cpp src/ZMPRefTrajectoryGeneration/mpc-trajectory-generation.hh src/ZMPRefTrajectoryGeneration/qp-problem.cpp src/ZMPRefTrajectoryGeneration/qp-problem.hh src/privatepgtypes.cpp src/privatepgtypes.h tests/TestHerdt2010.cpp tests/TestHerdt2010OnLineTestFGPI.datref.cmake tests/TestObject.cpp
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- CMakeLists.txt 10 additions, 0 deletionsCMakeLists.txt
- include/jrl/walkgen/patterngeneratorinterface.hh 6 additions, 6 deletionsinclude/jrl/walkgen/patterngeneratorinterface.hh
- include/jrl/walkgen/pgtypes.hh 6 additions, 5 deletionsinclude/jrl/walkgen/pgtypes.hh
- src/CMakeLists.txt 9 additions, 1 deletionsrc/CMakeLists.txt
- src/FootTrajectoryGeneration/FootTrajectoryGenerationAbstract.hh 4 additions, 4 deletions...tTrajectoryGeneration/FootTrajectoryGenerationAbstract.hh
- src/FootTrajectoryGeneration/FootTrajectoryGenerationMultiple.cpp 26 additions, 27 deletions...TrajectoryGeneration/FootTrajectoryGenerationMultiple.cpp
- src/FootTrajectoryGeneration/FootTrajectoryGenerationMultiple.hh 21 additions, 31 deletions...tTrajectoryGeneration/FootTrajectoryGenerationMultiple.hh
- src/FootTrajectoryGeneration/FootTrajectoryGenerationStandard.cpp 111 additions, 56 deletions...TrajectoryGeneration/FootTrajectoryGenerationStandard.cpp
- src/FootTrajectoryGeneration/FootTrajectoryGenerationStandard.hh 16 additions, 4 deletions...tTrajectoryGeneration/FootTrajectoryGenerationStandard.hh
- src/FootTrajectoryGeneration/OnLineFootTrajectoryGeneration.cpp 349 additions, 0 deletions...otTrajectoryGeneration/OnLineFootTrajectoryGeneration.cpp
- src/FootTrajectoryGeneration/OnLineFootTrajectoryGeneration.h 151 additions, 0 deletions...FootTrajectoryGeneration/OnLineFootTrajectoryGeneration.h
- src/GlobalStrategyManagers/GlobalStrategyManager.hh 1 addition, 1 deletionsrc/GlobalStrategyManagers/GlobalStrategyManager.hh
- src/Mathematics/FootHalfSize.cpp 7 additions, 8 deletionssrc/Mathematics/FootHalfSize.cpp
- src/Mathematics/FootHalfSize.hh 5 additions, 3 deletionssrc/Mathematics/FootHalfSize.hh
- src/Mathematics/Polynome.cpp 14 additions, 2 deletionssrc/Mathematics/Polynome.cpp
- src/Mathematics/Polynome.hh 10 additions, 2 deletionssrc/Mathematics/Polynome.hh
- src/Mathematics/PolynomeFoot.cpp 48 additions, 2 deletionssrc/Mathematics/PolynomeFoot.cpp
- src/Mathematics/PolynomeFoot.hh 25 additions, 1 deletionsrc/Mathematics/PolynomeFoot.hh
- src/Mathematics/intermediate-qp-matrices.cpp 195 additions, 0 deletionssrc/Mathematics/intermediate-qp-matrices.cpp
Loading
Please register or sign in to comment