Commit Graph

91 Commits

Author SHA1 Message Date
Julian Hinxlage d4e8fcfe6c Merge branch 'dev' into 'master'
Final Merge

See merge request link/projekte/ws19/vkvm-new/text-renderer!9
2020-01-09 06:51:25 +00:00
Johannes Theiner c588c9652b ~ use clang instead of g++ 2020-01-08 16:31:54 +00:00
@Nurullah.Damla 8876e04c15 Merge remote-tracking branch 'origin/dev' into dev 2020-01-08 13:14:12 +01:00
@Nurullah.Damla 07a794ea69 add for MACOS 2020-01-08 13:13:55 +01:00
Julian Hinxlage 762f8af5fe Merge branch 'dev' into 'master'
Dev

See merge request link/projekte/ws19/vkvm-new/text-renderer!8
2020-01-08 12:11:18 +00:00
Julian Hinxlage 5858f5c4c3 fixed make error with to_string(enum) 2020-01-08 12:44:35 +01:00
Julian Hinxlage 08b9c26dd1 only show cursor if a cursor character is rendered 2020-01-07 15:59:06 +01:00
Julian Hinxlage 9b593ce231 added Unifont 2020-01-07 15:05:32 +01:00
Julian Hinxlage ecdbb30d3e added cursor 2020-01-07 13:56:27 +01:00
Julian Hinxlage f6b0e7abe7 new text rendering 2020-01-07 13:23:25 +01:00
Johannes Theiner 445a11158d merge dev1 into dev 2019-12-19 10:52:26 +01:00
my 66c60c8cd3 Weiter Logic Fehler changed. v2.3 2019-12-18 18:20:18 +01:00
my a769977a8a Weiter Logic Fehler changed. v2.2 2019-12-18 18:09:25 +01:00
my 092b65d509 Weiter Logic Fehler changed. v2.2 2019-12-18 18:02:00 +01:00
my 33fd4b0e47 Weiter Logic Fehler changed. v2.1 2019-12-18 17:59:22 +01:00
my bd881ef82d Weiter Logic Fehler changed. v2 2019-12-18 17:58:22 +01:00
my c58f4a6af8 Weiter Logic Fehler changed. 2019-12-18 17:40:21 +01:00
my 00127d17f9 Logic Fehler changed. 2019-12-18 17:29:36 +01:00
my 43f042ebdf Realise blink function and make speicail character with a speicial signal. and realise display the correct content when string content is bigger than window size. 2019-12-18 16:53:20 +01:00
my f6789ced97 Realise blink function and make speicail character with a speicial signal. and realise display the correct content when string content is bigger than window size. 2019-12-18 12:51:46 +01:00
my 9770d102e5 never mind, only commit for test by Yukun Chen. 2019-12-17 15:02:14 +01:00
yukun e8c2cbdfee dev 2019-12-17 13:48:18 +01:00
Johannes Theiner a8914cb357 ~ fix code to reduce warnings 2019-12-17 12:06:44 +01:00
Johannes Theiner 2286c59325 ~ fix unit tests not building 2019-12-05 09:32:42 +01:00
Johannes Theiner efe8c62493 ~ use values from shared mem instead of hardcoded ones
~ update ci to latest version
2019-12-04 10:18:13 +01:00
yukun f5be350c87 Merge branch 'dev1' of ssh://gitlab.repo.digitech.hs-emden-leer.de:2222/link/projekte/ws19/vkvm-new/text-renderer into dev1
 Conflicts:
	main/main.cpp
2019-12-03 14:29:23 +01:00
Johannes Theiner 62491ebc9d ~update clang-tidy checks 2019-11-28 11:20:53 +00:00
Julian Hinxlage 250e594f24 Merge branch 'dev1' into dev
# Conflicts:
#	main/main.cpp
2019-11-28 11:46:43 +01:00
my 557f14cc5e realize the interface of TextRender and now can make the font size bigger 2019-11-27 15:16:35 +01:00
zakarya acc72321d2 Delete Library Lodpng from Text-renderer 2019-11-27 12:23:49 +01:00
zakarya c96e7be312 Update Library Lodpng 2019-11-27 12:15:41 +01:00
zakarya 0e63b62f32 Update Lodpng Headerdatei 2019-11-27 12:12:19 +01:00
Julian Hinxlage aa919c567d + remove lib/ from .gitignore 2019-11-27 12:07:13 +01:00
Julian Hinxlage 0102a74906 + update text on RenderText event 2019-11-27 12:02:14 +01:00
Julian Hinxlage d531266b27 ~ set resolution to the shared memory values 2019-11-26 15:49:51 +01:00
Shaohua Tong c3f6862e16 add test method and change datatype of character_bitmap from bool** to vector<vector<bool>> 2019-11-20 15:51:01 +01:00
Shaohua Tong ab2d13f6bb add Bold and underline in TextRenderer 2019-11-20 12:50:32 +01:00
Shaohua Tong c719c8f655 add Bold and underline in TextRenderer 2019-11-19 17:47:26 +01:00
Julian Hinxlage f9aa3e35b0 fixed config
added toml(again)
fixed init
2019-11-19 13:47:30 +01:00
my b920c95c8c String Umsetzung und DriiteFont finished. 2019-11-19 13:30:39 +01:00
Julian Hinxlage 26c7fa69c4 added profont-IIx font 2019-11-19 13:28:48 +01:00
my 79d2f91ef7 Merge remote-tracking branch 'origin/dev1' into dev1
# Conflicts:
#	src/Block.cpp
#	src/Block.h
#	src/Config.cpp
#	src/Config.h
#	src/DritteFont.cpp
2019-11-19 13:28:04 +01:00
my c9cba998dc String Umsetzung und DriiteFont finished. 2019-11-19 13:27:18 +01:00
Julian Hinxlage eeff5a45dc added toml 2019-11-19 12:49:04 +01:00
Julian Hinxlage 038e15a19c updated to new library version 2019-11-19 12:41:56 +01:00
Johannes Theiner 69ed7aea40 ~ update clang-tidy checks 2019-11-16 18:22:34 +00:00
Edgar Schkrob 40d8fa588a Update README.md 2019-11-14 14:32:03 +00:00
my 4a08c433ad defination of Font and Block interface. 2019-11-14 13:12:48 +01:00
Johannes Theiner 0bc0862cb7 ~clang tidy checks all fies now 2019-11-12 15:26:04 +01:00
Johannes Theiner 51892ae707 ~ default argument calls are now allowed 2019-11-12 11:42:01 +00:00