Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
chchwy committed Sep 25, 2018
2 parents bd56eab + 2a384fb commit 3ed1dfd
Show file tree
Hide file tree
Showing 43 changed files with 680 additions and 650 deletions.
81 changes: 46 additions & 35 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,50 +1,61 @@
<!--
Use Markdown language for styling.
Github's Markdown Guide https://guides.github.com/features/mastering-markdown/
Please use the SEARCH function before opening a new issue!
<!--
Please search your issue first to avoid duplication.
*Reports that does not follow the template below, will be considered invalid and closed.*
keep general complaints and questions to the forum or our Discord channel https://www.pencil2d.org/community/
-->

### --Issue Summary--
<!-- (Optional) A brief overview of your issue (i.e When I use the paint bucket in a vector layer everything goes red) -->
### Issue Summary

<!-- WRITE ABOVE THIS LINE -----
hint: (Optional) A brief overview of your issue (i.e When I use the paint bucket in a vector layer everything goes red)
------ OR BELOW THIS -->

### Actual Results

<!-- WRITE ABOVE THIS LINE -----
hint: Explain what you actually got and how different it is from your expectations.
------ OR BELOW THIS -->

### --Actual Results--
<!-- Explain what you actually got and how different it is from your expectations. -->
### Expected Results

### --Expected Results--
<!-- Explain how the function should behave in the context you're using it. -->
<!-- WRITE ABOVE THIS LINE -----
hint: Explain how the function should behave in the context you're using it.
------ OR BELOW THIS -->

### --Video or Image Reference--
<!-- (Optional) A screenshot or short video to show your problem -->
### Video or Image Reference

### --Steps to reproduce--
<!-- describe the exact steps to reproduce the problem as best as you can -->
<!-- WRITE ABOVE THIS LINE -----
hint: (Optional) A screenshot or short video to show your problem
------ OR BELOW THIS -->

### --System Information--
### Steps to reproduce

<!-- WRITE ABOVE THIS LINE -----
hint: describe the exact steps to reproduce the problem as best as you can
------ OR BELOW THIS -->

### System Information
+ Pencil2D Version:
<!-- You can find the VERSION in Menu->Help->About, e.g., 0.5.4 or Nightly build 02 June 2017) -->

+ Operating System:
<!-- (e.g., Windows10, macOS 10.12, Ubuntu 16.04) -->
<!-- WRITE ABOVE THIS LINE -----
hint: You can find the VERSION in Menu->Help->About, e.g., 0.5.4 or Nightly build 02 June 2017
------ OR BELOW THIS -->

+ RAM Size:
<!-- (4GB, 8GB etc.) -->
+ Operating System:

+ Graphics Tablet:
<!-- (Optional) (Write your MODEL, e.g., WACOM Intuos 2) -->
<!-- WRITE ABOVE THIS LINE -----
hint: Windows 10, Mac OS 10.12, Ubuntu 16.04 etc.
------ OR BELOW THIS -->

---
<!--
### --For Code Contributors--
(Optional) You can use this space to point out relevant code chunks that are suspected to be causing the issue.
+ RAM Size:

```C++
Paste here code snippets relevant to your report like so:
#include <iostream>
<!-- WRITE ABOVE THIS LINE -----
hint: 4GB, 8GB etc.
------ OR BELOW THIS -->

int main() {
std::cout << "Hello, World" << endl;
return 0;
}
+ Graphics Tablet:

```
-->
<!-- WRITE ABOVE THIS LINE -----
hint: (Optional) Write your MODEL, e.g., WACOM Intuos 2
------ OR BELOW THIS -->
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ ipch
*.opendb
.vs
*.rc
*.tlog

