Skip to content

Commit

Permalink
Merge branch 'master' of github.com:makehumancommunity/makehuman
Browse files Browse the repository at this point in the history
  • Loading branch information
Aranuvir committed May 20, 2018
2 parents 397db61 + 84f8fc4 commit 820b280
Show file tree
Hide file tree
Showing 1,329 changed files with 2,668 additions and 2,668 deletions.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ value-added in exchange for the possibility of uncovering deficiencies in our po

## Support requests:
If you have any questions about the software and its usage, please make a request in our forum:
http://www.makehumancommunity.org/forum
http://www.makehumancommunity.org/forum.
We are not going to answer support requests on the bug tracker!

## Current status
Expand All @@ -19,8 +19,7 @@ If you want a stable release of MakeHuman, see http://www.makehumancommunity.org

This said, the code in the master branch will work if a few basic requirements are met:

* NumPy must be at the most version 1.12.1. Versions 1.13.0 and later will not work.
* You must use a graphics card capable of using the opengl calls MH rely on. It is currently not easy to say exactly which these are, but a rule of thumb is that discreet graphics cards from nVidia will work, whereas integrated chips from intel are likely to not work.
* You must use a graphics card capable of using the opengl calls MH rely on. It is currently not easy to say exactly which these are.

## Getting started

