0.24.0 update.

.gitignore

@@ -0,0 +1,2 @@
+.cquery_cache/
+.DS_Store

.mailmap

@@ -36,7 +36,7 @@ galehar <raphael.langella@gmail.com>
 galehar <Raphael@.(none)>
 elliptic <hyperelliptical@gmail.com>
 edlothiol <flodiebold@gmail.com>
-MarvinPA <chriscampbell89@gmail.com>
+kate- <601195+semitonal@users.noreply.github.com>
 SamB <naesten@gmail.com>
 |amethyst <neil@s-z.org>
 dolorous <dolorous@users.sourceforge.net>
@@ -62,6 +62,7 @@ Sage <Immotian@yahoo.com>
 Sage <SageBasilMint@gmail.com>
 gammafunk <gammafunk@gmail.com>
 wheals <shm.mark@gmail.com>
+wheals <whealswithinwheals@gmail.com>
 reaverb <address.auto@gmail.com>
 reaverb <reaverb.Crawl@gmail.com>
 N78291 <N78291@gmail.com>
@@ -176,3 +177,4 @@ Yermak <33148474+Mindcrafter@users.noreply.github.com>
 EMTedronai <emtedronai@gmail.com>
 Alcon <jonathonnooner@gmail.com>
 Patashu <Timothy.Stiles@wisetechglobal.com>
+gmarks <marksg07@gmail.com>

.travis.yml

@@ -1,36 +1,107 @@
 language: cpp
+dist: xenial
 compiler:
-    - clang
     - gcc
+    - clang
+cache: ccache
 sudo: required
-before_install:
-    - sudo apt-get update --option Acquire::Retries=100 --option Acquire::http::Timeout="60"
-    - perl .travis/apt.pl
-    - if [ "$CXX" = "g++" ]; then export CXX="g++-4.7" CC="gcc-4.7"; fi
+addons:
+    apt:
+        update: true
+        retries: true
+        packages: &basic_deps
+            - xorg-dev
+            - python3-yaml
+            - liblua5.1-0-dev # strictly speaking, only BUILD_ALL builds
+            - liblua5.1-0-dbg
+            - gdb
+
 env:
-    - NOTHING=1
-    - UNBRACE=1
-    - CHECKWHITE=1
-    - FULLDEBUG=1
-    - TILES=1
-    - TILES=1 FULLDEBUG=1
-    - WEBTILES=1
-    - WEBTILES=1 FULLDEBUG=1
-    - USE_DGAMELAUNCH=1 EXTERNAL_DEFINES=-UTOURNEY
-    - USE_DGAMELAUNCH=1 WEBTILES=1 EXTERNAL_DEFINES=-UTOURNEY
-    - TILES=1 BUILD_ALL=1
-    - WEBTILES=1 BUILD_ALL=1
-    - CROSSCOMPILE=1
+    global:
+        - CCACHE_CPP2=yes
+    matrix: # anything here is fully crossed with compilers, uses *basic_deps
+        - NOTHING=1
+        - FULLDEBUG=1
+        - WEBTILES=1 FULLDEBUG=1
+
 git:
     submodules: false
+
+# the rest of the build matrix, specifying each combo directly. Anything
+# without explicit addons here will uses *basic_deps above, and any addons list
+# overrides the global one.
 matrix:
-    exclude:
+    include:
+        # lint-type checks
+        - env: CHECKWHITE=1
+          addons: {apt: {packages: [] }}
+        - env: UNBRACE=1
+          addons: {apt: {packages: [] }}
+        # the rest of the actual builds.
+        - compiler: gcc
+          env: WEBTILES=1
+        - compiler: gcc
+          env: WEBTILES=1 BUILD_ALL=1
+        - compiler: gcc
+          env: TILES=1
+          addons:
+            apt:
+                packages:
+                    - *basic_deps
+                    - &sdl_deps [libegl1-mesa-dev, libgles2-mesa-dev, libsdl2-dev, libsdl2-image-dev, libsdl2-mixer-dev]
         - compiler: clang
-          env: UNBRACE=1
+          env: TILES=1
+          addons:
+            apt:
+                packages:
+                    - *basic_deps
+                    - *sdl_deps
+        - compiler: gcc
+          env: TILES=1 FULLDEBUG=1
+          addons:
+            apt:
+                packages:
+                    - *basic_deps
+                    - *sdl_deps
         - compiler: clang
-          env: CHECKWHITE=1
+          env: TILES=1 FULLDEBUG=1
+          addons:
+            apt:
+                packages:
+                    - *basic_deps
+                    - *sdl_deps
+        - compiler: gcc
+          env: TILES=1 BUILD_ALL=1
+          addons:
+            apt:
+                packages:
+                    - *basic_deps
+                    - &sdl_buildall_deps [libegl1-mesa-dev, mesa-common-dev, libglu1-mesa-dev, libasound2-dev, libxss-dev]
         - compiler: clang
