Commit Graph

50 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
83201fe714 Automated Release Preparation 2020-01-16 22:55:15 +01:00
Jan Schuffenhauer
cd3ba27e8d Merge branch 'dev' into dev-warnings 2020-01-16 12:18:33 +01:00
Jan Schuffenhauer
c83682a09a first warning fixes 2020-01-16 11:50:02 +01:00
b1600aa3a9 Merge branch 'dev' into UnitTesting 2020-01-16 11:24:44 +01:00
249cf5d02d Merge branch 'dev' into UnitTesting 2020-01-16 10:45:23 +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
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
6fec7c26bf Uncrustified Files 2020-01-13 19:59:30 +01:00
Jonas Mucke
5a05aa4a19 start of unit test 2020-01-12 20:23:39 +01:00
Jan Schuffenhauer
f1b77a48c8 Merge branch 'dev' of https://gitlab.com/creyd/intelliphoto into dev 2020-01-09 14:03:04 +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
624eb0fde6 Uncrustify all .cpp files 2020-01-09 11:35:36 +01:00
Jan Schuffenhauer
e3b2968f4d Fixed Image ENUMs
ty
2020-01-09 10:45:54 +01:00
Jan Schuffenhauer
18aec48e4c Merge branch 'dev' into 'dev-stupidrenderer'
# Conflicts:
#   src/Image/IntelliImage.cpp
#   src/Image/IntelliRasterImage.cpp
#   src/Image/IntelliShapedImage.cpp
#   src/Layer/PaintingArea.cpp
2020-01-09 09:39:38 +00:00
Jan Schuffenhauer
67b623a63a bring the fastrenderer back again...
hihihi
2020-01-09 10:35:01 +01:00
d4313e29a0 Ran Uncrustify Again 2020-01-09 10:18:28 +01:00
ee64fa6997 Unified ENUM Names 2020-01-09 10:15:02 +01:00
AshBastian
6fdda34d68 Gui Endprodukt 2020-01-09 02:43:43 +01:00
Bastian Schindler
4a6098856f Merge branch 'Helper_Variablen' into 'dev-stupidrenderer'
# Conflicts:
#   src/Image/IntelliImage.h
#   src/IntelliPhoto.pro
#   src/Layer/PaintingArea.h
2020-01-09 00:10:40 +00:00
AshBastian
73500db171 Sorry falscher Merge 2020-01-09 01:07:25 +01:00
AshBastian
46a69024d3 Fix 2020-01-09 00:58:03 +01:00
AshBastian
8b1fd5c3f0 Fixes 2020-01-09 00:52:17 +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
7ed8e858af Now everything is Indexe 8 😲
Job done.
2020-01-08 19:56:56 +01: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
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
ab8590c4fe Refractored fileName to more intuitive filePath 2019-12-20 09:15:02 +01:00
a838e3869f Restyled project for uncrustify 2019-12-19 18:27:46 +01:00
2da9e15d36 Minor Code Style Update + Documentation Spelling Fix 2019-12-19 12:03:21 +01:00
Sonaion
b4317626cc Merge branch 'dev-tools-seb' into dev-docs 2019-12-18 20:39:24 +01:00
Sonaion
2ceacff4ef Performance Update 2019-12-18 20:37:38 +01:00
Sonaion
0f829646b9 Documentation of image 2019-12-18 18:19:30 +01:00
Sonaion
978ba61061 updated Image 2019-12-18 17:57:49 +01:00
Sonaion
cb34d8fcbe Merge branch 'dev-tools-seb' into dev-docs 2019-12-18 17:54:48 +01:00
Sonaion
554426eb94 Merge branch 'dev-tools-seb' into dev-docs 2019-12-18 17:51:53 +01:00
Mienek
fa4a8ddad2 nochmal 2019-12-18 17:50:10 +01:00
Mienek
4f808620b8 Halbfertig
weil Mucke es so wollte, keiner weiß warum
2019-12-18 17:49:24 +01:00
Sonaion
30c6d0badd Comments 2019-12-18 17:49:09 +01:00
Sonaion
1d65078df0 Image doc 2019-12-18 17:17:23 +01:00
Sonaion
4953abc791 Integrated Polygon Test
Use calculate traingles and the isInPolygon with theese triangles, this is done because of performance reasons
2019-12-18 16:32:11 +01:00
Sonaion
ca9395901b Cryle Tool 2019-12-13 13:20:55 +01:00
9f9315c8a4 Moved up src/ one level 2019-12-13 08:57:53 +01:00