Conrad
|
14233f8484
|
Merge branch 'dev' into 'dev-rework'
# Conflicts:
# cppcheck_errors.txt
# src/GUI/IntelliPhotoGui.h
|
2020-01-15 13:57:27 +00:00 |
|
Conrad
|
65b6de44e6
|
Merge branch 'dev-setPolygon' into 'dev'
Dev set polygon
See merge request creyd/intelliphoto!41
|
2020-01-15 13:53:34 +00:00 |
|
|
|
dcbf163c7f
|
Added execution rights for merge prep script
|
2020-01-15 14:52:06 +01:00 |
|
|
|
cf3c542250
|
Uncrustified Commits and Updated Errors
|
2020-01-15 14:48:50 +01:00 |
|
|
|
455b9281eb
|
Renamed release.sh and added Merge Prep Script
|
2020-01-15 14:44:30 +01:00 |
|
|
|
efa43cfbbf
|
Update release.sh
|
2020-01-15 14:37:54 +01:00 |
|
|
|
c3c4debd95
|
Update release.sh
|
2020-01-15 14:35:13 +01:00 |
|
|
|
702f667295
|
Update release.sh
|
2020-01-15 14:32:37 +01:00 |
|
Jan Schuffenhauer
|
1f0b856079
|
FIxed all bugs and removed dead code
my job is done here
ready to be merge
|
2020-01-15 14:23:14 +01:00 |
|
|
|
5ef800fdd5
|
Update release.sh
|
2020-01-15 14:16:59 +01:00 |
|
|
|
b198d0303c
|
Added executing rights for release script
|
2020-01-15 14:09:44 +01:00 |
|
|
|
4ca64ff860
|
Update release.sh
|
2020-01-15 14:08:19 +01:00 |
|
|
|
5773f62fed
|
Added Doxyfile
|
2020-01-15 14:04:52 +01:00 |
|
Jan Schuffenhauer
|
f575da20d7
|
Updated it works kinda
TOdo: fix BUGS
|
2020-01-15 12:35:29 +01:00 |
|
|
|
8b8b6965c3
|
Added Release Script Draft
|
2020-01-15 12:33:00 +01:00 |
|
|
|
94dc372046
|
Update cppcheck_errors.txt
|
2020-01-15 12:17:03 +01:00 |
|
|
|
70ed416dc6
|
Uncrustified Files
|
2020-01-15 12:02:36 +01:00 |
|
|
|
af5a05faf8
|
Removed Linestyle from the project
|
2020-01-15 12:01:17 +01:00 |
|
|
|
c4467b70b8
|
Removed Rest of the // comments in headers
|
2020-01-15 11:47:51 +01:00 |
|
|
|
9d1159a08e
|
Removed First Part of the // comments in headers
- TODO: IntelliPhotoGui
|
2020-01-15 11:45:57 +01:00 |
|
Jan Schuffenhauer
|
2a1561ecfb
|
updated functionality and set true to test.
Todo: Cleanub and make it activalable
|
2020-01-15 11:14:01 +01:00 |
|
Jan Schuffenhauer
|
d8f6f0f8f7
|
implemented creation of certain image type and alo button for setting poylgon data
TODO implement setPolygon function
|
2020-01-14 21:02:03 +01:00 |
|
|
|
6fec7c26bf
|
Uncrustified Files
|
2020-01-13 19:59:30 +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 |
|
