Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow user to change fonts #1236

Merged
merged 39 commits into from
May 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
cc9ce62
Start on font selection
chreden Apr 28, 2024
a99de6e
Save and load settings
chreden Apr 28, 2024
35f98bb
Slight tidying, sorting
chreden Apr 28, 2024
9cfcba5
Update nulls/mocks
chreden Apr 28, 2024
d55caa6
Try to adjust triggers window columns
chreden Apr 28, 2024
b77e86f
Fix sizing for the triggers window
chreden Apr 29, 2024
bd8b32d
Add item window column scaling
chreden Apr 29, 2024
dad845d
Fix item and triggers columns
chreden Apr 30, 2024
dc09211
Rooms window resizing
chreden Apr 30, 2024
168503f
More resize tweaking
chreden Apr 30, 2024
5ffa52f
Update lights window
chreden Apr 30, 2024
5f82ccd
Remove the X button on save in route window
chreden May 1, 2024
388cf1a
Freetype using vcpkg
chreden May 4, 2024
a083790
Add freetype
chreden May 4, 2024
8d9a571
Reference freetype
chreden May 4, 2024
dcff7d1
Load user fonts too
chreden May 4, 2024
26a6ba9
License
chreden May 4, 2024
363afe1
Get ui tests running with freetype
chreden May 4, 2024
99fb522
Output to bin instead of obj
chreden May 4, 2024
9436a37
Fix other test project build
chreden May 4, 2024
c49bd65
Delete accidentally added files
chreden May 4, 2024
10f719f
Remove dlgcopy from freetype project
chreden May 4, 2024
6e113ae
Rename x86 to win32 in project
chreden May 4, 2024
7c36483
Start on new fonts interface
chreden May 5, 2024
ddcc2b6
Update tests
chreden May 5, 2024
c195646
Move more font setup into the fonts class
chreden May 5, 2024
079ff94
Use font manager for console font
chreden May 5, 2024
e4b21e4
Rename to Default and Console fonts
chreden May 6, 2024
e173891
Allow setting mutliple fonts
chreden May 8, 2024
efb62fd
Alignment
chreden May 8, 2024
70e82c8
Default fonts button
chreden May 8, 2024
c92a975
Remove vcpkg files
chreden May 8, 2024
845b22b
Add test for reset fonts menu option
chreden May 8, 2024
d77b4b1
Update the about box
chreden May 8, 2024
2dbcd06
Add a test for settings loader
chreden May 8, 2024
da59ef8
Update stdafx.h
chreden May 9, 2024
ac61cc7
More tests
chreden May 9, 2024
ff3fc68
Remove stb reference
chreden May 9, 2024
3f7d781
Merge branch 'master' into issue/970
chreden May 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
15 changes: 13 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -936,7 +936,7 @@ https://github.com/ocornut/imgui

The MIT License (MIT)

Copyright (c) 2014-2022 Omar Cornut
Copyright (c) 2014-2024 Omar Cornut

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -954,4 +954,15 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
SOFTWARE.

## FreeType

https://github.com/freetype/freetype

[The FreeType Project LICENSE](external/freetype/FTL.txt)



Portions of this software are copyright © 2023 The FreeType
Project (www.freetype.org). All rights reserved.
169 changes: 169 additions & 0 deletions external/freetype/FTL.TXT
Original file line number Diff line number Diff line change
@@ -0,0 +1,169 @@
The FreeType Project LICENSE
----------------------------

2006-Jan-27

Copyright 1996-2002, 2006 by
David Turner, Robert Wilhelm, and Werner Lemberg



Introduction
============

The FreeType Project is distributed in several archive packages;
some of them may contain, in addition to the FreeType font engine,
various tools and contributions which rely on, or relate to, the
FreeType Project.

This license applies to all files found in such packages, and
which do not fall under their own explicit license. The license
affects thus the FreeType font engine, the test programs,
documentation and makefiles, at the very least.

This license was inspired by the BSD, Artistic, and IJG
(Independent JPEG Group) licenses, which all encourage inclusion
and use of free software in commercial and freeware products
alike. As a consequence, its main points are that:

