Commit Graph

318 Commits

Author SHA1 Message Date
AshBastian
74d2d30fe0 Update 2020-01-10 12:28:55 +01:00
Jan Schuffenhauer
048fae53fb Added Colorpalette for most of the things
@AshBastian
@DerAnonymos
2020-01-10 11:16:17 +01:00
Jonas Mucke
2ae679099b Update PaintingArea.h 2020-01-09 20:18:50 +01:00
Jonas Mucke
736ca69245 warning fixen and better circle 2020-01-09 20:09:40 +01:00
Conrad
e1d53a927b Merge branch 'dev-docs' into 'dev'
Weekly Documentation Changes

See merge request creyd/intelliphoto!38
2020-01-09 18:39:41 +00:00
Jan Schuffenhauer
d54e1f3700 Added more Hotkeys + edited ColorPalette
TY all for watching
2020-01-09 17:07:27 +01:00
Jan Schuffenhauer
f96f8aabc4 Update IntelliPhotoGui.cpp 2020-01-09 15:29:42 +01:00
Jan Schuffenhauer
37ba19d792 Menuerweiterung 2020-01-09 14:48:24 +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
Paul Norberger
d9b0d53afd Adding initial todo list 2020-01-09 12:11:57 +01:00
Paul Norberger
711c394f09 Adding tool icons 2020-01-09 12:10:03 +01:00
fb65be47f9 Updated docs 2020-01-09 11:54:53 +01:00
e994bd1009 Merge branch 'dev' into dev-docs 2020-01-09 11:48:10 +01:00
124dfd7931 Uncrustified header files 2020-01-09 11:44:26 +01:00
14e4d50541 Update cppcheck errors 2020-01-09 11:36:10 +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
ccbe3336a8 Merge branch 'dev-stupidrenderer' into 'dev'
bring the fastrenderer back again...

See merge request creyd/intelliphoto!37
2020-01-09 09:40:14 +00: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
Conrad
c319302fc0 Merge branch 'dev-cleanup-2' into 'dev'
Cleanup Merge

See merge request creyd/intelliphoto!36
2020-01-09 09:21:20 +00:00
37e2d62a70 Added cppcheck errors 2020-01-09 10:19:15 +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
37b8642497 Fixed a bug where the index variable rename went wrong 2020-01-09 10:13:58 +01:00
326f9c8948 Unified Index Variable Name 2020-01-09 10:12:38 +01:00
Bastian Schindler
72b235689e Merge branch 'Helper_Variablen' into 'dev'
Helper variablen

See merge request creyd/intelliphoto!33
2020-01-09 01:45:06 +00:00
AshBastian
6fdda34d68 Gui Endprodukt 2020-01-09 02:43:43 +01:00
Bastian Schindler
a33041a076 Merge branch 'dev-stupidrenderer' into 'Helper_Variablen'
Merge Meine und Jans Arbeit

See merge request creyd/intelliphoto!31
2020-01-09 00:11:04 +00:00
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
Jan Schuffenhauer
bc718a95d6 changed misstypo 2020-01-08 15:31:09 +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