Skip to content

changes rebased#2

Open
mprinceb wants to merge 14 commits intomainfrom
ahead-rebased
Open

changes rebased#2
mprinceb wants to merge 14 commits intomainfrom
ahead-rebased

Conversation

@mprinceb
Copy link
Collaborator

@mprinceb mprinceb commented Mar 5, 2026

No description provided.

mprinceb and others added 14 commits March 5, 2026 11:25
# Conflicts:
#	src/mjlab/asset_zoo/robots/__init__.py
# Conflicts:
#	src/mjlab/tasks/velocity/velocity_env_cfg.py
# Conflicts:
#	src/mjlab/asset_zoo/robots/__init__.py
#	src/mjlab/asset_zoo/robots/asimov/asimov_constants.py
#	src/mjlab/asset_zoo/robots/asimov/xmls/asimov.xml
#	src/mjlab/tasks/velocity/config/asimov/__init__.py
#	src/mjlab/tasks/velocity/config/asimov/env_cfgs.py
#	src/mjlab/tasks/velocity/config/asimov/rl_cfg.py
#	src/mjlab/tasks/velocity/velocity_env_cfg.py
# Conflicts:
#	src/mjlab/asset_zoo/robots/asimov/asimov_toe_constants.py
#	src/mjlab/asset_zoo/robots/asimov/xmls/asimov_toe.xml
#	src/mjlab/scripts/joint_deltas.py
#	src/mjlab/tasks/velocity/config/asimov_toe/__init__.py
#	src/mjlab/tasks/velocity/config/asimov_toe/env_cfgs.py
#	src/mjlab/tasks/velocity/config/asimov_toe/rl_cfg.py
# Conflicts:
#	pyproject.toml
#	src/mjlab/asset_zoo/robots/__init__.py
#	uv.lock
# Conflicts:
#	README.md
#	docs/source/_static/content/humanoid.png
#	docs/source/_static/content/humanoid_sim.gif
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants