|
|
d52dd552f3
|
Merge branch 'dev' into dev_PolygonTool
|
2019-12-19 11:31:34 +01:00 |
|
Sonaion
|
3eff7d73eb
|
Merge branch 'Polygon_Coverage_API' into dev
|
2019-12-18 16:32:38 +01:00 |
|
Sonaion
|
4953abc791
|
Integrated Polygon Test
Use calculate traingles and the isInPolygon with theese triangles, this is done because of performance reasons
|
2019-12-18 16:32:11 +01:00 |
|
AshBastian
|
89b9e44677
|
PolygonTool fertig
|
2019-12-18 15:47:23 +01:00 |
|
Conrad
|
38f89f30f9
|
Merge branch 'hotfix' into 'dev'
Fixed the Linux color picker and system dialog bugs
See merge request creyd/intelliphoto!20
|
2019-12-18 12:55:56 +00:00 |
|
|
|
3ad975a297
|
Changed empty string to nullpointer for file options
|
2019-12-18 13:48:53 +01:00 |
|
Conrad
|
f268bf584d
|
Merge branch 'dev-rectangle-rename' into 'dev'
Rectangle Refractoring
See merge request creyd/intelliphoto!19
|
2019-12-18 11:43:07 +00:00 |
|
|
|
5534522440
|
Refractoring of "Rechteck" to "rectangle"
|
2019-12-18 12:42:10 +01:00 |
|
Jan Schuffenhauer
|
675fb0b97c
|
Merge branch 'hotfix' of https://gitlab.com/creyd/intelliphoto into hotfix
|
2019-12-18 12:31:18 +01:00 |
|
|
|
d1d3599daa
|
Merged gitignore statements
|
2019-12-18 13:28:41 +01:00 |
|
Jan Schuffenhauer
|
d193dc3b97
|
Edited the dialogs to work as intendet on linux and also fixed set second color
|
2019-12-18 12:31:03 +01:00 |
|
Jan Schuffenhauer
|
56dfdcc533
|
Update .gitignore
|
2019-12-18 12:16:37 +01:00 |
|
|
|
bbc733a8b5
|
Replaced empty string with nullpointer to dodge warning
|
2019-12-18 13:11:50 +01:00 |
|
|
|
325d1925ac
|
Fixed a bug where the File Dialog wouldn't show up correctly on linux
|
2019-12-18 13:08:21 +01:00 |
|
|
|
a0f1203fb1
|
Fixed a bug where the system dialogs wouldn't show up on linux
Thx to @Jan for this contribution and testing
|
2019-12-18 13:02:25 +01:00 |
|
|
|
9e4cf9a07f
|
Removed blank lines
|
2019-12-18 12:44:00 +01:00 |
|
|
|
a025ab5da5
|
Removed comment cause it ain't
|
2019-12-18 11:41:52 +01:00 |
|
AshBastian
|
3525261e1e
|
Polygon Update
|
2019-12-17 17:45:42 +01:00 |
|
Sonaion
|
21ade76563
|
Update .gitignore
|
2019-12-16 19:29:12 +01:00 |
|
Sonaion
|
67a72fe487
|
Scroll implemented
|
2019-12-16 19:23:56 +01:00 |
|
Sonaion
|
1c29d564c7
|
rectangle tool
|
2019-12-13 13:47:32 +01:00 |
|
Sonaion
|
c712fedbf0
|
Merge branch 'dev' into RechteckTool
|
2019-12-13 13:30:12 +01:00 |
|
Sonaion
|
ce331cafa8
|
testing for tools
|
2019-12-13 13:24:42 +01:00 |
|
Sonaion
|
4dac816505
|
Merge branch 'CyrcleTool' into dev
|
2019-12-13 13:22:15 +01:00 |
|
Sonaion
|
9da13bc002
|
Update .gitignore
|
2019-12-13 13:21:27 +01:00 |
|
Sonaion
|
ca9395901b
|
Cryle Tool
|
2019-12-13 13:20:55 +01:00 |
|
Conrad
|
102238e5ab
|
Merge branch 'dev' into 'master'
Readme Update
See merge request creyd/intelliphoto!18
|
2019-12-13 08:54:25 +00:00 |
|
|
|
58603f44dd
|
Moved prezi links to README
|
2019-12-13 09:29:37 +01:00 |
|
|
|
fbffc331d4
|
Code Style Update
- Everything is beautiful now
|
2019-12-13 09:13:19 +01:00 |
|
|
|
9f9315c8a4
|
Moved up src/ one level
|
2019-12-13 08:57:53 +01:00 |
|
|
|
610ed9fa7f
|
Create presentation.md
|
2019-12-13 08:52:38 +01:00 |
|
|
|
201129a635
|
Removed old src/ and manual state
|
2019-12-12 20:38:28 +01:00 |
|
Sonaion
|
0709876d53
|
Merge branch 'dev'
v0.3
|
2019-12-12 17:07:05 +01:00 |
|
Sonaion
|
c58e8fcb6f
|
ui changes
|
2019-12-12 14:08:11 +01:00 |
|
Sonaion
|
de30640a1a
|
Open implemented again
|
2019-12-12 13:17:22 +01:00 |
|
Sonaion
|
84ea429b2a
|
Bug free tool strucute - try me bitch
|
2019-12-12 13:03:08 +01:00 |
|
Sonaion
|
8f615c26b1
|
Merge remote-tracking branch 'origin/dev_FormTool' into dev
|
2019-12-12 11:30:26 +01:00 |
|
Sonaion
|
fdf90d4502
|
Update PaintingArea.cpp
|
2019-12-12 11:22:16 +01:00 |
|
Sonaion
|
5ec4f9f8f9
|
new tools
|
2019-12-12 11:18:37 +01:00 |
|
AshBastian
|
e8d8223cc2
|
Änderung der Vererbung der Tools und einfügen des ColorPickers (Farbmanager)
|
2019-12-12 10:22:20 +01:00 |
|
Sonaion
|
b1895b0c04
|
Modularisation
|
2019-12-11 18:54:04 +01:00 |
|
Jonas Mucke
|
cb7ad31bd5
|
Merge branch 'dev_FormTool' into 'dev'
SetColorTool, PenTool und FloodFillTool
See merge request creyd/intelliphoto!17
|
2019-12-11 16:57:43 +00:00 |
|
AshBastian
|
72bde027ed
|
SetColorTool, PenTool und FloodFillTool
LoL
|
2019-12-11 16:29:11 +01:00 |
|
|
|
282f85bd73
|
Added Icon for macOS
|
2019-12-11 14:01:45 +01:00 |
|
Sonaion
|
10fba8c454
|
Tool structure implemented
|
2019-12-10 15:44:22 +01:00 |
|
Sonaion
|
30d6781e7f
|
Tool structure- input bug
|
2019-12-10 15:32:22 +01:00 |
|
Sonaion
|
0aa3b17b8a
|
Recht unschöne Modularität der Tools
|
2019-12-10 12:20:15 +01:00 |
|
Sonaion
|
62e144abd4
|
Naming Convention and clean-up dead code
|
2019-12-09 19:38:32 +01:00 |
|
Sonaion
|
4c61bae14b
|
Gui Update
|
2019-12-09 18:58:38 +01:00 |
|
Jonas Mucke
|
f36429f2a3
|
Merge branch 'Code_Quality' into 'dev'
Code quality
See merge request creyd/intelliphoto!16
|
2019-12-09 14:49:48 +00:00 |
|
