Commit Graph

32 Commits

Author SHA1 Message Date
Jan Schuffenhauer
ef65bcd983 Muckes zeug 2019-12-05 17:30:41 +01:00
Jan Schuffenhauer
6dfc2c1b3b . 2019-12-05 17:25:26 +01:00
Jonas Mucke
54e1f89003 Revert "Merge branch 'MuckeMachtSachen' into 'Dev'"
This reverts merge request !9
2019-12-05 16:17:07 +00:00
Jan Schuffenhauer
7917af51a1 Merge branch 'MuckeMachtSachen' into 'Dev'
Update main.cpp

See merge request creyd/intelliphoto!9
2019-12-05 15:56:51 +00:00
Sonaion
499c5c793b lol 2019-12-05 16:56:12 +01:00
Sonaion
abcdad851a lol
lol
2019-12-05 16:55:55 +01:00
Sonaion
ff3d811503 Update main.cpp 2019-12-05 16:54:47 +01:00
Jonas Mucke
7cfc27c8cd Merge branch 'MuckeMachtSachen' into 'Dev'
Layer Structure II

See merge request creyd/intelliphoto!7
2019-12-05 13:55:15 +00:00
Sonaion
63d3b028a3 just some data 2019-12-05 14:54:46 +01:00
Jonas Mucke
edd1f9f861 Merge branch 'Dev' into 'MuckeMachtSachen'
# Conflicts:
#   IntelliPhoto/Painting/GUI/IntelliPhotoGui.h
#   IntelliPhoto/Painting/Image/IntelliShapedImage.cpp
#   IntelliPhoto/Painting/IntelliPhoto.pro.user
#   IntelliPhoto/Painting/Layer/PaintingArea.cpp
#   IntelliPhoto/Painting/Layer/PaintingArea.h
2019-12-05 13:47:52 +00:00
Sonaion
8e663d7edc right saving 2019-12-05 14:44:00 +01:00
Sonaion
ec650171e9 Implemented LAyer structure
alpha interpolation for saving is missing
resizing is missing
2019-12-05 14:18:42 +01:00
Jan Schuffenhauer
6b599d429f Ich hab mal kurz nen exporter geschriebn und seb ist nen nab
Jk ich meine basti 👍
2019-12-05 14:00:20 +01:00
e881b5d16c Simplified gitignore 2019-12-05 12:43:34 +01:00
Jonas Mucke
2ded50dfa3 Painting made 'possible' 2019-12-04 22:48:10 +01:00
Jonas Mucke
6a52fbbb35 basics of layer structure 2019-12-04 18:58:33 +01:00
Jonas Mucke
161165bf34 Restore of old painting 2019-12-04 18:07:54 +01:00
Jonas Mucke
69c2750358 redo old strcuture to dev 2019-12-04 18:02:14 +01:00
AshBastian
32df5b59a5 Überarbeitung
Gramatik
Laden Bilder
2019-12-04 14:54:20 +01:00
Sonaion
43c5489343 some text changes 2019-11-28 16:37:55 +01:00
Sonaion
a23e4bdd9c Image structure 2019-11-28 16:34:26 +01:00
Sonaion
bccca91111 Some image change 2019-11-26 17:26:43 +01:00
Sonaion
b4d8738e71 Merge branch 'Dev' of https://gitlab.com/creyd/intelliphoto into Dev 2019-11-25 13:34:23 +01:00
Paul Norberger
b43fc1de96 Add program icon. 2019-11-23 21:07:04 +01:00
Sonaion
a5b0806bd8 Update IntelliPhoto.pro.user 2019-11-22 08:47:39 +01:00
Sonaion
91d860c98a Update IntelliPhoto.pro.user 2019-11-22 08:09:23 +01:00
Sonaion
440cdb5a99 just naming changes 2019-11-22 06:22:13 +01:00
Sonaion
111d4a8826 naming changes 2019-11-21 13:34:04 +01:00
Sonaion
9f318217a8 working versiom 2019-11-21 13:02:00 +01:00
Sonaion
d275793da6 All basic features of Qt 2019-11-20 12:17:14 +01:00
Sonaion
ff2cddfd3c Comments and compile fähig 2019-11-19 22:09:41 +01:00
Sonaion
c49c3c5e9c Start of Dev 2019-11-19 16:39:23 +01:00