Commit Graph

33 Commits

Author SHA1 Message Date
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
add66d368b Merge branch 'dev' into dev-colorpalette 2020-01-16 00:11:24 +01:00
Jonas Mucke
d17bf4850c all benchmark just polygon interrupt missing 2020-01-15 18:09:23 +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
Jan Schuffenhauer
2a1561ecfb updated functionality and set true to test.
Todo: Cleanub and make it activalable
2020-01-15 11:14:01 +01:00
6fec7c26bf Uncrustified Files 2020-01-13 19:59:30 +01:00
cc56f61247 Uncrustifyed Status 2020-01-13 19:37:22 +01:00
AshBastian
ea7316cb0b Buttonsize Updated 2020-01-10 12:39:01 +01:00
AshBastian
74d2d30fe0 Update 2020-01-10 12:28:55 +01:00
Jan Schuffenhauer
081ac68d5f Updatet ui fixed bugs, improved performance, just everything
Autors:
@DerAnonymos
@AshBastian
@Sonaion
2020-01-09 13:59:22 +01:00
d4313e29a0 Ran Uncrustify Again 2020-01-09 10:18:28 +01:00
AshBastian
6fdda34d68 Gui Endprodukt 2020-01-09 02:43:43 +01:00
AshBastian
46a69024d3 Fix 2020-01-09 00:58:03 +01:00
Bastian Schindler
9af9969c2f Merge branch 'Helper_Variablen' into 'dev-stupidrenderer'
# Conflicts:
#   src/Image/IntelliImage.h
#   src/IntelliPhoto.pro
#   src/Layer/PaintingArea.h
2020-01-08 23:47:37 +00:00
Jan Schuffenhauer
78272a5790 now working 100% :D
Fixed a bug where a not activatet tool caused trouble.
2020-01-08 19:40:35 +01:00
Jan Schuffenhauer
c04d8d6815 [W.I.P.] Added a FasterRenderOption
Still completly buggy. and it crashes imediatly after input
2020-01-08 19:01:05 +01:00
AshBastian
52a72c05c5 ToolSettings 2020-01-08 15:47:16 +01:00
AshBastian
e540bd64f2 Polygon Fixes
Polygon kann jetzt im Shaped-Image nicht außerhalb des Polygons gestartet werden
2020-01-07 17:39:52 +01:00
AshBastian
28b8d92d72 BugFixes 2020-01-07 15:23:14 +01:00
86a01eb9ae Merge branch 'dev-variable-refractor' into dev 2019-12-20 10:13:59 +01:00
d81afbb8ee Refractoring Update 2
- Adjusted variable names to naming conventions
- Concluded header files
2019-12-20 10:05:57 +01:00
Mienek
7a604c805a some fixes
only unused Variable and shadowing left
2019-12-20 10:02:56 +01:00
52292ebfe7 Refractoring Update 1
- Refractored switchColor to slotSwapColor
- Corrected spelling mistake in variable name (weight-->width)
- Unified variable names
2019-12-20 09:50:30 +01:00
a838e3869f Restyled project for uncrustify 2019-12-19 18:27:46 +01:00
dcd26f76ef Fixed misspelled variable 2019-12-19 17:32:07 +01:00
Mienek
fa4a8ddad2 nochmal 2019-12-18 17:50:10 +01:00
Sonaion
67a72fe487 Scroll implemented 2019-12-16 19:23:56 +01:00
9f9315c8a4 Moved up src/ one level 2019-12-13 08:57:53 +01:00