tests/tests
bin/*
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@

## Download ###

### Pencil2D 0.6.1 (16 April 2018)
### Pencil2D 0.6.2 RC1 (17 September 2018)

[What's new?](https://www.pencil2d.org/2018/04/maintenance-release-0.6.1.html)

| Windows 64 bit | Windows 32 bit | Mac | Linux |
| :--------------: | :---------------: | :-------------: | :---------------: |
| [Download][0] | [Download][1] | [Download][2] | [Download][3] |

[0]: https://github.com/pencil2d/pencil/releases/download/v0.6.1.1/pencil2d-win64-0.6.1.1.zip
[1]: https://github.com/pencil2d/pencil/releases/download/v0.6.1.1/pencil2d-win32-0.6.1.1.zip
[2]: https://github.com/pencil2d/pencil/releases/download/v0.6.1.1/pencil2d-mac-0.6.1.1.zip
[3]: https://github.com/pencil2d/pencil/releases/download/v0.6.1.1/pencil2d-linux-amd64-0.6.1.1.AppImage
[0]: https://github.com/pencil2d/pencil/releases/download/v0.6.2-rc1/pencil2d-win64-v0.6.2-rc1.zip
[1]: https://github.com/pencil2d/pencil/releases/download/v0.6.2-rc1/pencil2d-win32-v0.6.2-rc1.zip
[2]: https://github.com/pencil2d/pencil/releases/download/v0.6.2-rc1/pencil2d-mac-v0.6.2-rc1.zip
[3]: https://github.com/pencil2d/pencil/releases/download/v0.6.2-rc1/pencil2d-linux-amd64-v0.6.2-rc1.AppImage

### Nightly build

Expand Down
13 changes: 13 additions & 0 deletions app/data/pencil2d.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ Keywords=picture;drawing;vector;bitmap;cartoon;
# Translations


# Translations


# Translations
Name[he]=Pencil2D
GenericName[he]=תוכנת הנפשה
Expand Down Expand Up @@ -41,6 +44,10 @@ Name[cs]=Pencil2D
GenericName[cs]=Animační program
Comment[cs]=Tvořte tradiční ručně kreslenou animaci pomocí bitmapové i vektorové grafiky
Icon[cs]=pencil2d
Name[da]=Pencil2D
GenericName[da]=Animationssoftware
Comment[da]=Lav traditionel håndtegnet animation, ved brug af både bitmap og vektorgrafik
Icon[da]=pencil2d
Name[de]=Pencil2D
GenericName[de]=Animationssoftware
Comment[de]=Traditionelle handgezeichnete Animation sowohl mit Raster- als auch mit Vektorgrafik schaffen
Expand All @@ -49,6 +56,10 @@ Name[sl]=Svinčnik2D
GenericName[sl]=Program za animacijo
Comment[sl]=Ustvarite tradicionalno ročno risano animacijo s pomočjo bitne in vektorske grafike
Icon[sl]=pencil2d
Name[hu_HU]=Pencil2D
GenericName[hu_HU]=Animációs Szoftver
Comment[hu_HU]=A Pencil2D egy animáció készítő/rajzoló szoftver Mac OS X, Windows és Linux rendszerekre. Hagyományos, kézzel rajzolt animációk készítésére alkalmas. Bitkép és vagy vektorgrafika használatával.
Icon[hu_HU]=pencil2d
Name[es]=Pencil2D
GenericName[es]=Programa de Animación
Comment[es]=Crea animaciones tradicionales hechas a mano usando mapas de bits o vectores gráficos
Expand All @@ -73,3 +84,5 @@ Name[zh_TW]=Pencil2D
GenericName[zh_TW]=動畫軟體
Comment[zh_TW]=利用點陣圖跟向量圖兩種方式創作傳統手繪動畫
Icon[zh_TW]=pencil2d
Name[kab]=Pencil2D
Icon[kab]=pencil2d
4 changes: 2 additions & 2 deletions core_lib/src/tool/penciltool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -317,14 +317,14 @@ void PencilTool::drawStroke()
else if (layer->type() == Layer::VECTOR)
{
properties.useFeather = false;
properties.width = 0;
mCurrentWidth = 0;
QPen pen(mEditor->color()->frontColor(),
1,
Qt::DotLine,
Qt::RoundCap,
Qt::RoundJoin);

int rad = qRound((properties.width / 2 + 2) * mEditor->view()->scaling());
int rad = qRound((mCurrentWidth / 2 + 2) * mEditor->view()->scaling());

if (p.size() == 4)
{
Expand Down
Loading

0 comments on commit 3ed1dfd

Please sign in to comment.