[hyperrogue] 02/30: Merge tag 'upstream/8.3j+dfsg'

[Markus Koschany]

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

apo pushed a commit to branch master
in repository hyperrogue.

commit fc4b3f8396cd18b1512d20a32e9bcbeed0aee240
Merge: 0923ccc 8ed2a2d
Author: Markus Koschany <apo at debian.org>
Date:   Fri Sep 9 22:15:28 2016 +0200

    Merge tag 'upstream/8.3j+dfsg'
    
    Upstream version 8.3j+dfsg
    
    # gpg: Signature made Fri 09 Sep 2016 22:15:26 CEST
    # gpg:                using RSA key D9AD14B9513B51E4
    # 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 -
 DejaVuSans-Bold.ttf                  |   Bin 0 -> 693876 bytes
 LICENSE-ogg-vorbis.txt               |    32 -
 LICENSE-sdl.txt                      |    13 -
 Makefile                             |     4 -
 Makefile.mac                         |     7 -
 Makefile.mgw                         |     5 -
 cell.cpp                             |   195 -
 classes.cpp                          |   401 -
 game.cpp                             |  2280 ----
 graph.cpp                            |  3091 ------
 hyper.cpp                            |   151 -
 hyperrogue-music.txt                 |    79 +-
 hyperrogue.html                      |   107 -
 polygons.cpp                         |  3050 ------
 src/Makefile                         |    18 +
 src/Makefile.mgw                     |    16 +
 src/achievement.cpp                  |   574 +
 src/achievement.h                    |     0
 src/cell.cpp                         |   941 ++
 src/classes.cpp                      |  1511 +++
 src/complex.cpp                      |  2102 ++++
 src/conformal.cpp                    |   660 ++
 src/direntx.c                        |   468 +
 src/direntx.h                        |   143 +
 src/flags.cpp                        |   555 +
 src/game.cpp                         |  5178 +++++++++
 geometry.cpp => src/geometry.cpp     |    32 +-
 src/glew.c                           | 18607 +++++++++++++++++++++++++++++++++
 src/graph.cpp                        |  6344 +++++++++++
 heptagon.cpp => src/heptagon.cpp     |    71 +-
 hr-icon.ico => src/hr-icon.ico       |   Bin
 src/hyper.cpp                        |   343 +
 src/hyper.h                          |   672 ++
 hyper.rc => src/hyper.rc             |    10 +-
 hyperpoint.cpp => src/hyperpoint.cpp |   162 +-
 src/hyperrogue-music.txt             |   102 +
 src/landgen.cpp                      |  4427 ++++++++
 src/langen.cpp                       |   331 +
 src/language-cz.cpp                  |  3855 +++++++
 src/language-data.cpp                | 10251 ++++++++++++++++++
 src/language-de.cpp                  |  2949 ++++++
 src/language-pl.cpp                  |  3772 +++++++
 src/language-ru.cpp                  |  3895 +++++++
 src/language-tr.cpp                  |  2954 ++++++
 src/language.cpp                     |   309 +
 src/mapeditor.cpp                    |  1755 ++++
 src/menus.cpp                        |   796 ++
 src/mtrand.cpp                       |    51 +
 src/mtrand.h                         |   158 +
 src/netgen.cpp                       |   702 ++
 src/orbs.cpp                         |   949 ++
 src/patterngen.cpp                   |   459 +
 src/patterns.cpp                     |  1057 ++
 src/polygons.cpp                     | 10061 ++++++++++++++++++
 src/rug.cpp                          |   697 ++
 src/savepng.c                        |   154 +
 src/savepng.h                        |    45 +
 src/shmup.cpp                        |  2373 +++++
 src/system.cpp                       |  1104 ++
 src/tools.cpp                        |    15 +
 src/yendor.cpp                       |   699 ++
 zeno.css                             |    26 -
 63 files changed, 92373 insertions(+), 9735 deletions(-)

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