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 |
|
Bastian Schindler
|
e4f094330e
|
Merge branch 'Fix' into 'Helper_Variablen'
Fix
See merge request creyd/intelliphoto!30
|
2020-01-09 00:03:10 +00: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
|
d774461b26
|
Merge branch 'dev-stupidrenderer' into 'Helper_Variablen'
Dev stupidrenderer
See merge request creyd/intelliphoto!28
|
2020-01-08 23:47:59 +00: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 |
|
AshBastian
|
540e23aadf
|
asdjzh fhg fgghdvbsjasjaffg
|
2020-01-08 21:07:32 +01:00 |
|
Jan Schuffenhauer
|
7ed8e858af
|
Now everything is Indexe 8 😲
Job done.
|
2020-01-08 19:56:56 +01:00 |
|
AshBastian
|
a99ad09e8c
|
Dummy Gui
|
2020-01-08 19:55:34 +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
|
42f91ca719
|
Bilder
|
2020-01-08 18:26:50 +01:00 |
|
AshBastian
|
c321a181b1
|
Linenverwaltung
|
2020-01-08 16:41:56 +01:00 |
|
AshBastian
|
6d4a4e52b5
|
Destructor
|
2020-01-08 15:53:51 +01:00 |
|
AshBastian
|
52a72c05c5
|
ToolSettings
|
2020-01-08 15:47:16 +01:00 |
|
Bastian Schindler
|
dd55a7158d
|
Merge branch 'PolygonFixes' into 'dev'
Polygon Fixes
See merge request creyd/intelliphoto!27
|
2020-01-07 16:41:13 +00: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 |
|
Bastian Schindler
|
011026899c
|
Merge branch 'BugFixes' into 'dev'
Bug fixes
See merge request creyd/intelliphoto!26
|
2020-01-07 15:05:47 +00:00 |
|
AshBastian
|
c06a4aa87e
|
Absturz behoben
Bei Mausraddrehen kam es zu Absturz, wenn Tool nullptr, weil Zugriff auf Tool
|
2020-01-07 16:03:54 +01:00 |
|
AshBastian
|
2aa49f1b79
|
Update IntelliToolPolygon.cpp
|
2020-01-07 15:35:04 +01:00 |
|
AshBastian
|
28b8d92d72
|
BugFixes
|
2020-01-07 15:23:14 +01:00 |
|
|
|
8efe6836bf
|
Reworked some method names
|
2019-12-20 10:42:49 +01:00 |
|
|
|
86a01eb9ae
|
Merge branch 'dev-variable-refractor' into dev
|
2019-12-20 10:13:59 +01:00 |
|
Mienek
|
d727591977
|
Merge branch 'dev-warnings' into 'dev'
fixed warnings
See merge request creyd/intelliphoto!24
|
2019-12-20 09:06:23 +00:00 |
|
|
|
d81afbb8ee
|
Refractoring Update 2
- Adjusted variable names to naming conventions
- Concluded header files
|
2019-12-20 10:05:57 +01:00 |
|
Mienek
|
7a604c805a
|
some fixes
only unused Variable and shadowing left
|
2019-12-20 10:02:56 +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 |
|
|
|
0411c49534
|
Refractored misspelled variable
|
2019-12-20 09:03:26 +01:00 |
|
Sonaion
|
279b46bc1d
|
Update IntelliHelper.cpp
|
2019-12-20 08:56:15 +01:00 |
|
Jan Schuffenhauer
|
73137a6a7b
|
Merge branch 'dev' of https://gitlab.com/creyd/intelliphoto into dev
|
2019-12-20 08:23:41 +01:00 |
|
Jan Schuffenhauer
|
0045375f6c
|
Fixed bug / changed pi
like the pi could get removed if mucke wants to
|
2019-12-20 08:21:23 +01:00 |
|
Conrad
|
6ff32a141a
|
Merge branch 'dev-docs' into 'dev'
Documentation Branch Merge
See merge request creyd/intelliphoto!22
|
2019-12-19 18:44:06 +00:00 |
|
|
|
9c95059b93
|
Updated doxygen docs to latest changes
|
2019-12-19 19:39:08 +01:00 |
|
|
|
5073312f7a
|
main.cpp uncrustify
|
2019-12-19 19:38:18 +01:00 |
|
|
|
0bcbe13f13
|
Update main.cpp
|
2019-12-19 18:38:38 +01:00 |
|
|
|
a838e3869f
|
Restyled project for uncrustify
|
2019-12-19 18:27:46 +01:00 |
|
|
|
c415a53c83
|
Documented the gui file
|
2019-12-19 18:16:26 +01:00 |
|
|
|
8b42603332
|
Documented PaintingArea
|
2019-12-19 18:14:13 +01:00 |
|
|
|
105cff0f63
|
Added basic documentation for LayerObject Struct
|
2019-12-19 17:41:31 +01:00 |
|
Sonaion
|
dee229c09f
|
Merge branch 'dev-docs' of https://gitlab.com/creyd/intelliphoto into dev-docs
|
2019-12-19 17:39:46 +01:00 |
|
Sonaion
|
11617c9f44
|
Merge branch 'PolygonUpdate' into dev-docs
|
2019-12-19 17:39:35 +01:00 |
|
|
|
91fc9a4308
|
Refraktored another misspelled variable
- hightOffset --> heightOffset
|
2019-12-19 17:39:24 +01:00 |
|
Sonaion
|
3252ec4404
|
Earfolding bug
|
2019-12-19 17:39:10 +01:00 |
|
|
|
dcd26f76ef
|
Fixed misspelled variable
|
2019-12-19 17:32:07 +01:00 |
|
|
|
a2f2e38a06
|
Changed file extension for config file
|
2019-12-19 17:30:19 +01:00 |
|
Paul Norberger
|
bf47934bbe
|
Fixed an ugly typo in the readme
|
2019-12-19 13:36:21 +00:00 |
|
Sonaion
|
cf4f9210dd
|
Merge branch 'dev-docs' of https://gitlab.com/creyd/intelliphoto into dev-docs
|
2019-12-19 14:33:35 +01:00 |
|
Sonaion
|
9bc45dedfd
|
gui changes for tool anwendung
|
2019-12-19 14:33:28 +01:00 |
|
