[critterding] 01/03: Merge tag 'upstream/1.0-beta14.4+dfsg'

[Gabriele Giacone]

This is an automated email from the git hooks/post-receive script.

gg0-guest pushed a commit to branch experimental-unreleased
in repository critterding.

commit 2c57ae96cc6df47afd11daf8c014172299c903d5
Merge: dd217d8 23076a8
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sun Aug 10 01:10:11 2014 +0200

    Merge tag 'upstream/1.0-beta14.4+dfsg'
    
    Upstream version 1.0-beta14.4+dfsg

 INSTALL                                            |   1 +
 profiles/1391132379.pro                            | 160 ++++++++
 profiles/race                                      |  10 +-
 profiles/race-large                                |   2 +-
 share/critterding/shaders/playervision_new.frag    |  34 +-
 src/brainz/brainz.cpp                              |  22 +-
 src/brainz/neuroninterz.cpp                        |  35 +-
 src/brainz/neuroninterz.h                          |   5 +-
 src/brainz/synapse.cpp                             |   2 +-
 src/brainz/synapse.h                               |  43 +-
 src/common/be_obj_loader.cpp                       | 455 +++++++++++++++++----
 src/common/be_obj_loader.h                         |   1 +
 src/gl/glwindow.cpp                                |   6 +-
 src/graphics/sc_graphics.cpp                       |  15 +-
 src/scenes/critterding/critterding.cpp             |  31 +-
 src/scenes/critterding/entities/body.cpp           |   6 +-
 src/scenes/critterding/entities/body.h             |   2 +-
 src/scenes/critterding/entities/critterb.cpp       |   6 +-
 src/scenes/critterding/entities/dirlayout.cpp      |  10 +
 src/scenes/critterding/entities/dirlayout.h        |   2 +
 src/scenes/critterding/entities/worldb.cpp         |  78 ++--
 src/scenes/critterding/entities/worldb.h           |   7 +-
 src/scenes/critterding/gui/globalsettingspanel.cpp |   2 +
 src/scenes/critterding/gui/settingsbodypanel.cpp   |   1 +
 24 files changed, 782 insertions(+), 154 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/critterding.git