Expand All @@ -31,11 +30,12 @@ If you rather run the code from source:
* Install git (https://git-scm.com/) with LFS support (https://git-lfs.github.com/). Modern git clients have LFS support included per default.
* Make sure the command "git" is available via the PATH variable.
* Install python 3.5.x or later from https://www.python.org/ (or via your system's package management)
* Figure out how to run "pip": https://pip.pypa.io/en/stable/ (it should have been installed automatically by python)
* Figure out how to run "pip": https://pip.pypa.io/en/stable/ (it should have been installed automatically by python), but on Linux use your default package menagemnt system
* Use "pip" to install dependencies:
* "pip install numpy==1.12.1"
* "pip install pyqt5"
* "pip install numpy"
* "pip install PyQt5"
* "pip install PyOpenGL"
* on Debian based systems you need to install: python3-numpy, python3-opengl, python3-pyqt5, python3-pyqt5.opengl, python3-pyqt5.qtsvg
* Use git to clone https://github.com/makehumancommunity/makehuman.git (or download the source as a zip)
* Run the "download\_assets\_git.py" script in the "makehuman" subdirectory of the source code.
* Optionally also run:
Expand Down
4 changes: 2 additions & 2 deletions makehuman/data/targets/armslegs/l-foot-scale-decr.target
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#
# The primary legal contact for MakeHuman is Data Collection AB.
#
# For more information, see homepage at http://www.makehuman.org
# For more information, see homepage at http://www.makehumancommunity.org
#
# This file is licensed AGPLv3
#
# This file is part of MakeHuman (www.makehuman.org).
# This file is part of MakeHuman (www.makehumancommunity.org).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#
# The primary legal contact for MakeHuman is Data Collection AB.
#
# For more information, see homepage at http://www.makehuman.org
# For more information, see homepage at http://www.makehumancommunity.org
#
# This file is licensed AGPLv3
#
# This file is part of MakeHuman (www.makehuman.org).
# This file is part of MakeHuman (www.makehumancommunity.org).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#
# The primary legal contact for MakeHuman is Data Collection AB.
#
# For more information, see homepage at http://www.makehuman.org
# For more information, see homepage at http://www.makehumancommunity.org
#
# This file is licensed AGPLv3
#
# This file is part of MakeHuman (www.makehuman.org).
# This file is part of MakeHuman (www.makehumancommunity.org).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#
# The primary legal contact for MakeHuman is Data Collection AB.
#
# For more information, see homepage at http://www.makehuman.org
# For more information, see homepage at http://www.makehumancommunity.org
#
# This file is licensed AGPLv3
#
# This file is part of MakeHuman (www.makehuman.org).
# This file is part of MakeHuman (www.makehumancommunity.org).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#
# The primary legal contact for MakeHuman is Data Collection AB.
#
# For more information, see homepage at http://www.makehuman.org
# For more information, see homepage at http://www.makehumancommunity.org
#
# This file is licensed AGPLv3
#
# This file is part of MakeHuman (www.makehuman.org).
# This file is part of MakeHuman (www.makehumancommunity.org).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
Expand Down
4 changes: 2 additions & 2 deletions makehuman/data/targets/armslegs/l-foot-scale-incr.target
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#
# The primary legal contact for MakeHuman is Data Collection AB.
#
# For more information, see homepage at http://www.makehuman.org
# For more information, see homepage at http://www.makehumancommunity.org
#
# This file is licensed AGPLv3
#
# This file is part of MakeHuman (www.makehuman.org).
# This file is part of MakeHuman (www.makehumancommunity.org).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
Expand Down
4 changes: 2 additions & 2 deletions makehuman/data/targets/armslegs/l-foot-scale-vert-decr.target
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#
# The primary legal contact for MakeHuman is Data Collection AB.
#
# For more information, see homepage at http://www.makehuman.org
# For more information, see homepage at http://www.makehumancommunity.org
#
# This file is licensed AGPLv3
#
# This file is part of MakeHuman (www.makehuman.org).
# This file is part of MakeHuman (www.makehumancommunity.org).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
Expand Down
4 changes: 2 additions & 2 deletions makehuman/data/targets/armslegs/l-foot-scale-vert-incr.target
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#
# The primary legal contact for MakeHuman is Data Collection AB.
#
# For more information, see homepage at http://www.makehuman.org
# For more information, see homepage at http://www.makehumancommunity.org
#
# This file is licensed AGPLv3
#
# This file is part of MakeHuman (www.makehuman.org).
# This file is part of MakeHuman (www.makehumancommunity.org).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
Expand Down
4 changes: 2 additions & 2 deletions makehuman/data/targets/armslegs/l-foot-trans-backward.target
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#
# The primary legal contact for MakeHuman is Data Collection AB.
#
# For more information, see homepage at http://www.makehuman.org
# For more information, see homepage at http://www.makehumancommunity.org
#
# This file is licensed AGPLv3
#
# This file is part of MakeHuman (www.makehuman.org).
# This file is part of MakeHuman (www.makehumancommunity.org).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
Expand Down
4 changes: 2 additions & 2 deletions makehuman/data/targets/armslegs/l-foot-trans-down.target
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#
# The primary legal contact for MakeHuman is Data Collection AB.
#
# For more information, see homepage at http://www.makehuman.org
# For more information, see homepage at http://www.makehumancommunity.org
#
# This file is licensed AGPLv3
#
# This file is part of MakeHuman (www.makehuman.org).
# This file is part of MakeHuman (www.makehumancommunity.org).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
Expand Down
4 changes: 2 additions & 2 deletions makehuman/data/targets/armslegs/l-foot-trans-forward.target
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#
# The primary legal contact for MakeHuman is Data Collection AB.
#
# For more information, see homepage at http://www.makehuman.org
# For more information, see homepage at http://www.makehumancommunity.org
#
# This file is licensed AGPLv3
#
# This file is part of MakeHuman (www.makehuman.org).
# This file is part of MakeHuman (www.makehumancommunity.org).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
Expand Down
4 changes: 2 additions & 2 deletions makehuman/data/targets/armslegs/l-foot-trans-in.target
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#
# The primary legal contact for MakeHuman is Data Collection AB.
#
# For more information, see homepage at http://www.makehuman.org
# For more information, see homepage at http://www.makehumancommunity.org
#
# This file is licensed AGPLv3
#
# This file is part of MakeHuman (www.makehuman.org).
# This file is part of MakeHuman (www.makehumancommunity.org).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
Expand Down
4 changes: 2 additions & 2 deletions makehuman/data/targets/armslegs/l-foot-trans-out.target
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#
# The primary legal contact for MakeHuman is Data Collection AB.
#
# For more information, see homepage at http://www.makehuman.org
# For more information, see homepage at http://www.makehumancommunity.org
#
# This file is licensed AGPLv3
#
# This file is part of MakeHuman (www.makehuman.org).
# This file is part of MakeHuman (www.makehumancommunity.org).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
Expand Down
4 changes: 2 additions & 2 deletions makehuman/data/targets/armslegs/l-foot-trans-up.target
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#
# The primary legal contact for MakeHuman is Data Collection AB.
#
# For more information, see homepage at http://www.makehuman.org
# For more information, see homepage at http://www.makehumancommunity.org
#
# This file is licensed AGPLv3
#
# This file is part of MakeHuman (www.makehuman.org).
# This file is part of MakeHuman (www.makehumancommunity.org).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#
# The primary legal contact for MakeHuman is Data Collection AB.
#
# For more information, see homepage at http://www.makehuman.org
# For more information, see homepage at http://www.makehumancommunity.org
#
# This file is licensed AGPLv3
#
# This file is part of MakeHuman (www.makehuman.org).
# This file is part of MakeHuman (www.makehumancommunity.org).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#
# The primary legal contact for MakeHuman is Data Collection AB.
#
# For more information, see homepage at http://www.makehuman.org
# For more information, see homepage at http://www.makehumancommunity.org
#
# This file is licensed AGPLv3
#
# This file is part of MakeHuman (www.makehuman.org).
# This file is part of MakeHuman (www.makehumancommunity.org).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#
# The primary legal contact for MakeHuman is Data Collection AB.
#
# For more information, see homepage at http://www.makehuman.org
# For more information, see homepage at http://www.makehumancommunity.org
#
# This file is licensed AGPLv3
#
# This file is part of MakeHuman (www.makehuman.org).
# This file is part of MakeHuman (www.makehumancommunity.org).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#
# The primary legal contact for MakeHuman is Data Collection AB.
#
# For more information, see homepage at http://www.makehuman.org
# For more information, see homepage at http://www.makehumancommunity.org
#
# This file is licensed AGPLv3
#
# This file is part of MakeHuman (www.makehuman.org).
# This file is part of MakeHuman (www.makehumancommunity.org).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#
# The primary legal contact for MakeHuman is Data Collection AB.
#
# For more information, see homepage at http://www.makehuman.org
# For more information, see homepage at http://www.makehumancommunity.org
#
# This file is licensed AGPLv3
#
# This file is part of MakeHuman (www.makehuman.org).
# This file is part of MakeHuman (www.makehumancommunity.org).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#
# The primary legal contact for MakeHuman is Data Collection AB.
#
# For more information, see homepage at http://www.makehuman.org
# For more information, see homepage at http://www.makehumancommunity.org
#
# This file is licensed AGPLv3
#
# This file is part of MakeHuman (www.makehuman.org).
# This file is part of MakeHuman (www.makehumancommunity.org).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
Expand Down
4 changes: 2 additions & 2 deletions makehuman/data/targets/armslegs/l-hand-scale-decr.target
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#
# The primary legal contact for MakeHuman is Data Collection AB.
#
# For more information, see homepage at http://www.makehuman.org
# For more information, see homepage at http://www.makehumancommunity.org
#
# This file is licensed AGPLv3
#
# This file is part of MakeHuman (www.makehuman.org).
# This file is part of MakeHuman (www.makehumancommunity.org).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
Expand Down
4 changes: 2 additions & 2 deletions makehuman/data/targets/armslegs/l-hand-scale-incr.target
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#
# The primary legal contact for MakeHuman is Data Collection AB.
#
# For more information, see homepage at http://www.makehuman.org
# For more information, see homepage at http://www.makehumancommunity.org
#
# This file is licensed AGPLv3
#
# This file is part of MakeHuman (www.makehuman.org).
# This file is part of MakeHuman (www.makehumancommunity.org).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
Expand Down
4 changes: 2 additions & 2 deletions makehuman/data/targets/armslegs/l-hand-trans-in.target
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#
# The primary legal contact for MakeHuman is Data Collection AB.
#
# For more information, see homepage at http://www.makehuman.org
# For more information, see homepage at http://www.makehumancommunity.org
#
# This file is licensed AGPLv3
#
# This file is part of MakeHuman (www.makehuman.org).
# This file is part of MakeHuman (www.makehumancommunity.org).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
Expand Down
4 changes: 2 additions & 2 deletions makehuman/data/targets/armslegs/l-hand-trans-out.target
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#
# The primary legal contact for MakeHuman is Data Collection AB.
#
# For more information, see homepage at http://www.makehuman.org
# For more information, see homepage at http://www.makehumancommunity.org
#
# This file is licensed AGPLv3
#
# This file is part of MakeHuman (www.makehuman.org).
# This file is part of MakeHuman (www.makehumancommunity.org).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
Expand Down
4 changes: 2 additions & 2 deletions makehuman/data/targets/armslegs/l-leg-valgus-decr.target
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#
# The primary legal contact for MakeHuman is Data Collection AB.
#
# For more information, see homepage at http://www.makehuman.org
# For more information, see homepage at http://www.makehumancommunity.org
#
# This file is licensed AGPLv3
#
# This file is part of MakeHuman (www.makehuman.org).
# This file is part of MakeHuman (www.makehumancommunity.org).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
Expand Down
4 changes: 2 additions & 2 deletions makehuman/data/targets/armslegs/l-leg-valgus-incr.target
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#
# The primary legal contact for MakeHuman is Data Collection AB.
#
# For more information, see homepage at http://www.makehuman.org
# For more information, see homepage at http://www.makehumancommunity.org
#
# This file is licensed AGPLv3
#
# This file is part of MakeHuman (www.makehuman.org).
# This file is part of MakeHuman (www.makehumancommunity.org).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
Expand Down
Loading

0 comments on commit 820b280

Please sign in to comment.