diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-04-12 08:22:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-12 08:22:50 +0200 |
| commit | 04a4e96bf5de4bdbb78a5a016335f09ff9efd100 (patch) | |
| tree | 69032fbe15a49b06a0241f13b077b588d3646ee7 | |
| parent | d87307d850186d27d2c27c5916ec8c4744c14979 (diff) | |
| parent | 93f52813bf62e6b6d0eed9d0fe18b342d23b2aac (diff) | |
Merge pull request #18130 from Calinou/update-hack-font-v3.003
Update Hack font to v3.003
| -rw-r--r-- | COPYRIGHT.txt | 2 | ||||
| -rw-r--r-- | thirdparty/README.md | 6 | ||||
| -rw-r--r-- | thirdparty/fonts/Hack_Regular.ttf | bin | 307420 -> 309408 bytes | |||
| -rw-r--r-- | thirdparty/fonts/LICENSE_Hack.md | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt index 0f421741b1..6b6ee4c509 100644 --- a/COPYRIGHT.txt +++ b/COPYRIGHT.txt @@ -157,7 +157,7 @@ License: OFL-1.1 Files: ./thirdparty/fonts/Hack_Regular.ttf Comment: Hack font -Copyright: 2017, Source Foundry Authors +Copyright: 2018, Source Foundry Authors 2003, Bitstream Inc. License: Expat and Bitstream Vera Fonts Copyright diff --git a/thirdparty/README.md b/thirdparty/README.md index 394d6098b0..2f765a4000 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -89,7 +89,7 @@ Use UI font variant if available, because it has tight vertical metrics and good ### Hack Regular - Upstream: https://github.com/source-foundry/Hack -- Version: 3.000 +- Version: 3.003 - License: MIT + Bitstream Vera License ### DroidSans*.ttf @@ -241,14 +241,14 @@ File extracted from upstream source: - Everything in `lib/` except `minilex.c`, `http2/`, `event-libs/`. - From `misc/` exclude `lws-genhash.c`, `lws-ring.c`, `romfs.{c,h}`, `smtp.c`. - From `plat/` exclude `lws-plat-{esp*,optee}.c`. - - From `server/` exclude `access-log.c`, `cgi.c`, `daemonize.c`, `lws-spa.c`, + - From `server/` exclude `access-log.c`, `cgi.c`, `daemonize.c`, `lws-spa.c`, `peer-limits.c`, `rewrite.c` - Also copy `win32helpers/` from `win32port/` - `mbedtls_wrapper/include/platform/ssl_port.h` has a small change to check for OSX and FreeBSD (missing `malloc.h`). The bug is fixed in upstream master via `LWS_HAVE_MALLOC_H`, but not in the 2.4.1 branch (as the file structure has changed). - You might need to apply the patch in `thirdparty/lws/mbedtls_verify.diff` (port of PR 1215) to future `2.4.x` releases if it does not get cherry picked. -Important: `lws_config.h` and `lws_config_private.h` contains custom +Important: `lws_config.h` and `lws_config_private.h` contains custom Godot build configurations, check them out when updating. ## mbedTLS diff --git a/thirdparty/fonts/Hack_Regular.ttf b/thirdparty/fonts/Hack_Regular.ttf Binary files differindex f342700811..92a90cb06e 100644 --- a/thirdparty/fonts/Hack_Regular.ttf +++ b/thirdparty/fonts/Hack_Regular.ttf diff --git a/thirdparty/fonts/LICENSE_Hack.md b/thirdparty/fonts/LICENSE_Hack.md index ddd23a2b81..08927e504f 100644 --- a/thirdparty/fonts/LICENSE_Hack.md +++ b/thirdparty/fonts/LICENSE_Hack.md @@ -1,4 +1,4 @@ -The work in the Hack project is Copyright 2017 Source Foundry Authors and licensed under the MIT License +The work in the Hack project is Copyright 2018 Source Foundry Authors and licensed under the MIT License The work in the DejaVu project was committed to the public domain. @@ -6,7 +6,7 @@ Bitstream Vera Sans Mono Copyright 2003 Bitstream Inc. and licensed under the Bi ### MIT License -Copyright (c) 2017 Source Foundry Authors +Copyright (c) 2018 Source Foundry Authors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal |