Skip to content
This repository was archived by the owner on Mar 31, 2020. It is now read-only.

Enthusiastic-Electricians #14

Open
wants to merge 61 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
7c96f64
added ui for menubar & working on funcionality
yas19sin Feb 22, 2019
7aae047
fixed flake8 erros
yas19sin Feb 22, 2019
572da9e
fixed pipenv dependencies not installing correctly
yas19sin Feb 22, 2019
9b942e2
added new & open & save funcionality
yas19sin Feb 22, 2019
3fb48e0
Update Readme.md for PR
Leterax Feb 22, 2019
0986a54
first commit
yas19sin Feb 22, 2019
7b36e09
removed old app files & added the new app
yas19sin Feb 26, 2019
bc48131
made a dynamic ToolBox
yas19sin Feb 26, 2019
d5b2322
Merge branch 'master' of C:\Users\Victor\Documents\GitHub\code-jam-4 …
adsapientiam Feb 27, 2019
2d03e4c
Fixed toolbar; added instances of PaintButton and put them in toolbar;
adsapientiam Feb 27, 2019
2f6d3c1
<NEW_FEATURES: -Fixed toolbar
adsapientiam Feb 27, 2019
4025c4c
added paint patten and life & death of tools
yas19sin Feb 28, 2019
619400a
Added Eraser Tool
yas19sin Feb 28, 2019
5667034
fixed toolbar being effected by colors & added new file funcionality …
yas19sin Feb 28, 2019
a8f81db
added pointy pen breaking & fixed color so transparent is an avaliabl…
yas19sin Feb 28, 2019
b64d851
<NEW: - Scrapped the entire class system>
adsapientiam Feb 28, 2019
77a67d2
added .vscode to gitignore
LeoHeller Feb 28, 2019
21362bc
my test commit
LeoHeller Feb 28, 2019
6d705a9
Update __main__.py
Feb 28, 2019
2e593ee
cleaned up code. no more flake8 errors :)
Feb 28, 2019
7df0e82
moved all tools to class Tool
Feb 28, 2019
23e88ca
changed all references of the tool list to ones of the Tool class
Feb 28, 2019
07f3afd
args of lambda were in the wrong order. now fixed
Feb 28, 2019
78c1a95
changed pic names to mach tool names
Feb 28, 2019
01ff1d4
no longer draw outside of bounds
Feb 28, 2019
d0c9450
added functionality to tools
yas19sin Feb 28, 2019
b86753b
<NEW: -Added a class for the colors Pallettes
adsapientiam Feb 28, 2019
1eb81ba
added funcionality to Tool again and fixed color pallet
yas19sin Feb 28, 2019
3e6a7a8
fill tool now fills correctly
yas19sin Mar 1, 2019
e66d79e
NEW: - changed changePaintAreaVars into connectTool and deleted all e…
adsapientiam Mar 1, 2019
79320e5
fixed some of code so the app works
yas19sin Mar 1, 2019
9abd2aa
NEW: Managed to make the color pallette system work with mixing syste…
adsapientiam Mar 1, 2019
4e02d6a
duration timing works now, without toolDead; fill tool now empties pa…
adsapientiam Mar 2, 2019
f0a8eb9
color pallette now updates upon changing color!!!
adsapientiam Mar 2, 2019
4576fc1
fixed flak8 errors and cursor is now the same in both windows
Mar 2, 2019
4bba551
fixed serious bug regarding color mixing
adsapientiam Mar 2, 2019
05a90d5
fixed flake8 errors
yas19sin Mar 3, 2019
fa5371a
some little code fixing
yas19sin Mar 3, 2019
9f81761
optimized some of the code & added solid brush effect
yas19sin Mar 3, 2019
e487c86
made the opacity drop while using brushes; started to transform brush…
adsapientiam Mar 3, 2019
7c6924f
Update README.md
adsapientiam Mar 3, 2019
ce59987
reverted a bit; added more pallettes because it'll increase variation
adsapientiam Mar 3, 2019
b635645
reverted a bit; added more pallettes because it'll increase variation
adsapientiam Mar 3, 2019
c6a13ad
Merge remote-tracking branch 'origin/master'
adsapientiam Mar 3, 2019
1b122c7
fixed the crashsed verison and also put the Solid Brush inside the on…
adsapientiam Mar 3, 2019
f52b2be
Added Breaking effect & dripping effect and fixed some stuff
yas19sin Mar 3, 2019
814763a
added Drip effect
Mar 3, 2019
c4cfa7c
added effect to solid brush
yas19sin Mar 3, 2019
2e12d0a
less code lol
Mar 3, 2019
d6752d4
fixed drip, now can use arbitrary width
Mar 3, 2019
093f4f2
only one dripper at a time!
Mar 3, 2019
8e73594
some little code fixing
yas19sin Mar 3, 2019
be2726d
Fixed ColorBox to have a layout
Mar 3, 2019
7fc4b9c
Merge branch 'master' of https://github.com/Leterax/code-jam-4
Mar 3, 2019
854799c
No more complaints about invalid pixmaps at startup
Mar 3, 2019
24bd017
fixed color mixing!
Mar 3, 2019
e96f3a7
fixed buket!
Mar 3, 2019
7934bb8
cleaned up errors
Mar 3, 2019
2e7ec72
removed some stuff
Mar 3, 2019
f08b2ac
updated readme.md a bit and fixed some flake8 errors
Mar 3, 2019
a127e9b
final fixes
Mar 3, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,6 @@ venv.bak/

# mypy
.mypy_cache/

# Vs Code stuff
.vscode/
11 changes: 11 additions & 0 deletions .idea/code-jam-4.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

275 changes: 275 additions & 0 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ verify_ssl = true
flake8 = "*"

[packages]
pyqt5 = "*"

[requires]
python_version = "3.7"

[scripts]
lint = "python -m flake8"
lint = "python -m flake8"
32 changes: 30 additions & 2 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading