This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository fife.
commit b76cfd1585762758eb9f6f4926e749276dd8c173 Merge: fa503ed e56c34d Author: Markus Koschany <[email protected]> Date: Fri Jul 7 11:24:12 2017 +0200 Updated version 0.4.1 from 'upstream/0.4.1' with Debian dir 78d2eed0f9a890485bb0858f2cc895080114f12b CHANGELOG.md | 35 +- CMakeLists.txt | 26 +- appveyor.yml | 28 +- build/appveyor/copy-boost-to-includes.bat | 16 +- cmake/get-fifechan.cmake | 34 +- cmake/get-libpng.cmake | 8 +- cmake/get-openal.cmake | 8 +- cmake/get-sdl2.cmake | 8 +- cmake/get-swig.cmake | 6 +- cmake/get-zlib.cmake | 4 +- engine/core/controller/engine.cpp | 4 + engine/core/controller/engine.h | 6 + engine/core/controller/engine.i | 2 + engine/core/eventchannel/eventchannel.i | 4 + engine/core/eventchannel/eventmanager.cpp | 32 +- engine/core/eventchannel/mouse/ec_imouselistener.h | 12 + engine/core/eventchannel/mouse/ec_mouseevent.h | 17 + engine/core/gui/cegui/base/ceguiinputprocessor.cpp | 48 +- engine/core/gui/fifechan/fifechanmanager.cpp | 8 +- engine/core/gui/fifechan/fifechanmanager.h | 3 + engine/core/gui/fifechan/lib/fifechanlistener.i | 24 +- .../gui/librocket/base/librocketinputprocessor.cpp | 2 + engine/core/loaders/native/map/animationloader.cpp | 382 +++-- engine/core/loaders/native/map/animationloader.h | 44 +- engine/core/loaders/native/map/atlasloader.cpp | 412 ++--- engine/core/loaders/native/map/atlasloader.h | 16 +- engine/core/loaders/native/map/ianimationloader.h | 5 + engine/core/loaders/native/map/iatlasloader.h | 6 + engine/core/loaders/native/map/iobjectloader.h | 47 +- engine/core/loaders/native/map/maploader.cpp | 399 ++--- engine/core/loaders/native/map/maploader.h | 128 +- engine/core/loaders/native/map/objectloader.cpp | 1015 +++++++----- engine/core/loaders/native/map/objectloader.h | 90 +- .../resourceanimationloader.cpp} | 43 +- .../resourceanimationloader.h} | 31 +- engine/core/model/metamodel/grids/cellgrid.h | 5 + engine/core/model/metamodel/grids/cellgrids.i | 3 + engine/core/model/metamodel/grids/hexgrid.cpp | 13 + engine/core/model/metamodel/grids/hexgrid.h | 2 + engine/core/model/metamodel/grids/squaregrid.cpp | 5 +- engine/core/model/metamodel/grids/squaregrid.h | 1 + engine/core/model/structures/location.cpp | 2 +- engine/core/savers/native/map/mapsaver.cpp | 11 +- engine/core/video/animation.cpp | 82 +- engine/core/video/animation.h | 25 +- engine/core/video/animationmanager.cpp | 470 ++++++ engine/core/video/animationmanager.h | 380 +++++ engine/core/video/video.i | 53 +- engine/python/fife/extensions/basicapplication.py | 4 +- engine/python/fife/extensions/fife_settings.py | 5 + engine/python/fife/extensions/pychan/events.py | 4 + .../python/fife/extensions/pychan/widgets/icon.py | 7 +- .../fife/extensions/serializers/xmlanimation.py | 13 +- engine/swigwrappers/python/fife.i.templ | 6 + engine/swigwrappers/python/fife.i.templ.cm | 6 + .../objects/actors/player/frigate/back_object.xml | 102 +- .../actors/player/frigate/dummy/animation.xml | 8 +- .../objects/actors/player/frigate/front_object.xml | 102 +- .../actors/player/frigate/move/0/animation.xml | 8 +- .../actors/player/frigate/move/135/animation.xml | 8 +- .../actors/player/frigate/move/180/animation.xml | 8 +- .../actors/player/frigate/move/225/animation.xml | 8 +- .../actors/player/frigate/move/270/animation.xml | 8 +- .../actors/player/frigate/move/315/animation.xml | 8 +- .../actors/player/frigate/move/45/animation.xml | 8 +- .../actors/player/frigate/move/90/animation.xml | 8 +- .../data/objects/actors/player/frigate/object.xml | 50 +- .../objects/actors/player/hero/buckler_atlas.xml | 230 +-- .../objects/actors/player/hero/clothes_atlas.xml | 230 +-- .../objects/actors/player/hero/dagger_atlas.xml | 230 +-- .../objects/actors/player/hero/greatbow_atlas.xml | 230 +-- .../actors/player/hero/greatstaff_atlas.xml | 230 +-- .../actors/player/hero/greatsword_atlas.xml | 230 +-- .../actors/player/hero/leather_armor_atlas.xml | 230 +-- .../objects/actors/player/hero/longbow_atlas.xml | 230 +-- .../objects/actors/player/hero/longsword_atlas.xml | 230 +-- .../actors/player/hero/male_head1_atlas.xml | 230 +-- .../actors/player/hero/male_head2_atlas.xml | 230 +-- .../actors/player/hero/male_head3_atlas.xml | 230 +-- .../data/objects/actors/player/hero/object.xml | 14 +- .../data/objects/actors/player/hero/rod_atlas.xml | 230 +-- .../objects/actors/player/hero/shield_atlas.xml | 230 +-- .../objects/actors/player/hero/shortbow_atlas.xml | 230 +-- .../actors/player/hero/shortsword_atlas.xml | 230 +-- .../objects/actors/player/hero/slingshot_atlas.xml | 230 +-- .../objects/actors/player/hero/staff_atlas.xml | 230 +-- .../actors/player/hero/steel_armor_atlas.xml | 230 +-- .../data/objects/actors/player/hero/wand_atlas.xml | 230 +-- .../data/objects/actors/player/skel/object.xml | 54 +- tests/fife_test/data/tilesets/grassland_tiles.xml | 1692 ++++++++++---------- tests/fife_test/data/tilesets/rpg_tiles.xml | 384 ++--- .../fife_test/data/tilesets/skel_overlay_tiles.xml | 70 +- tests/fife_test/data/tilesets/terrain1.xml | 462 +++--- tests/fife_test/data/tilesets/toilett.xml | 22 +- 94 files changed, 6560 insertions(+), 5114 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/fife.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