-          env: CROSSCOMPILE=1
+          env: TILES=1 BUILD_ALL=1
+          addons:
+            apt:
+                packages:
+                    - *basic_deps
+                    - *sdl_buildall_deps
+        - env: CROSSCOMPILE=1
+          addons:
+            apt:
+                packages:
+                    - mingw-w64
+                    - binutils-mingw-w64
+                    - g++-mingw-w64-i686
+                    - gcc-mingw-w64-i686
+                    - nsis
+                    - *sdl_buildall_deps
+        - compiler: gcc
+          env: USE_DGAMELAUNCH=1 EXTERNAL_DEFINES=-UTOURNEY
+        - compiler: gcc
+          env: USE_DGAMELAUNCH=1 WEBTILES=1 EXTERNAL_DEFINES=-UTOURNEY
+
+before_install:
+    - if [ "$TRAVIS_OS_NAME" == "linux" ]; then if [ "$CC" == "clang" ]; then sudo ln -s `which ccache` /usr/lib/ccache/clang; fi; fi
+    - if [ "$TRAVIS_OS_NAME" == "linux" ]; then if [ "$CXX" == "clang++" ]; then sudo ln -s `which ccache` /usr/lib/ccache/clang++; fi; fi
 install: perl .travis/deps.pl
 script: perl .travis/build.pl
 notifications:

.travis/deps.pl

@@ -2,34 +2,12 @@
 use strict;
 use warnings;
 
-my @deps = qw(
-    gdb
-);
-
+# this file used to do a bunch of apt stuff, but that's now all done in the
+# travis build matrix.
 if ($ENV{BUILD_ALL} || $ENV{CROSSCOMPILE}) {
     retry(qw(git fetch --unshallow));
     retry(qw(git submodule update --init --recursive));
-
-    push @deps, qw(
-       libegl1-mesa-dev
-       libasound2-dev
-       libxss-dev
-    );
 }
-else {
-    push @deps, qw(
-        liblua5.1-0-dev
-        liblua5.1-0-dbg
-    );
-
-    push @deps, qw(
-        libsdl2-dev
-        libsdl2-image-dev
-        libsdl2-mixer-dev
-    ) if $ENV{TILES} || $ENV{WEBTILES};
-}
-
-retry(qw(sudo apt-get install), @deps);
 
 sub retry {
     my (@cmd) = @_;

LICENSE

@@ -18,7 +18,7 @@ These include:
 	   resize-observer-polyfill, and scrollbarwidth
        worley.{cc,h}
 * zlib: webserver/static/scripts/contrib/inflate.js
-* Apache v2: pcg.cc
+* Apache v2, MIT (see comments in the file for details): pcg.cc
 
 The majority of Crawl's tiles and artwork are released under the CC0 license
 (https://creativecommons.org/publicdomain/zero/1.0/), and new submissions are

crawl-ref/CREDITS.txt

@@ -105,6 +105,7 @@
     Matthew Boeh
     Mike Boutin
     John Boyle
+    Josh Braden
     Daniel Mark Brownrigg
     Andre Bubel
     Trent W. Buck
@@ -119,11 +120,13 @@
     Thom Chiovoloni
     Anthony Chuah
     Henry Cipolla
+    CollinJ
     Nicholas Connelly
     Tom Conrad
     Vitor 'Baconkid' Costa
     Aaron Curtis
     Simon Curtis
+    cut1less
     Paul Dejean
     Denzi
     Lothar Dierkes
@@ -140,6 +143,7 @@
     Micha Elsner
     Carl-Oscar Erneholm
     Erich Erstu
+    Higor Eurípedes
     Christopher Evenstar
     Floodkiller
     floraline
@@ -188,6 +192,7 @@
     Vesa Kivimäki
     Daniel Klein
     Jon Knapp
+    Quinten Konyn
     Ilkka Koskela
     infiniplex
     Vambola Kotkas
@@ -197,6 +202,7 @@
     Lorenzo Lami
     Lantier
     Maciej Lapinski
+    Nikolai Lavsky
     Lamil Lerran
     Jordan Lewis
     Sami Liedes
@@ -215,6 +221,7 @@
     Paul Maloney
     Pablo Mansanet
     Wille Mäntylä
+    Gabriel Marks
     Jean Martel
     James 'Eronarn' Meickle
     Jacob Meigs
@@ -231,9 +238,9 @@
     Naruni
     neofelis
     nicolae
-    Nikolai Lavsky
     Jonathon Nooner
     NormalPerson7
+    Michael Nowack
     Erkki Nurmi
     Mattias Nyberg
     nyra
@@ -257,14 +264,17 @@
     Iago Porto
     psywombats
     pubby
+    Ashley Elizabeth Raine
     Edward Randtke
     Derek Ray
     RealzHS
     Terence Reeves
     Tobias Rehbein
     Remsleep
+    Chris Rendle-Short
     Ryan Riegel
     RjY
+    rmcneive
     Andy Roche
     rockygargoyle
     Will Rogers
@@ -274,6 +284,7 @@
     Sebastian Salman
     Sandman25
     Brett Scarborough
+    sdynet
     Roman Sêk
     Brennan Shacklett
     ShadyAmish
@@ -284,7 +295,6 @@
     Robert Shimmin
     Sigurd
     Edgar Simo
-    Skrybe
     Alex Smith
     Keanan Smith
     Richard Soderberg
@@ -297,6 +307,7 @@
     Jan 'heftig' Steffens
     Stenella
     Timothy Stiles
+    John Stilley
     Johan Strandell
     Ben Striegel
     Derrick Sund
@@ -309,8 +320,10 @@
     Jared 'Twinge' Tinney
     Matt Titus
     Tommy
+    Sean VanMeter
     Mikko Vepsäläinen
     WanderingBlade
+    Richard Wardin
     waylon531
     Steven Wheeler
     Thomas Willem
@@ -335,7 +348,7 @@ The Dungeon Crawl Stone Soup development team is:
     Corin Buchanan-Howland
     James Bulgin
     Robert Burnham
-    Chris Campbell
+    Kate Campbell
     Matthew Cline
     Florian Diebold
     Rax E. Dillon