Commit Graph

210 Commits

Author SHA1 Message Date
Mienek
c8b0328f63 history 2020-01-23 13:15:37 +01:00
Mienek
9651dd98e3 start of history 2020-01-23 13:13:31 +01:00
Jan Schuffenhauer
065455dd51 Merge branch 'dev' into dev-warnings 2020-01-17 09:59:25 +01:00
Jan Schuffenhauer
8e9c1d6769 Fixed all warnings. the rest is just some false warnings from cppcheck 2020-01-17 09:47:20 +01:00
0c0917b294 Automated Release Preparation 2020-01-17 09:07:23 +01:00
Jan Schuffenhauer
3af7470a05 push thatv thing 2020-01-17 08:56:00 +01:00
66dff7b9b0 Added Debug Catch for maybeSave 2020-01-17 07:46:35 +01:00
70b23d3c4c Fixed Include Errors 2020-01-17 07:34:25 +01:00
83201fe714 Automated Release Preparation 2020-01-16 22:55:15 +01:00
AshBastian
67e51c27a2 GUI Update 4 2020-01-16 21:21:47 +01:00
AshBastian
c16a589a66 GUI Update 3 2020-01-16 21:19:17 +01:00
Jonas Mucke
784e9c051e cmath 2020-01-16 18:54:55 +01:00
AshBastian
753a491695 GUI Update 2 2020-01-16 17:36:52 +01:00
AshBastian
332e752371 GUI Update 1 2020-01-16 17:22:19 +01:00
Jonas Mucke
b03270704c Merge branch 'dev-warnings' into 'dev'
Dev warnings

See merge request creyd/intelliphoto!45
2020-01-16 15:53:36 +00:00
Jonas Mucke
2f5a389d46 Merge branch 'dev' into canvas 2020-01-16 16:50:16 +01:00
Jonas Mucke
cb06e10fcd Update IntelliPhotoGui.cpp 2020-01-16 16:49:59 +01:00
Jonas Mucke
c73b481ec7 layer as canvas 2020-01-16 16:49:55 +01:00
Mienek
58f679a0b6 added Dimension
added the change and get dimesions stuff
2020-01-16 16:35:30 +01:00
Jan Schuffenhauer
abe63d3862 fixed every known warning from cppcheck
done.
2020-01-16 14:21:16 +01:00
Jan Schuffenhauer
b055c0b922 Automated Release Preparation 2020-01-16 12:52:25 +01:00
Jan Schuffenhauer
8fcc5f04e8 Some cleanup of Includes 2020-01-16 12:31:33 +01:00
Jan Schuffenhauer
cd3ba27e8d Merge branch 'dev' into dev-warnings 2020-01-16 12:18:33 +01:00
Jan Schuffenhauer
5de1e7f83a Merge branch 'UnitTesting' into dev 2020-01-16 12:11:37 +01:00
3359975b1f Merge branch 'dev-rework' into dev 2020-01-16 12:11:08 +01:00
Jan Schuffenhauer
8051996193 fixed unit test 2020-01-16 12:10:23 +01:00
764aaa927f Added execution rights for .pro files 2020-01-16 12:43:33 +01:00
Mienek
c3ff1dbc0a kein bock mehr mach dein scheiß richtig das nächste mal 2020-01-16 12:36:19 +01:00
Jan Schuffenhauer
c83682a09a first warning fixes 2020-01-16 11:50:02 +01:00
a099b2e916 Automated Merge Preparation 2020-01-16 11:35:58 +01:00
b1600aa3a9 Merge branch 'dev' into UnitTesting 2020-01-16 11:24:44 +01:00
7109948969 Merge branch 'dev-colorpalette' into dev 2020-01-16 11:19:23 +01:00
d47e0056f9 Added fix draft 2020-01-16 11:05:51 +01:00
249cf5d02d Merge branch 'dev' into UnitTesting 2020-01-16 10:45:23 +01:00
Jan Schuffenhauer
90acabd35d fixed bug with changing renderSettings 2020-01-16 10:37:24 +01:00
Jan Schuffenhauer
c7046f3c06 Fixed some bugs, also its mergable now, without any known issues
@DerAnonymos
@AshBastian
2020-01-16 00:32:42 +01:00
Jan Schuffenhauer
add66d368b Merge branch 'dev' into dev-colorpalette 2020-01-16 00:11:24 +01:00
Jan Schuffenhauer
b695a25128 Fixed Inputboxes and Design
Todo pls merge me.
2020-01-16 00:00:27 +01:00
Jan Schuffenhauer
5f76f74cd5 Fix out of Range 2020-01-15 20:35:51 +01:00
Jonas Mucke
33c5708ce5 all tests unified, benchmark and unit test complete 2020-01-15 19:39:15 +01:00
Jonas Mucke
0e6ce309c9 code cleanup #2 2020-01-15 19:04:51 +01:00
Jonas Mucke
72d55b2c8f first Cleanup 2020-01-15 18:40:17 +01:00
Jonas Mucke
2b433101c7 kein debug wird benötigt 2020-01-15 18:19:02 +01:00
Jonas Mucke
d17bf4850c all benchmark just polygon interrupt missing 2020-01-15 18:09:23 +01:00
AshBastian
b5e05a9c6a Update InputBoxes 2020-01-15 15:48:38 +01:00
4d6c0da250 Automated Merge Preparation 2020-01-15 15:23:16 +01:00
9e81d953af Automated Merge Preparation 2020-01-15 15:22:08 +01:00
691f3df28d Automated Merge Preparation 2020-01-15 15:19:22 +01:00
d7e44890af Removed // comments from another header file 2020-01-15 15:02:35 +01:00
Conrad
14233f8484 Merge branch 'dev' into 'dev-rework'
# Conflicts:
#   cppcheck_errors.txt
#   src/GUI/IntelliPhotoGui.h
2020-01-15 13:57:27 +00:00