[eureka] 02/04: Merge tag 'upstream/1.11'

Fabian Greffrath fabian at moszumanska.debian.org
Sat Jan 30 14:35:52 UTC 2016


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

fabian pushed a commit to branch master
in repository eureka.

commit b80a05fdffa501d0cf466c3cf1a62395ee046b43
Merge: df21e60 8ddaffc
Author: Fabian Greffrath <fabian at debian.org>
Date:   Sat Jan 30 15:21:06 2016 +0100

    Merge tag 'upstream/1.11'
    
    Upstream version 1.11

 AUTHORS.txt                                      |    6 +-
 CHANGES.txt                                      |  148 +-
 Makefile                                         |   10 +-
 Makefile.local                                   |    6 -
 README.txt                                       |   30 +-
 TODO.txt                                         |  195 ++-
 bindings.cfg                                     |   10 +-
 CHANGES.txt => changelogs/107.txt                |    0
 common/doom_colors.ugh                           |   12 +-
 common/doom_specials.ugh                         |    8 +-
 common/doom_things.ugh                           |    6 +-
 common/gen_types.ugh                             |   97 ++
 common/xlat_doom.cfg                             |    8 +
 common/xlat_hexen.cfg                            |    8 +
 docs/History.txt                                 | 1766 +++++++++++++++++++++-
 games/doom.ugh                                   |    2 -
 games/doom2.ugh                                  |    2 -
 games/{freedoom.ugh => freedoom1.ugh}            |    6 +-
 games/{freedoom.ugh => freedoom2.ugh}            |    4 +-
 games/hacx.ugh                                   |    6 +-
 games/heretic.ugh                                |  217 ++-
 games/hexen.ugh                                  | 1020 +++++++++++++
 glbsp_src/node.cc                                |    2 +
 misc/eureka.6                                    |    2 +-
 misc/eureka.desktop                              |    6 +-
 misc/eureka.rc                                   |    8 +-
 misc/pack-source.sh                              |   23 +-
 misc/pack-win32.sh                               |   13 +-
 osx/Eureka Doom Editor.xcodeproj/project.pbxproj |   15 +-
 osx/EurekaApp/AppDelegate.mm                     |    2 +-
 osx/EurekaApp/Eureka Doom Editor-Info.plist      |    6 +-
 ports/boom.ugh                                   |   12 +-
 ports/eternity.ugh                               |  398 +++++
 ports/vanilla.ugh                                |    4 +-
 src/e_checks.cc                                  |  263 +++-
 src/e_checks2.cc                                 |  455 +++++-
 src/e_cutpaste.cc                                |  216 ++-
 src/e_linedef.cc                                 |  102 +-
 src/e_linedef.h                                  |    4 +-
 src/e_loadsave.cc                                |  341 ++++-
 src/e_path.cc                                    |   13 +-
 src/e_sector.cc                                  |  110 +-
 src/e_sector.h                                   |    7 -
 src/e_things.cc                                  |  100 --
 src/e_things.h                                   |    4 -
 src/e_vertex.cc                                  |  184 ++-
 src/e_vertex.h                                   |    5 +-
 src/editloop.cc                                  |  440 ++++--
 src/editloop.h                                   |   33 +-
 src/im_color.cc                                  |   25 +-
 src/im_color.h                                   |    6 +-
 src/im_img.cc                                    |  124 +-
 src/im_img.h                                     |   21 +-
 src/levels.cc                                    |  150 +-
 src/levels.h                                     |    8 +-
 src/m_config.cc                                  |  116 +-
 src/m_config.h                                   |   20 +-
 src/m_files.cc                                   |   23 +-
 src/m_game.cc                                    |  195 ++-
 src/m_game.h                                     |   61 +-
 src/m_keys.cc                                    |    2 +
 src/m_select.cc                                  |   25 +-
 src/m_select.h                                   |    4 +-
 src/main.cc                                      |   28 +-
 src/main.h                                       |    4 +-
 src/objects.cc                                   |  473 +++---
 src/objects.h                                    |   12 +-
 src/objid.h                                      |    5 +
 src/r_grid.cc                                    |   37 +-
 src/r_grid.h                                     |    8 +-
 src/r_render.cc                                  |  123 +-
 src/r_render.h                                   |    4 +-
 src/ui_about.cc                                  |   13 +-
 src/ui_browser.cc                                |  584 ++++++-
 src/ui_browser.h                                 |   65 +-
 src/ui_canvas.cc                                 |  377 ++++-
 src/ui_canvas.h                                  |    7 +-
 src/ui_default.cc                                |   20 +-
 src/ui_default.h                                 |    1 +
 src/ui_infobar.cc                                |   22 +-
 src/ui_infobar.h                                 |    2 +-
 src/ui_linedef.cc                                |  305 +++-
 src/ui_linedef.h                                 |   13 +-
 src/ui_menu.cc                                   |   95 +-
 src/ui_nodes.cc                                  |   11 +-
 src/ui_prefs.cc                                  |   87 +-
 src/ui_replace.cc                                |   46 +-
 src/ui_replace.h                                 |    3 +-
 src/ui_sector.cc                                 |  327 ++--
 src/ui_sector.h                                  |   35 +-
 src/ui_sidedef.cc                                |   67 +-
 src/ui_thing.cc                                  |  537 +++++--
 src/ui_thing.h                                   |   28 +-
 src/ui_tile.cc                                   |   44 +-
 src/ui_tile.h                                    |    6 +
 src/ui_vertex.cc                                 |    8 +-
 src/ui_window.cc                                 |   28 +-
 src/ui_window.h                                  |    3 +-
 src/w_rawdef.h                                   |  206 ++-
 src/w_sprite.cc                                  |   68 +-
 src/w_texture.cc                                 |   30 +-
 src/w_texture.h                                  |    4 +-
 src/x_hover.cc                                   |  193 ++-
 src/x_hover.h                                    |   17 +-
 src/x_loop.cc                                    |    6 +-
 src/x_mirror.cc                                  |   81 +-
 src/x_mirror.h                                   |    6 +-
 107 files changed, 9074 insertions(+), 2080 deletions(-)

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



More information about the Pkg-games-commits mailing list