Commit Graph

95 Commits

Author SHA1 Message Date
684245421e Automated Release Preparation 2020-02-07 21:11:56 +01:00
Jan Schuffenhauer
cc6236a2ae Merge branch 'dev' of https://gitlab.com/creyd/intelliphoto into dev 2020-02-07 16:48:29 +01:00
Jan Schuffenhauer
81c15f84b9 removed some warnings 2020-02-07 16:47:12 +01:00
01aa5c3938 Automated Release Preparation 2020-02-07 16:28:11 +01:00
Sonaion
7e93e69a53 fixed history tool 2020-02-07 10:22:18 +01:00
8577e6b132 Automated Release Preparation 2020-01-30 20:42:31 +01:00
Jonas Mucke
b51d9f1505 Merge branch 'dev' into 'hotfix-history'
# Conflicts:
#   src/Layer/PaintingArea.h
2020-01-30 17:25:39 +00:00
Mienek
3eb61abb94 second fix
all kown bugs according to history, fixed
2020-01-30 12:17:28 +01:00
Mienek
db07e6fcb0 first fix
history works again, can load deleted layer
2020-01-28 11:52:15 +01:00
Sonaion
3a13904eea added comments but gui 2020-01-28 10:41:54 +01:00
AshBastian
9f6fe965ec Vollständiger Gradient
Achtung!!! Sehr Rechenaufwendig und im Fastrenderer noch nicht ordentlich nutzbar
2020-01-25 21:54:25 +01:00
AshBastian
2432bb0568 Wechsel Rechner 2020-01-25 19:37:14 +01:00
Conrad
b989fb357a Automated Release Preparation 2020-01-24 00:06:46 +01:00
Jonas Mucke
3aefb6c634 update preview on history 2020-01-23 20:36:18 +01:00
Jonas Mucke
17739d6be9 Merge branch 'dev-scrollbar' into dev-history 2020-01-23 20:32:38 +01:00
Jonas Mucke
a33d52fce6 Merge branch 'dev-save' into dev-history 2020-01-23 20:22:06 +01:00
Jonas Mucke
8a192722cb add cleanup 2020-01-23 20:19:59 +01:00
Jonas Mucke
8692ccd8a3 project load and export 2020-01-23 20:13:43 +01:00
Jonas Mucke
4217b00d88 scrolol ready 2020-01-23 16:37:55 +01:00
Jonas Mucke
12614096f8 ednungs check 2020-01-23 16:13:52 +01:00
Jan Schuffenhauer
083368dcab Bug with getting the filetype 2020-01-23 14:15:22 +01:00
Mienek
5d794819b0 removed /* and*/
...
2020-01-23 13:48:43 +01:00
Mienek
1472028a81 Alpha Version
it dose something right but let's see
2020-01-23 13:47:44 +01:00
Mienek
9651dd98e3 start of history 2020-01-23 13:13:31 +01:00
Jonas Mucke
651bf806fc upset for future work 2020-01-22 21:52:08 +01:00
Jonas Mucke
8e187ba6b3 basics of zoom and scroll 2020-01-22 21:19:24 +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
b055c0b922 Automated Release Preparation 2020-01-16 12:52:25 +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
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
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
9e81d953af Automated Merge Preparation 2020-01-15 15:22:08 +01:00
cf3c542250 Uncrustified Commits and Updated Errors 2020-01-15 14:48:50 +01:00
Jan Schuffenhauer
1f0b856079 FIxed all bugs and removed dead code
my job is done here
ready to be merge
2020-01-15 14:23:14 +01:00
Jan Schuffenhauer
f575da20d7 Updated it works kinda
TOdo: fix BUGS
2020-01-15 12:35:29 +01:00
Jonas Mucke
3718693083 nearly all tests but without benchmark 2020-01-14 21:49:14 +01:00
Jan Schuffenhauer
d8f6f0f8f7 implemented creation of certain image type and alo button for setting poylgon data
TODO implement setPolygon function
2020-01-14 21:02:03 +01:00
6fec7c26bf Uncrustified Files 2020-01-13 19:59:30 +01:00
cc56f61247 Uncrustifyed Status 2020-01-13 19:37:22 +01:00
Jonas Mucke
5a05aa4a19 start of unit test 2020-01-12 20:23:39 +01:00
Jonas Mucke
736ca69245 warning fixen and better circle 2020-01-09 20:09:40 +01:00
Jan Schuffenhauer
f1b77a48c8 Merge branch 'dev' of https://gitlab.com/creyd/intelliphoto into dev 2020-01-09 14:03:04 +01:00