[eureka] 02/06: Merge tag 'upstream/1.21'

Fabian Greffrath fabian at moszumanska.debian.org
Wed Mar 8 21:01:03 UTC 2017


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

fabian pushed a commit to branch master
in repository eureka.

commit 59b0b062b6bb748eb23ca6b64241529b463ed78e
Merge: b32ae23 f6c7a38
Author: Fabian Greffrath <fabian at debian.org>
Date:   Wed Mar 8 21:34:58 2017 +0100

    Merge tag 'upstream/1.21'
    
    Upstream version 1.21

 CHANGES.txt                                        |  133 +-
 INSTALL.txt                                        |    1 +
 Makefile                                           |   56 +-
 Makefile.xming                                     |   59 +-
 README.txt                                         |   77 +-
 TODO.txt                                           |  346 +-
 bindings.cfg                                       |  202 +-
 CHANGES.txt => changelogs/111.txt                  |    0
 common/doom_colors.ugh                             |    1 +
 games/freedoom2.ugh => common/doom_groups.ugh      |   24 +-
 common/doom_specials.ugh                           |   90 +-
 common/doom_things.ugh                             |    2 +
 games/freedoom2.ugh => common/hexen_groups.ugh     |   22 +-
 common/hexen_specials.ugh                          |  148 +
 common/xlat_doom.cfg                               |    8 -
 common/xlat_hexen.cfg                              |    8 -
 defaults.cfg                                       |   59 +
 docs/History.txt                                   | 5497 ++++++++++++++++++++
 docs/MiscNotes.txt                                 |  138 -
 games/doom.ugh                                     |    5 +-
 games/doom2.ugh                                    |    5 +-
 games/freedoom1.ugh                                |    4 +-
 games/freedoom2.ugh                                |    4 +-
 games/hacx.ugh                                     |    9 +-
 games/harm1.ugh                                    |  162 +
 games/heretic.ugh                                  |   70 +-
 games/hexen.ugh                                    |  165 +-
 games/plutonia.ugh                                 |    6 +-
 games/strife1.ugh                                  |  651 +++
 games/tnt.ugh                                      |    6 +-
 glbsp_src/analyze.cc                               | 1135 ----
 glbsp_src/analyze.h                                |   66 -
 glbsp_src/blockmap.cc                              |  622 ---
 glbsp_src/blockmap.h                               |   48 -
 glbsp_src/glbsp.cc                                 |  597 ---
 glbsp_src/glbsp.h                                  |  295 --
 glbsp_src/level.cc                                 | 1738 -------
 glbsp_src/level.h                                  |  424 --
 glbsp_src/node.cc                                  | 1392 -----
 glbsp_src/node.h                                   |   89 -
 glbsp_src/reject.cc                                |  226 -
 glbsp_src/seg.cc                                   | 1248 -----
 glbsp_src/seg.h                                    |  118 -
 glbsp_src/structs.h                                |  258 -
 glbsp_src/system.cc                                |  315 --
 glbsp_src/system.h                                 |   80 -
 glbsp_src/util.cc                                  |  299 --
 glbsp_src/util.h                                   |  103 -
 glbsp_src/wad.cc                                   | 1746 -------
 glbsp_src/wad.h                                    |  257 -
 misc/eureka.6                                      |    2 +-
 misc/pack-source.sh                                |    8 +-
 misc/pack-win32.sh                                 |    7 +-
 misc/wiki/eureka.css                               |  159 +
 misc/wiki/eureka.tmpl                              |   69 +
 misc/wiki/money_shot.png                           |  Bin 0 -> 131330 bytes
 operations.cfg                                     |   97 +
 osx/Eureka Doom Editor.xcodeproj/project.pbxproj   |   13 +-
 osx/EurekaApp/Eureka Doom Editor-Info.plist        |    6 +-
 .../Eureka Doom EditorTests-Info.plist             |    2 +-
 ports/boom.ugh                                     |   65 +-
 ports/edge.ugh                                     |  115 +-
 ports/eternity.ugh                                 |   50 +-
 ports/legacy.ugh                                   |   69 +-
 common/doom_colors.ugh => ports/mbf.ugh            |   26 +-
 ports/odamex.ugh                                   |    9 +-
 ports/vanilla.ugh                                  |   28 +-
 ports/xdoom.ugh                                    |    2 +
 ports/zdoom.ugh                                    |  510 ++
 src/bsp.h                                          |  807 +++
 src/bsp_level.cc                                   | 2700 ++++++++++
 src/bsp_node.cc                                    | 2280 ++++++++
 src/bsp_util.cc                                    |  894 ++++
 src/e_basis.cc                                     |  138 +-
 src/e_basis.h                                      |   39 +-
 src/e_checks.cc                                    | 2380 ++++++++-
 src/e_checks.h                                     |    4 +-
 src/e_checks2.cc                                   | 2073 --------
 src/e_commands.cc                                  | 1641 ++++++
 src/e_cutpaste.cc                                  |  298 +-
 src/e_cutpaste.h                                   |   17 +-
 src/{x_hover.cc => e_hover.cc}                     |  650 ++-
 src/{x_hover.h => e_hover.h}                       |   53 +-
 src/e_linedef.cc                                   | 1272 +++--
 src/e_linedef.h                                    |   28 +-
 src/{levels.cc => e_main.cc}                       |  545 +-
 src/{levels.h => e_main.h}                         |  134 +-
 src/e_nodes.cc                                     |  439 --
 src/e_objects.cc                                   | 2228 ++++++++
 src/{objects.h => e_objects.h}                     |   63 +-
 src/e_path.cc                                      |  215 +-
 src/e_path.h                                       |   18 +-
 src/e_sector.cc                                    |  957 +++-
 src/e_sector.h                                     |   96 +-
 src/e_things.cc                                    |   38 +-
 src/e_things.h                                     |    8 +-
 src/e_vertex.cc                                    |  493 +-
 src/e_vertex.h                                     |   22 +-
 src/editloop.cc                                    | 1864 -------
 src/editloop.h                                     |  161 -
 src/hdr_fltk.h                                     |    1 +
 src/im_arrows.cc                                   |  138 -
 src/im_color.cc                                    |  140 +-
 src/im_color.h                                     |   24 +-
 src/im_img.cc                                      |  592 ++-
 src/im_img.h                                       |   87 +-
 src/lib_adler.cc                                   |    2 +-
 src/lib_file.cc                                    |   45 +-
 src/lib_file.h                                     |    1 +
 src/lib_tga.cc                                     |  403 ++
 glbsp_src/reject.h => src/lib_tga.h                |   25 +-
 src/lib_util.cc                                    |  281 +-
 src/lib_util.h                                     |   11 +-
 src/m_bitvec.h                                     |    4 +
 src/m_config.cc                                    |  379 +-
 src/m_config.h                                     |   39 +-
 src/m_events.cc                                    |  974 ++++
 src/m_events.h                                     |   89 +
 src/m_files.cc                                     |  190 +-
 src/m_files.h                                      |   15 +-
 src/m_game.cc                                      | 1129 ++--
 src/m_game.h                                       |   82 +-
 src/m_keys.cc                                      |  329 +-
 src/m_keys.h                                       |   48 +-
 src/{e_loadsave.cc => m_loadsave.cc}               |  820 +--
 src/{e_loadsave.h => m_loadsave.h}                 |   29 +-
 src/m_nodes.cc                                     |  500 ++
 src/{e_nodes.h => m_nodes.h}                       |    5 +-
 src/m_select.cc                                    |   24 +-
 src/m_select.h                                     |    2 +
 src/m_testmap.cc                                   |  487 ++
 src/main.cc                                        |  321 +-
 src/main.h                                         |   32 +-
 misc/eureka.rc => src/main.rc                      |    8 +-
 src/objects.cc                                     | 1539 ------
 src/objid.h                                        |   66 +-
 src/r_grid.cc                                      |  256 +-
 src/r_grid.h                                       |   76 +-
 src/r_render.cc                                    | 2242 +++++---
 src/r_render.h                                     |   43 +-
 src/sys_debug.cc                                   |    4 +-
 src/sys_macro.h                                    |    2 +-
 src/sys_type.h                                     |    2 +-
 src/ui_about.cc                                    |   26 +-
 src/ui_about.h                                     |    4 +-
 src/ui_browser.cc                                  |  187 +-
 src/ui_browser.h                                   |   22 +-
 src/ui_canvas.cc                                   |  614 ++-
 src/ui_canvas.h                                    |   34 +-
 src/ui_default.cc                                  |  230 +-
 src/ui_default.h                                   |   30 +-
 src/ui_file.cc                                     |  482 +-
 src/ui_file.h                                      |   73 +-
 src/ui_infobar.cc                                  |   19 +-
 src/ui_linedef.cc                                  |  235 +-
 src/ui_linedef.h                                   |   18 +-
 src/ui_menu.cc                                     |  372 +-
 src/ui_misc.cc                                     |  139 +-
 src/ui_misc.h                                      |   35 +-
 src/ui_nodes.cc                                    |  207 -
 src/ui_nodes.h                                     |   72 -
 src/ui_nombre.cc                                   |    9 +-
 src/ui_pic.cc                                      |  154 +-
 src/ui_pic.h                                       |   46 +-
 src/ui_prefs.cc                                    |  922 ++--
 src/ui_replace.cc                                  |  269 +-
 src/ui_replace.h                                   |   21 +-
 src/ui_scroll.cc                                   |   19 +-
 src/ui_scroll.h                                    |    9 +-
 src/ui_sector.cc                                   |  286 +-
 src/ui_sector.h                                    |   48 +-
 src/ui_sidedef.cc                                  |  125 +-
 src/ui_sidedef.h                                   |   18 +-
 src/ui_thing.cc                                    |  144 +-
 src/ui_thing.h                                     |   38 +-
 src/ui_vertex.cc                                   |   95 +-
 src/ui_vertex.h                                    |    6 +
 src/ui_window.cc                                   |  196 +-
 src/ui_window.h                                    |   28 +-
 src/w_flats.cc                                     |  114 -
 src/w_flats.h                                      |   41 -
 src/w_loadpic.cc                                   |  142 +-
 src/w_loadpic.h                                    |   19 +-
 src/w_rawdef.h                                     |  162 +-
 src/w_sprite.cc                                    |  223 -
 src/w_sprite.h                                     |   39 -
 src/w_texture.cc                                   |  807 ++-
 src/w_texture.h                                    |   32 +-
 src/w_wad.cc                                       |  250 +-
 src/w_wad.h                                        |   64 +-
 src/x_loop.cc                                      |  759 ---
 src/x_loop.h                                       |  104 -
 src/x_mirror.cc                                    | 1054 ----
 src/x_mirror.h                                     |   71 -
 194 files changed, 36982 insertions(+), 26423 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