|
|
a099b2e916
|
Automated Merge Preparation
|
2020-01-16 11:35:58 +01:00 |
|
|
|
7109948969
|
Merge branch 'dev-colorpalette' into dev
|
2020-01-16 11:19:23 +01:00 |
|
Jan Schuffenhauer
|
c7046f3c06
|
Fixed some bugs, also its mergable now, without any known issues
@DerAnonymos
@AshBastian
|
2020-01-16 00:32:42 +01:00 |
|
Jan Schuffenhauer
|
add66d368b
|
Merge branch 'dev' into dev-colorpalette
|
2020-01-16 00:11:24 +01:00 |
|
Jan Schuffenhauer
|
b695a25128
|
Fixed Inputboxes and Design
Todo pls merge me.
|
2020-01-16 00:00:27 +01:00 |
|
Jan Schuffenhauer
|
5f76f74cd5
|
Fix out of Range
|
2020-01-15 20:35:51 +01:00 |
|
Jonas Mucke
|
0e6ce309c9
|
code cleanup #2
|
2020-01-15 19:04:51 +01:00 |
|
Jonas Mucke
|
72d55b2c8f
|
first Cleanup
|
2020-01-15 18:40:17 +01:00 |
|
Jonas Mucke
|
2b433101c7
|
kein debug wird benötigt
|
2020-01-15 18:19:02 +01:00 |
|
AshBastian
|
b5e05a9c6a
|
Update InputBoxes
|
2020-01-15 15:48:38 +01:00 |
|
|
|
4d6c0da250
|
Automated Merge Preparation
|
2020-01-15 15:23:16 +01:00 |
|
|
|
9e81d953af
|
Automated Merge Preparation
|
2020-01-15 15:22:08 +01:00 |
|
|
|
691f3df28d
|
Automated Merge Preparation
|
2020-01-15 15:19:22 +01:00 |
|
|
|
d7e44890af
|
Removed // comments from another header file
|
2020-01-15 15:02:35 +01:00 |
|
Conrad
|
14233f8484
|
Merge branch 'dev' into 'dev-rework'
# Conflicts:
# cppcheck_errors.txt
# src/GUI/IntelliPhotoGui.h
|
2020-01-15 13:57:27 +00:00 |
|
|
|
cf3c542250
|
Uncrustified Commits and Updated Errors
|
2020-01-15 14:48:50 +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 |
|
Jan Schuffenhauer
|
f575da20d7
|
Updated it works kinda
TOdo: fix BUGS
|
2020-01-15 12:35:29 +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 |
|
|
|
cc56f61247
|
Uncrustifyed Status
|
2020-01-13 19:37:22 +01:00 |
|
AshBastian
|
7491472962
|
Schluss
|
2020-01-10 21:10:49 +01:00 |
|
AshBastian
|
dbf1cda101
|
Update
|
2020-01-10 14:15:59 +01:00 |
|
AshBastian
|
ea7316cb0b
|
Buttonsize Updated
|
2020-01-10 12:39:01 +01:00 |
|
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 |
|
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 |
|
|
|
124dfd7931
|
Uncrustified header files
|
2020-01-09 11:44:26 +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
|
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 |
|
|
|
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 |
|
AshBastian
|
6fdda34d68
|
Gui Endprodukt
|
2020-01-09 02:43:43 +01: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 |
|
