Commit Graph

15 Commits

Author SHA1 Message Date
Julian Hinxlage 250e594f24 Merge branch 'dev1' into dev
# Conflicts:
#	main/main.cpp
2019-11-28 11:46:43 +01:00
Shaohua Tong ab2d13f6bb add Bold and underline in TextRenderer 2019-11-20 12:50:32 +01:00
Julian Hinxlage f9aa3e35b0 fixed config
added toml(again)
fixed init
2019-11-19 13:47:30 +01:00
Julian Hinxlage 26c7fa69c4 added profont-IIx font 2019-11-19 13:28:48 +01:00
my c9cba998dc String Umsetzung und DriiteFont finished. 2019-11-19 13:27:18 +01:00
my 4a08c433ad defination of Font and Block interface. 2019-11-14 13:12:48 +01:00
Julian Hinxlage 01c825a2f8 ~ fixed second font 2019-10-29 13:24:09 +01:00
Julian Hinxlage 95f394ce58 ~ changed toml config file for font2 2019-10-24 12:15:07 +02:00
Julian Hinxlage 566bfee91e + second font 2019-10-23 13:39:51 +02:00
Julian Hinxlage 4b1afac94d + Font Config File
+ toml
2019-10-23 13:03:16 +02:00
my 7867920df6 only for test 2019-10-16 12:12:24 +02:00
my e3b31abd95 only for test 2019-10-16 12:11:47 +02:00
my ac099afd10 only for test 2019-10-16 12:11:03 +02:00
my 326e24b40b only for test 2019-10-16 12:07:44 +02:00
Julian Hinxlage 4841423c79 added font Bitmap 2019-10-15 16:15:48 +02:00