5 Commits

Author SHA1 Message Date
cora
d201dcca1b goddess mode: detect splash potions, core: new font test 2021-08-28 23:01:08 -05:00
cron
2454a8f496 Merge dragonfire changes
Replicate the following commit (with cherry-picked parents on left
side):

    commit 106fab976209f15ee2120b169f9757fd458935cd
    Merge: 7652a30c7 0a2c90f4c
    Author:     cron <example@example.local>
    AuthorDate: Mon Oct 5 22:43:01 2020 +0000
    Commit:     cron <example@example.local>
    CommitDate: Mon Oct 5 22:43:01 2020 +0000

	Merge dragonfire changes
2021-08-28 22:30:52 -05:00
flyc0r
2551ddbf1d Add changes from waspsaliva initial commit
This commit contains changes best credited to flyc0r
<flyc0r@localhost.localdomain>, although the changes were separated
out from waspsaliva's original initial commit rev. 0e9e1f352, which
added the files from DFC work tree, and squashed in numerous additions
by flyc0r and collaborators.  That commit log:

    commit 0e9e1f3528c3d2fa1f1e9a79d4a00576be8552f5
    Author: flyc0r <flyc0r@localhost.localdomain>
    Date:   Sun Oct 4 03:37:08 2020 +0200

        init

This rebase had the effect of griefing the git history xD, so
for example `git blame` of DFC and even upstream Minetest sources
appear to be originally authored by `flyc0r` in that commit.

To fix this, I will recommit only the changes onto the appropriate
commit in DFC, and recreate the following git history (incl. merges).
After this, the git history will be at least visually the same as the
original Waspsaliva, even if commit sha1sums have changed.

AFAICT, the closest commit from DFC was af085acbd.  That commit was
found simply by running `git diff wsc-master <some_DFC_rev>`, and
locating the commit with the smallest number of differences.

This commit was then created as follows:

    # Check out the DFC base commit
    git checkout af085acbd
    # Check out the *files* from WSC's initial commit
    git checkout 0e9e1f352 -- .
    # Make sure everything is added and commit the changes
    git add -A
    git commit
2021-08-28 21:58:59 -05:00
Elias Fleckenstein
305e0e0d31 Auto disable smooth lighting when fullbright is active 2020-07-16 15:36:39 +02:00
Auke Kok
eb49009d02 FreeType: address font license issues (#5230)
It appears we were shipping font files without license text, and I
had my doubts about the bitmap fonts being usable directly.

This replaces existing TTF fonts with Apache-2.0 licensed fonts from
chome core (Cousine, Arimo, Tinos). Include the full license file
for all three fonts.

The Lucida Sans font bitmap is removed entirely for non-freetype
builds. There is therefore only mono fonts for non-freetype builds.
2017-02-14 01:08:17 -08:00