[airstrike] 25/33: Merge tag 'upstream/0.99+1.0pre6a'

Markus Koschany apo at moszumanska.debian.org
Wed Apr 13 09:34:19 UTC 2016


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

apo pushed a commit to branch master
in repository airstrike.

commit 6a1faec078b6eb43d45081706f27258b3c358164
Merge: 3c3aa27 628ccdb
Author: Markus Koschany <apo at debian.org>
Date:   Wed Apr 13 10:35:41 2016 +0200

    Merge tag 'upstream/0.99+1.0pre6a'
    
    Upstream version 0.99+1.0pre6a
    
    # gpg: Signature made Wed 13 Apr 2016 10:35:37 CEST using RSA key ID 513B51E4
    # gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
    # gpg:                 aka "Markus Koschany <markus at koschany.net>" [ultimate]
    # gpg:                 aka "Markus Koschany <apo at debian.org>" [ultimate]

 COPYING                         |  340 ++++++++
 ChangeLog                       |  160 ++++
 INSTALL                         |   34 +
 LICENSE                         |    7 +
 Makefile                        |   31 +
 README                          |   24 +
 airstrikerc                     |   85 ++
 data/about.txt                  |   10 +
 data/airballoon.png             |  Bin 0 -> 18679 bytes
 data/ball.png                   |  Bin 0 -> 134 bytes
 data/balloon-bounce.png         |  Bin 0 -> 15992 bytes
 data/balloon-deflate.png        |  Bin 0 -> 7478 bytes
 data/balloon-float.png          |  Bin 0 -> 974 bytes
 data/balloon.png                |  Bin 0 -> 768 bytes
 data/bg-wide-mask.png           |  Bin 0 -> 6356 bytes
 data/bg-wide.png                |  Bin 0 -> 6374 bytes
 data/bg.png                     |  Bin 0 -> 169376 bytes
 data/bgmask.png                 |  Bin 0 -> 102417 bytes
 data/bigfont.png                |  Bin 0 -> 42000 bytes
 data/bird.png                   |  Bin 0 -> 976 bytes
 data/blackpixel.png             |  Bin 0 -> 70 bytes
 data/blacksmoke.png             |  Bin 0 -> 6446 bytes
 data/blueplane.png              |  Bin 0 -> 149481 bytes
 data/blueplanewreck.png         |  Bin 0 -> 171807 bytes
 data/bomb.png                   |  Bin 0 -> 14047 bytes
 data/bombexplosion.png          |  Bin 0 -> 131382 bytes
 data/bonus-machine.png          |  Bin 0 -> 15992 bytes
 data/bonus.png                  |  Bin 0 -> 18880 bytes
 data/bouncer.png                |  Bin 0 -> 7478 bytes
 data/bsmoke-dissolve.png        |  Bin 0 -> 12342 bytes
 data/bsmoke-grow.png            |  Bin 0 -> 12342 bytes
 data/bullet.png                 |  Bin 0 -> 154 bytes
 data/cannon-fire.png            |  Bin 0 -> 37305 bytes
 data/cannon-left.png            |  Bin 0 -> 17938 bytes
 data/cannon-right.png           |  Bin 0 -> 19546 bytes
 data/cannon-turn-lr.png         |  Bin 0 -> 38421 bytes
 data/cannon-turn-rl.png         |  Bin 0 -> 36599 bytes
 data/cannonball.png             |  Bin 0 -> 313 bytes
 data/cloud.png                  |  Bin 0 -> 30888 bytes
 data/console-bg.png             |  Bin 0 -> 1458 bytes
 data/direxpl.png                |  Bin 0 -> 21817 bytes
 data/energymeter.png            |  Bin 0 -> 3247 bytes
 data/fire.png                   |  Bin 0 -> 9539 bytes
 data/firebomb.png               |  Bin 0 -> 128993 bytes
 data/gauge.png                  |  Bin 0 -> 16716 bytes
 data/glyphs-alpha.png           |  Bin 0 -> 42462 bytes
 data/gsmoke-dissolve.png        |  Bin 0 -> 12342 bytes
 data/gsmoke-grow.png            |  Bin 0 -> 12342 bytes
 data/hangar.png                 |  Bin 0 -> 46530 bytes
 data/ldust-dissolve.png         |  Bin 0 -> 24630 bytes
 data/ldust-grow.png             |  Bin 0 -> 24630 bytes
 data/lpuff1.png                 |  Bin 0 -> 27702 bytes
 data/lpuff2.png                 |  Bin 0 -> 27702 bytes
 data/mark.png                   |  Bin 0 -> 27702 bytes
 data/message.png                |  Bin 0 -> 3194 bytes
 data/missile.png                |  Bin 0 -> 21442 bytes
 data/notes.txt                  |    8 +
 data/parachute.png              |  Bin 0 -> 83545 bytes
 data/puff-dissolve.png          |  Bin 0 -> 27702 bytes
 data/puff.png                   |  Bin 0 -> 27702 bytes
 data/redplane.png               |  Bin 0 -> 107273 bytes
 data/redplanewreck.png          |  Bin 0 -> 155508 bytes
 data/sdust-dissolve.png         |  Bin 0 -> 3510 bytes
 data/sdust-grow.png             |  Bin 0 -> 3510 bytes
 data/smallfont-green.png        |  Bin 0 -> 20944 bytes
 data/smoke.png                  |  Bin 0 -> 3674 bytes
 data/whitesmoke.png             |  Bin 0 -> 4977 bytes
 data/wsmoke-dissolve.png        |  Bin 0 -> 6966 bytes
 data/wsmoke-grow.png            |  Bin 0 -> 6966 bytes
 data/zeppelin-left.png          |  Bin 0 -> 5374 bytes
 data/zeppelin-right.png         |  Bin 0 -> 5405 bytes
 data/zeppelin-turn-lr.png       |  Bin 0 -> 74421 bytes
 data/zeppelin-turn-rl.png       |  Bin 0 -> 74011 bytes
 data/zeppelin-wreck.png         |  Bin 0 -> 19735 bytes
 data/zeppelin.png               |  Bin 0 -> 41527 bytes
 doc/1.0-features                |    9 +
 doc/33fps.out                   | 1327 +++++++++++++++++++++++++++++
 doc/BUGS                        |   25 +
 doc/TODO                        |   45 +
 doc/WHISHLIST                   |   51 ++
 doc/airstrike.6                 |  105 +++
 doc/animations.txt              |   96 +++
 doc/code.txt                    |   15 +
 doc/collisions.tm               |   86 ++
 doc/design.dia                  |  Bin 0 -> 3143 bytes
 doc/design.pdf                  |  Bin 0 -> 3434 bytes
 doc/fun.ps                      |  878 +++++++++++++++++++
 doc/guide.txt                   |    6 +
 doc/how-it-works.txt            |  100 +++
 doc/levels.txt                  |   30 +
 doc/performance.txt             |   14 +
 doc/physics.txt                 |   67 ++
 doc/release-plan.txt            |   92 ++
 pov/Makefile                    |  216 +++++
 pov/Makefile.eero               |  165 ++++
 pov/airballoon.pov              |  131 +++
 pov/balloon-bounce.pov          |   29 +
 pov/balloon-deflate.pov         |   46 +
 pov/balloon-float.pov           |   46 +
 pov/bird.pov                    |  131 +++
 pov/bomb.pov                    |   42 +
 pov/bombexplosion.pov           |   55 ++
 pov/bonus-machine.pov           |   59 ++
 pov/bonus.inc                   |   35 +
 pov/bonus0.pov                  |    3 +
 pov/bonus1.pov                  |    3 +
 pov/bonus2.pov                  |    3 +
 pov/bonus3.pov                  |    3 +
 pov/bonus4.pov                  |    3 +
 pov/bonus5.pov                  |    3 +
 pov/bonus6.pov                  |   31 +
 pov/bonus7.pov                  |   79 ++
 pov/bullet.pov                  |   18 +
 pov/cannon-left.pov             |   15 +
 pov/cannon-right.pov            |   15 +
 pov/cannon-turn.pov             |   19 +
 pov/cannon.inc                  |  257 ++++++
 pov/cannonball.pov              |   20 +
 pov/cloud.pov                   |   36 +
 pov/direxpl.pov                 |   38 +
 pov/dust.pov                    |   32 +
 pov/energymeter.pov             |   35 +
 pov/fire.pov                    |   51 ++
 pov/firebomb.pov                |   80 ++
 pov/fun.inc                     |   21 +
 pov/fun.ps                      |  878 +++++++++++++++++++
 pov/gauge.pov                   |  130 +++
 pov/hangar.pov                  |  163 ++++
 pov/hills.pov                   |   74 ++
 pov/hills_hf.pov                |   31 +
 pov/hindenberg.pov              |  149 ++++
 pov/man.pov                     |  222 +++++
 pov/mark.pov                    |   19 +
 pov/missile.pov                 |   49 ++
 pov/parachute.inc               |   78 ++
 pov/plane.pov                   |  118 +++
 pov/scene.inc                   |   42 +
 pov/scene.inc.diff              |   14 +
 pov/smoke.pov                   |   50 ++
 pov/ufo.pov                     |   42 +
 pov/zeppelin-left.pov           |    3 +
 pov/zeppelin-right.pov          |    3 +
 pov/zeppelin-turn-lr.pov        |    3 +
 pov/zeppelin-turn-rl.pov        |    3 +
 pov/zeppelin-wreck.pov          |   78 ++
 pov/zeppelin.inc                |  141 ++++
 pov/zeppelin.pov                |   78 ++
 src/Makefile                    |   30 +
 src/airstrike.c                 |  685 +++++++++++++++
 src/airstrike.h                 |   22 +
 src/config.c                    |   80 ++
 src/config.h                    |   34 +
 src/control.c                   |  166 ++++
 src/control.h                   |   26 +
 src/level.c                     |   19 +
 src/level.h                     |   19 +
 src/mech.c                      |  527 ++++++++++++
 src/mech.h                      |   66 ++
 src/players.c                   |   51 ++
 src/players.h                   |   22 +
 src/signals.h                   |   71 ++
 src/sound.c                     |  147 ++++
 src/sound.h                     |   72 ++
 src/sprite/README               |   16 +
 src/sprite/animation.c          |  133 +++
 src/sprite/bitmask.c            |  546 ++++++++++++
 src/sprite/bitmask.h            |  172 ++++
 src/sprite/bitmask.s            | 1773 +++++++++++++++++++++++++++++++++++++++
 src/sprite/dirty.c              |  203 +++++
 src/sprite/dirty.h              |   25 +
 src/sprite/global.c             |  233 +++++
 src/sprite/refcount.h           |   19 +
 src/sprite/sdlutils.c           |  238 ++++++
 src/sprite/sprite.c             |  555 ++++++++++++
 src/sprite/sprite.h             |  277 ++++++
 src/sprite/utils.h              |    8 +
 src/sprite_types.c              |   30 +
 src/sprite_types.h              |   60 ++
 src/sprite_types/README         |    9 +
 src/sprite_types/airballoon.c   |   73 ++
 src/sprite_types/biplane.c      |  274 ++++++
 src/sprite_types/bird.c         |  172 ++++
 src/sprite_types/blueplane.c    |  277 ++++++
 src/sprite_types/bomb.c         |   74 ++
 src/sprite_types/bonus.h        |   43 +
 src/sprite_types/bonusmachine.c |  232 +++++
 src/sprite_types/bouncer.c      |  101 +++
 src/sprite_types/bullet.c       |   96 +++
 src/sprite_types/cannon.c       |  181 ++++
 src/sprite_types/cloud.c        |   44 +
 src/sprite_types/dust.c         |  146 ++++
 src/sprite_types/energymeter.c  |   80 ++
 src/sprite_types/explosions.c   |   46 +
 src/sprite_types/fire.c         |   39 +
 src/sprite_types/hangar.c       |   71 ++
 src/sprite_types/mark.c         |   45 +
 src/sprite_types/message.c      |  129 +++
 src/sprite_types/missile.c      |  122 +++
 src/sprite_types/parachute.c    |   81 ++
 src/sprite_types/puff.c         |   60 ++
 src/sprite_types/smoke.c        |   41 +
 src/sprite_types/zeppelin.c     |  138 +++
 src/sprites_autogen.h           |   36 +
 src/sprites_autogen.inc         |   35 +
 src/support/README              |    1 +
 src/support/console.c           |  103 +++
 src/support/console.h           |   18 +
 src/support/fixnum.h            |   10 +
 src/support/maths.c             |   90 ++
 src/support/maths.h             |   66 ++
 src/support/names.c             |  159 ++++
 src/support/names.h             |   32 +
 src/support/particles.h         |   16 +
 src/support/particles.ne        |   53 ++
 src/support/text.c              |  138 +++
 src/support/text.h              |   46 +
 src/winds.c                     |  242 ++++++
 src/winds.h                     |   37 +
 utils/Makefile                  |   14 +
 utils/README                    |   29 +
 utils/blur.sh                   |   14 +
 utils/genspritelist.sh          |   37 +
 utils/hfsmooth.c                |   84 ++
 utils/showanim.c                |  171 ++++
 224 files changed, 18063 insertions(+)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/airstrike.git



More information about the Pkg-games-commits mailing list