Conrad
|
09f64ada94
|
Merge branch 'dev' into 'master'
Dev to Master Changes (layering)
See merge request creyd/intelliphoto!15
|
2019-12-06 07:56:28 +00:00 |
|
|
|
2523dd2fc2
|
Merge branch 'experimental_layer' into dev
|
2019-12-06 08:55:24 +01:00 |
|
|
|
98c476d47f
|
Replaced lowercase with upper case "New Layer"
|
2019-12-06 08:53:56 +01:00 |
|
|
|
ad8682193c
|
Merge branch 'master' into dev
|
2019-12-06 08:51:49 +01:00 |
|
Paul Norberger
|
4b3ba65c1b
|
Fix table of contents
|
2019-12-06 08:35:39 +01:00 |
|
Paul Norberger
|
1c1cf9874e
|
Loading images is back in
|
2019-12-06 08:06:37 +01:00 |
|
Sonaion
|
c9086c8e32
|
Preprozessor
|
2019-12-06 07:51:55 +01:00 |
|
|
|
244d334176
|
Added QT Creator User File to gitignore
|
2019-12-06 07:50:59 +01:00 |
|
Mienek
|
4d5b149f41
|
delete Layer
delete Layer, delete active Layer, protect against false input
|
2019-12-05 22:16:21 +01:00 |
|
|
|
40fe8efcb6
|
Removed unnecessary blank lines
|
2019-12-05 22:10:42 +01:00 |
|
|
|
9c293d63e1
|
Update .gitignore
|
2019-12-05 22:08:49 +01:00 |
|
Mienek
|
f2c56c27be
|
newLayer
|
2019-12-05 21:36:23 +01:00 |
|
Paul Norberger
|
7b7a9180bd
|
Updating docs
|
2019-12-05 19:28:41 +01:00 |
|
|
|
6e36e78b96
|
Merge branch 'dev'
|
2019-12-05 18:57:19 +01:00 |
|
Jonas Mucke
|
fd1a6d2f9d
|
Merge branch 'Screen_Clear_taskbar' into 'dev'
Bug Fix - Shortcut and strcmp work
See merge request creyd/intelliphoto!14
|
2019-12-05 17:56:45 +00:00 |
|
Jonas Mucke
|
5a14250054
|
Bug Fix - Shortcut and strcmp work
|
2019-12-05 18:55:04 +01:00 |
|
|
|
f7a914f646
|
Added historic assignments
|
2019-12-05 18:33:00 +01:00 |
|
|
|
5d956769ff
|
Renamed folder for poular conventions
- Renamed "Documentation" folder to "docs"
- Renamed "IntelliPhoto" folder to "src"
|
2019-12-05 18:27:24 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
c2875e5bb6
|
Update .gitignore
|
2019-12-05 18:02:48 +01:00 |
|
|
|
9b797ac281
|
Readded gitignore
|
2019-12-05 18:00:38 +01:00 |
|
Jan Schuffenhauer
|
6fa8812cad
|
Farbkreis added
|
2019-12-05 17:57:53 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
