Commit Graph

27 Commits

Author SHA1 Message Date
Jonas Mucke
3bac3d85c4 hotfix for transparence 2020-01-30 18:24:07 +01:00
Conrad
b989fb357a Automated Release Preparation 2020-01-24 00:06:46 +01:00
Jonas Mucke
a33d52fce6 Merge branch 'dev-save' into dev-history 2020-01-23 20:22:06 +01:00
Jonas Mucke
8692ccd8a3 project load and export 2020-01-23 20:13:43 +01:00
Mienek
1472028a81 Alpha Version
it dose something right but let's see
2020-01-23 13:47:44 +01:00
Mienek
c8b0328f63 history 2020-01-23 13:15:37 +01:00
Mienek
9651dd98e3 start of history 2020-01-23 13:13:31 +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
6fec7c26bf Uncrustified Files 2020-01-13 19:59:30 +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
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
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
a838e3869f Restyled project for uncrustify 2019-12-19 18:27:46 +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
9f9315c8a4 Moved up src/ one level 2019-12-13 08:57:53 +01:00