o We don't promise that this software works. However, we will be
interested in any kind of bug reports. (`as is' distribution)

o You can use this software for whatever you want, in parts or
full form, without having to pay us. (`royalty-free' usage)

o You may not pretend that you wrote this software. If you use
it, or only parts of it, in a program, you must acknowledge
somewhere in your documentation that you have used the
FreeType code. (`credits')

We specifically permit and encourage the inclusion of this
software, with or without modifications, in commercial products.
We disclaim all warranties covering The FreeType Project and
assume no liability related to The FreeType Project.


Finally, many people asked us for a preferred form for a
credit/disclaimer to use in compliance with this license. We thus
encourage you to use the following text:

"""
Portions of this software are copyright © <year> The FreeType
Project (www.freetype.org). All rights reserved.
"""

Please replace <year> with the value from the FreeType version you
actually use.


Legal Terms
===========

0. Definitions
--------------

Throughout this license, the terms `package', `FreeType Project',
and `FreeType archive' refer to the set of files originally
distributed by the authors (David Turner, Robert Wilhelm, and
Werner Lemberg) as the `FreeType Project', be they named as alpha,
beta or final release.

`You' refers to the licensee, or person using the project, where
`using' is a generic term including compiling the project's source
code as well as linking it to form a `program' or `executable'.
This program is referred to as `a program using the FreeType
engine'.

This license applies to all files distributed in the original
FreeType Project, including all source code, binaries and
documentation, unless otherwise stated in the file in its
original, unmodified form as distributed in the original archive.
If you are unsure whether or not a particular file is covered by
this license, you must contact us to verify this.

The FreeType Project is copyright (C) 1996-2000 by David Turner,
Robert Wilhelm, and Werner Lemberg. All rights reserved except as
specified below.

1. No Warranty
--------------

THE FREETYPE PROJECT IS PROVIDED `AS IS' WITHOUT WARRANTY OF ANY
KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. IN NO EVENT WILL ANY OF THE AUTHORS OR COPYRIGHT HOLDERS
BE LIABLE FOR ANY DAMAGES CAUSED BY THE USE OR THE INABILITY TO
USE, OF THE FREETYPE PROJECT.

2. Redistribution
-----------------

This license grants a worldwide, royalty-free, perpetual and
irrevocable right and license to use, execute, perform, compile,
display, copy, create derivative works of, distribute and
sublicense the FreeType Project (in both source and object code
forms) and derivative works thereof for any purpose; and to
authorize others to exercise some or all of the rights granted
herein, subject to the following conditions:

o Redistribution of source code must retain this license file
(`FTL.TXT') unaltered; any additions, deletions or changes to
the original files must be clearly indicated in accompanying
documentation. The copyright notices of the unaltered,
original files must be preserved in all copies of source
files.

o Redistribution in binary form must provide a disclaimer that
states that the software is based in part of the work of the
FreeType Team, in the distribution documentation. We also
encourage you to put an URL to the FreeType web page in your
documentation, though this isn't mandatory.

These conditions apply to any software derived from or based on
the FreeType Project, not just the unmodified files. If you use
our work, you must acknowledge us. However, no fee need be paid
to us.

3. Advertising
--------------

Neither the FreeType authors and contributors nor you shall use
the name of the other for commercial, advertising, or promotional
purposes without specific prior written permission.

We suggest, but do not require, that you use one or more of the
following phrases to refer to this software in your documentation
or advertising materials: `FreeType Project', `FreeType Engine',
`FreeType library', or `FreeType Distribution'.

As you have not signed this license, you are not required to
accept it. However, as the FreeType Project is copyrighted
material, only this license, or another one contracted with the
authors, grants you the right to use, distribute, and modify it.
Therefore, by using, distributing, or modifying the FreeType
Project, you indicate that you understand and accept all the terms
of this license.

4. Contacts
-----------

There are two mailing lists related to FreeType:

o [email protected]

Discusses general use and applications of FreeType, as well as
future and wanted additions to the library and distribution.
If you are looking for support, start in this list if you
haven't found anything to help you in the documentation.

o [email protected]

Discusses bugs, as well as engine internals, design issues,
specific licenses, porting, etc.

Our home page can be found at

https://www.freetype.org


--- end of FTL.TXT ---
Loading
Loading