creyD/intelliphoto
1
0
Fork 0
mirror of https://github.com/creyD/intelliphoto.git synced 2026-04-12 19:40:28 +02:00
Code Issues Packages Projects Releases Wiki Activity
118 Commits 2 Branches 7 Tags
5a142500548fc0604cba87caf1ecac6d2ef96846
Commit Graph

118 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonas Mucke
5a14250054 Bug Fix - Shortcut and strcmp work 2019-12-05 18:55:04 +01:00
Conrad
5d956769ff Renamed folder for poular conventions 
- Renamed "Documentation" folder to "docs"
- Renamed "IntelliPhoto" folder to "src"
 2019-12-05 18:27:24 +01:00
Conrad
f4fcde045a Removed old draft 2019-12-05 18:22:51 +01:00
Conrad
ca573b338e Merge branch 'Dev' into 'master' 
Dev to Master PR

See merge request creyd/intelliphoto!13
 2019-12-05 17:22:06 +00:00
Conrad
7a4105e5e1 Moved examples to separate folder 2019-12-05 18:19:09 +01:00
Jan Schuffenhauer
696cd6357c Added biggest flex 2019-12-05 18:03:31 +01:00
Conrad
c2875e5bb6 Update .gitignore 2019-12-05 18:02:48 +01:00
Conrad
9b797ac281 Readded gitignore 2019-12-05 18:00:38 +01:00
Jan Schuffenhauer
6fa8812cad Farbkreis added 2019-12-05 17:57:53 +01:00
Conrad
4d4b2fdbfc Readded Pictures after Merging Disaster 2019-12-05 17:56:53 +01:00
Sonaion
1d5b7c89c1 push 2019-12-05 17:53:55 +01:00
Conrad
c858113b90 Merge branch 'getpng8exporterback' into Dev 2019-12-05 17:47:13 +01:00
Sonaion
99f95f30be ups 2019-12-05 17:40:39 +01:00
Jan Schuffenhauer
44ddebf701 png8 converter 
i did it again.
 2019-12-05 17:38:35 +01:00
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
6aab6e4a34 Merge branch 'revert-7917af51' into 'Dev' 
Revert "Merge branch 'MuckeMachtSachen' into 'Dev'"

See merge request creyd/intelliphoto!11
 2019-12-05 16:17:34 +00: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
c5445fcc1c Merge branch 'MuckeMachtSachen' into 'Dev' 
Layer Structure

See merge request creyd/intelliphoto!6
 2019-12-05 13:48:01 +00: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
Conrad Großer
6f9d51dc33 Merge branch 'exporderbyjan' into 'Dev' 
PNG-8 Exporter

See merge request creyd/intelliphoto!4
 2019-12-05 13:09:04 +00: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
Conrad
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
Jonas Mucke
15c5f9883d cleanup master 2019-12-04 17:48:58 +01:00
Jonas Mucke
dd0899ff67 Deletet abgabe from dev 2019-12-04 17:48:18 +01:00
AshBastian
32df5b59a5 Überarbeitung 
Gramatik
Laden Bilder
 2019-12-04 14:54:20 +01:00
Jan Schuffenhauer
8b88626cdf Summerize Abgabe 2019-11-28 16:39:47 +01:00
Jan Schuffenhauer
5356c95595 edited abgabe4 2019-11-28 16:38:54 +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
Paul Norberger
84347008c9 Add page numbers back in 2019-11-28 14:04:37 +01:00
Paul Norberger
c29c350b32 Add logo to manual 2019-11-28 13:52:04 +01:00
Paul Norberger
39fa8b6d59 Adding table of contents and another heading 2019-11-28 12:04:48 +01:00
Paul Norberger
e2f190a830 First version of manual added 2019-11-28 11:48:13 +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