Code

Cob behaviour#321

Code

Merged

fmessmer merged 39 commits intoipa320:indigo_devipa320/cob_robots:indigo_devfrom ipa-cob4-2:cob_behaviouripa-cob4-2/cob_robots:cob_behaviourCopy head branch name to clipboardSep 24, 2015

+851-4,556

Commits

Commits on Feb 6, 2015

• Merge branch 'cob4-6' of github.com:ipa-nhg/cob_robots into indigo_dev

  ipa-nhg

  committed
  ee3984e

  Copy full SHA for ee3984e

Commits on Mar 25, 2015

• renamed torso urdfs

  ipa-nhg

  committed
  07f5e31

  Copy full SHA for 07f5e31

• Merge branch 'indigo_dev' of github.com:ipa-nhg/cob_robots into indigo_dev

  ipa-nhg

  committed
  4b41dc9

  Copy full SHA for 4b41dc9

• merge

  ipa-nhg

  committed
  716b041

  Copy full SHA for 716b041

• merge

  ipa-nhg

  committed
  47ffc60

  Copy full SHA for 47ffc60

• merge

  ipa-nhg

  committed
  12a1bb7

  Copy full SHA for 12a1bb7

Commits on Apr 13, 2015

• Merge pull request #1 from ipa-cob4-2/indigo_dev

  Show description for f2c1296
  ipa-cob4-4

  committed
  f2c1296

  Copy full SHA for f2c1296

Commits on Jun 11, 2015

• cob4-4 setup

  ipa-cob4-4

  committed
  32aefa3

  Copy full SHA for 32aefa3

• merge

  ipa-cob4-4

  committed
  236b7fe

  Copy full SHA for 236b7fe

• Merge branch 'indigo_dev' of github.com:ipa320/cob_robots into indigo_dev

  ipa-nhg

  committed
  5457318

  Copy full SHA for 5457318

• setup cob4-4

  ipa-cob4-4

  committed
  64b5491

  Copy full SHA for 64b5491

Commits on Jun 16, 2015

• defined teleop parameters

  ipa-cob4-4

  committed
  e7ffc0e

  Copy full SHA for e7ffc0e

• Merge branch 'indigo_dev' of https://github.com/ipa320/cob_robots into indigo_dev

  ipa-cob4-4

  committed
  2077ab3

  Copy full SHA for 2077ab3

• teleop parameters

  ipa-cob4-4

  committed
  4913a16

  Copy full SHA for 4913a16

• Update raw3-4.xml

  ipa-cob4-4

  committed
  dde6d8b

  Copy full SHA for dde6d8b

• needed effort limits

  ipa-cob4-4

  committed
  6e6a73a

  Copy full SHA for 6e6a73a

• Merge branch 'indigo_dev' of https://github.com/ipa-cob4-4/cob_robots into indigo_dev

  ipa-cob4-4

  committed
  6b0814c

  Copy full SHA for 6b0814c

• last update

  ipa-cob4-4

  committed
  337a1b2

  Copy full SHA for 337a1b2

Commits on Jun 18, 2015

• Merge branch 'indigo_dev' of github.com:ipa320/cob_robots into indigo_dev

  ipa-nhg

  committed
  18f8500

  Copy full SHA for 18f8500

• Merge branch 'indigo_dev' of https://github.com/ipa-cob4-4/cob_robots into indigo_dev

  ipa-nhg

  committed
  f248d4e

  Copy full SHA for f248d4e

• added mlr rviz default configuration

  ipa-nhg

  committed
  46ace56

  Copy full SHA for 46ace56

• added safety marker

  ipa-nhg

  committed
  ee5ba2c

  Copy full SHA for ee5ba2c

Commits on Jun 22, 2015

• merge

  ipa-nhg

  committed
  ac1deab

  Copy full SHA for ac1deab

Commits on Jul 2, 2015

• merge

  ipa-nhg

  committed
  3359e6c

  Copy full SHA for 3359e6c

Commits on Jul 30, 2015

• cob_behaviour

  ipa-cob4-2

  committed
  0f399d9

  Copy full SHA for 0f399d9

Commits on Jul 31, 2015

• added mimic.launch

  ipa-cob4-2

  committed
  8ec58bc

  Copy full SHA for 8ec58bc

Commits on Aug 5, 2015

• robot test

  ipa-cob4-2

  committed
  f8866c0

  Copy full SHA for f8866c0

• cob_behaviour

  ipa-cob4-2

  committed
  843a744

  Copy full SHA for 843a744

Commits on Aug 11, 2015

• Merge branch 'cob_behaviour' of https://github.com/ipa-cob4-2/cob_robots into indigo_dev

  ipa-nhg

  committed
  6f46f6d

  Copy full SHA for 6f46f6d

Commits on Aug 12, 2015

• package xml 2

  ipa-nhg

  committed
  02c8961

  Copy full SHA for 02c8961

Commits on Aug 21, 2015

• new trigger srv and addapted android.launch file

  ipa-cob4-2

  committed
  bf301e3

  Copy full SHA for bf301e3

• Merge branch 'cob_behaviour' of github.com:ipa-cob4-2/cob_robots into cob_behaviour

  ipa-cob4-2

  committed
  b7ad5f8

  Copy full SHA for b7ad5f8

Commits on Sep 17, 2015

• updated cob_teleop and renamed behaviour package

  ipa-nhg

  committed
  971d8e0

  Copy full SHA for 971d8e0

• merge error

  ipa-nhg

  committed
  2300581

  Copy full SHA for 2300581

• merge error

  ipa-nhg

  committed
  b8e5c22

  Copy full SHA for b8e5c22

Commits on Sep 18, 2015

• merge

  ipa-nhg

  committed
  2361e6e

  Copy full SHA for 2361e6e

Commits on Sep 24, 2015

• added new behavior trigger services

  ipa-nhg

  committed
  9875cf4

  Copy full SHA for 9875cf4

• using light service

  ipa-nhg

  committed
  54a0513

  Copy full SHA for 54a0513

• remove trailing whitespaces

  ipa-cob4-2

  committed
  36ca462

  Copy full SHA for 36ca462