Commit Graph

405 Commits

Author SHA1 Message Date
Jonas Mucke
42a765642a Merge branch 'canvas' into 'dev'
Canvas

See merge request creyd/intelliphoto!47
2020-01-16 15:51:43 +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
5de1e7f83a Merge branch 'UnitTesting' into dev 2020-01-16 12:11:37 +01:00
8d32a5e3bb Merge branch 'dev-rework' into dev 2020-01-16 12:46:29 +01:00
25deefdcb9 Stopped Unit Test Automation as it doesn't work yet 2020-01-16 12:45:55 +01:00
f2e64e375b Added Unit Tests to prep script 2 2020-01-16 12:39:59 +01:00
855dd23b39 Added Unit Tests to prep script 2020-01-16 12:24:21 +01:00
a6a2a922a5 Automated Release Preparation 2020-01-16 12:17:31 +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
029ac8aa9a Merge branch 'UnitTesting' of https://gitlab.com/creyd/intelliphoto into UnitTesting 2020-01-16 12:36:40 +01:00
Mienek
c3ff1dbc0a kein bock mehr mach dein scheiß richtig das nächste mal 2020-01-16 12:36:19 +01:00
226ab26957 Added Unit Testing Files to gitignore 2020-01-16 12:26:56 +01:00
49b36ab013 Renamed Preparation Script 2020-01-16 12:10:03 +01:00
34294ef7cb Automated Release Preparation 2020-01-16 12:09:30 +01:00
b4a37d8bea Improved Release Prep Script 2020-01-16 12:09:19 +01:00
c7c5567049 Merged release and merge preparation scripts 2020-01-16 12:00:51 +01:00
876ceb7e39 Updated Colors 2020-01-16 11:39:03 +01:00
aaf5c1ddf9 Added Colors 2020-01-16 11:37:43 +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
Conrad
2e123a71f6 Merge branch 'dev-rework' into 'dev'
Started Rework

See merge request creyd/intelliphoto!44
2020-01-16 09:59:56 +00: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
cb4e48865a Update .gitignore 2020-01-16 10:30:34 +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
76dfe45837 Update uncrustify.cfg 2020-01-15 15:23:11 +01:00
9e81d953af Automated Merge Preparation 2020-01-15 15:22:08 +01:00
aae3e5f89f Update uncrustify.cfg 2020-01-15 15:22:01 +01:00
691f3df28d Automated Merge Preparation 2020-01-15 15:19:22 +01:00
979dfc220a Fixed Git Integration 2020-01-15 15:14:25 +01:00
4353b7764d Added Git Integration for Preparation Scripts 2020-01-15 15:12:35 +01:00
63b6d12422 Fixed bug in prep scripts 2020-01-15 15:09:40 +01:00
808d4d17c6 Added configuration check to preparation scripts 2020-01-15 15:06:24 +01:00