Skip to content
Snippets Groups Projects
Commit 58b07363 authored by mnaveau's avatar mnaveau
Browse files

Merge branch 'topic/StairWalking' into topic/merge

Doesn t link...

Conflicts:
	.gitignore
	src/FootTrajectoryGeneration/FootTrajectoryGenerationStandard.cpp
	src/FootTrajectoryGeneration/FootTrajectoryGenerationStandard.hh
	src/FootTrajectoryGeneration/OnLineFootTrajectoryGeneration.cpp
	src/GlobalStrategyManagers/CoMAndFootOnlyStrategy.cpp
	src/Mathematics/AnalyticalZMPCOGTrajectory.cpp
	src/Mathematics/PolynomeFoot.cpp
	src/Mathematics/PolynomeFoot.hh
	src/MotionGeneration/ComAndFootRealizationByGeometry.cpp
	src/MotionGeneration/ComAndFootRealizationByGeometry.hh
	src/PatternGeneratorInterfacePrivate.cpp
	src/PreviewControl/LinearizedInvertedPendulum2D.cpp
	src/ZMPRefTrajectoryGeneration/AnalyticalMorisawaCompact.cpp
	src/ZMPRefTrajectoryGeneration/AnalyticalMorisawaCompact.hh
	src/ZMPRefTrajectoryGeneration/OrientationsPreview.cpp
	src/ZMPRefTrajectoryGeneration/ZMPVelocityReferencedQP.cpp
	src/ZMPRefTrajectoryGeneration/ZMPVelocityReferencedQP.h
	tests/CMakeLists.txt
	tests/TestKajita2003.cpp
	tests/TestMorisawa2007.cpp
	tests/TestObject.cpp
	tests/TestObject.hh
parents 07f3abfa 0aaafb6c
No related branches found
No related tags found
Loading
Showing
with 1977 additions and 508 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment