Jonas Mucke
|
8692ccd8a3
|
project load and export
|
2020-01-23 20:13:43 +01:00 |
|
Jonas Mucke
|
12614096f8
|
ednungs check
|
2020-01-23 16:13:52 +01:00 |
|
Jan Schuffenhauer
|
244a9b769f
|
added a exporter (NOT TESTET!!!)
|
2020-01-23 15:15:57 +01:00 |
|
Jan Schuffenhauer
|
083368dcab
|
Bug with getting the filetype
|
2020-01-23 14:15:22 +01:00 |
|
Jan Schuffenhauer
|
8e9c1d6769
|
Fixed all warnings. the rest is just some false warnings from cppcheck
|
2020-01-17 09:47:20 +01:00 |
|
|
|
0c0917b294
|
Automated Release Preparation
|
2020-01-17 09:07:23 +01:00 |
|
Jan Schuffenhauer
|
b055c0b922
|
Automated Release Preparation
|
2020-01-16 12:52:25 +01:00 |
|
Jan Schuffenhauer
|
cd3ba27e8d
|
Merge branch 'dev' into dev-warnings
|
2020-01-16 12:18:33 +01:00 |
|
Jan Schuffenhauer
|
5de1e7f83a
|
Merge branch 'UnitTesting' into dev
|
2020-01-16 12:11:37 +01:00 |
|
|
|
3359975b1f
|
Merge branch 'dev-rework' into dev
|
2020-01-16 12:11:08 +01:00 |
|
Jan Schuffenhauer
|
c83682a09a
|
first warning fixes
|
2020-01-16 11:50:02 +01:00 |
|
|
|
a099b2e916
|
Automated Merge Preparation
|
2020-01-16 11:35:58 +01:00 |
|
|
|
b1600aa3a9
|
Merge branch 'dev' into UnitTesting
|
2020-01-16 11:24:44 +01:00 |
|
|
|
7109948969
|
Merge branch 'dev-colorpalette' into dev
|
2020-01-16 11:19:23 +01:00 |
|
|
|
249cf5d02d
|
Merge branch 'dev' into UnitTesting
|
2020-01-16 10:45:23 +01:00 |
|
Jan Schuffenhauer
|
90acabd35d
|
fixed bug with changing renderSettings
|
2020-01-16 10:37:24 +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 |
|
|
|
9e81d953af
|
Automated Merge Preparation
|
2020-01-15 15:22:08 +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 |
|
|
|
c4467b70b8
|
Removed Rest of the // comments in headers
|
2020-01-15 11:47:51 +01:00 |
|
Jonas Mucke
|
3718693083
|
nearly all tests but without benchmark
|
2020-01-14 21:49:14 +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 |
|
Jonas Mucke
|
5a05aa4a19
|
start of unit test
|
2020-01-12 20:23:39 +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
|
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 |
|
AshBastian
|
46a69024d3
|
Fix
|
2020-01-09 00:58:03 +01:00 |
|
AshBastian
|
8b1fd5c3f0
|
Fixes
|
2020-01-09 00:52:17 +01: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 |
|