Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Recursive body #1

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Recursive body #1

wants to merge 11 commits into from

Commits on Oct 16, 2011

  1. created the body-recursive branch... quite a lot of change, but not that 

    much in reality.
    @slvlirnoff
    slvlirnoff committed Oct 16, 2011
    Configuration menu
    Copy the full SHA
    46329ce View commit details
    Browse the repository at this point in the history

  2. the missing files

    @slvlirnoff
    slvlirnoff committed Oct 16, 2011
    Configuration menu
    Copy the full SHA
    4a611c4 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2011

  1. moving genelab -> genecraft to reflect master

    @slvlirnoff
    slvlirnoff committed Oct 19, 2011
    Configuration menu
    Copy the full SHA
    bb1f9e8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into recursive-body 

    Conflicts:
	src/genecraft/core/entities/brain/brainout.cpp
	src/genecraft/core/entities/effectors/rotationalmotorseffector.h
	src/genecraft/core/entities/families/genericfamily.cpp
	src/genecraft/core/entities/sensors/contactsensor.h
	src/genecraft_global/genelab_global.pro
	src/genecraft_global/genelab_global.pro.user.2.2pre5
	src/genecraft_global/genelabmainwindow.cpp
	src/genecraft_global/genelabmainwindow.h
	src/genecraft_global/genelabmainwindow.ui
	src/genecraft_worker/genelab_worker.pro
	src/genecraft_worker/spider.exp
    @slvlirnoff
    slvlirnoff committed Oct 19, 2011
    Configuration menu
    Copy the full SHA
    a976545 View commit details
    Browse the repository at this point in the history

  3. missing files...

    @slvlirnoff
    slvlirnoff committed Oct 19, 2011
    Configuration menu
    Copy the full SHA
    afb0d50 View commit details
    Browse the repository at this point in the history

  4. fix build after merge genecraft_global

    @slvlirnoff
    slvlirnoff committed Oct 19, 2011
    Configuration menu
    Copy the full SHA
    1395643 View commit details
    Browse the repository at this point in the history

  5. fix build after merge genecraft_worker

    @slvlirnoff
    slvlirnoff committed Oct 19, 2011
    Configuration menu
    Copy the full SHA
    8a00d59 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into recursive-body 

    Conflicts:
	src/genecraft_global/genecraft_global.pro
	src/genecraft_worker/genecraft_worker.pro
    @slvlirnoff
    slvlirnoff committed Oct 19, 2011
    Configuration menu
    Copy the full SHA
    9062003 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2012

  1. Merge branch 'master' into recursive-body 

    Conflicts:
	src/genecraft/core/entities/body/bone.h
    @slvlirnoff
    slvlirnoff committed Jan 15, 2012
    Configuration menu
    Copy the full SHA
    6a7243d View commit details
    Browse the repository at this point in the history

  2. incorporate refactoring from master

    @slvlirnoff
    slvlirnoff committed Jan 15, 2012
    Configuration menu
    Copy the full SHA
    15b9026 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2012

  1. Merge branch 'master' into recursive-body

    @slvlirnoff
    slvlirnoff committed Jan 16, 2012
    Configuration menu
    Copy the full SHA
    8cb9a73 View commit details
    Browse the repository at this point in the history