Skip to content
This repository was archived by the owner on Mar 31, 2020. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
7d13388
Submitting first PR as requested
stevenpitts Feb 22, 2019
4ca9128
Added skeleton code
stevenpitts Feb 23, 2019
6275161
Basic Keyboard Functionality
missingfragment Feb 23, 2019
3605564
Keyboard Update
missingfragment Feb 24, 2019
0f6ace0
Fixed Pipfile
missingfragment Feb 24, 2019
86e0f8a
Merge pull request #1 from makusu2/missingfragment
stevenpitts Feb 24, 2019
1ee3ffe
Jsonified
stevenpitts Feb 24, 2019
39f51aa
Merge pull request #2 from makusu2/AddingJson
stevenpitts Feb 24, 2019
7b8ff46
Allow for adding multiple of the same key. No longer appears like a q…
stevenpitts Feb 24, 2019
910cae6
Added home row as default layout
stevenpitts Feb 24, 2019
0f9cf41
Merge pull request #3 from makusu2/AllowMultipleKeys
stevenpitts Feb 24, 2019
22f8dd2
JSON save and load
missingfragment Feb 25, 2019
6684cb4
Updated brainstorming
stevenpitts Feb 25, 2019
1945133
Lootboxes on new words working
stevenpitts Feb 25, 2019
bd28faf
Lootboxes on new words working
stevenpitts Feb 25, 2019
e9f1ec9
Moved to more versatile save file, improved word recognition
stevenpitts Feb 25, 2019
4d93b37
Merge pull request #4 from makusu2/Maku
stevenpitts Feb 25, 2019
90f84bc
Merged missingfragment into main
stevenpitts Feb 25, 2019
dc6aacf
Merge pull request #5 from makusu2/MissingFragmentMerge
stevenpitts Feb 25, 2019
18d556c
Added enchant to pipfile
missingfragment Feb 26, 2019
e2430cf
Basic Loot Boxes
missingfragment Feb 26, 2019
4c52958
Merge pull request #6 from makusu2/missingfragment
stevenpitts Feb 26, 2019
4b94067
Cleaned up word check
stevenpitts Feb 26, 2019
8f37d92
Fixed flake8 issues, added package to pipfile
stevenpitts Feb 26, 2019
14e3d0b
Merge branch 'master' of https://github.com/makusu2/code-jam-4 into C…
stevenpitts Feb 26, 2019
cfbeb41
Merge pull request #7 from makusu2/CleanupWordcheck
stevenpitts Feb 26, 2019
c10ac17
Fixed issue where the default keyboard was never being loaded if a sa…
stevenpitts Feb 26, 2019
b15360d
Merge pull request #8 from makusu2/default_layout_issue
stevenpitts Feb 26, 2019
06533c2
Refixed issue with loading keys from save file
stevenpitts Feb 26, 2019
bef6436
Lootbox Graphic & Popup
missingfragment Feb 27, 2019
8e82677
Added download for nltk words
stevenpitts Feb 27, 2019
a4dba13
Merged with missingfragment
stevenpitts Feb 27, 2019
80e3e9b
Merge pull request #9 from makusu2/nltkdownload
stevenpitts Feb 27, 2019
82ee321
Added darkmode, stopped nltk from printing success every time if word…
stevenpitts Feb 27, 2019
ac8e5a5
Merge pull request #16 from makusu2/darkmode
stevenpitts Feb 27, 2019
b2801d8
Added title bar, added placeholder icon, stopped printing on save suc…
stevenpitts Feb 27, 2019
5973d2b
Merge pull request #17 from makusu2/WindowUpgrades
stevenpitts Feb 27, 2019
cb4dc7b
Added XP system for unlocking lootboxes
stevenpitts Feb 27, 2019
8c9e3ab
Added XP system for unlocking lootboxes
stevenpitts Feb 27, 2019
af16ad1
Fixed issue with save data, made lootbox window topmost
stevenpitts Feb 27, 2019
3e4c24c
Fixed flake8 violations
stevenpitts Feb 27, 2019
d57c87a
Added xp bar and small lootbox image
stevenpitts Feb 27, 2019
f937daa
Added xp bar and small lootbox image
stevenpitts Feb 27, 2019
0965830
Refactored some code, improved icon appearance
stevenpitts Feb 28, 2019
b695598
Merge pull request #19 from makusu2/XPBar
stevenpitts Feb 28, 2019
0be6a16
Added audio. NOT WORKING. Pushing so as to request help.
stevenpitts Mar 1, 2019
47d5f7c
Removed loot_box_rates.json
missingfragment Mar 1, 2019
ce4a98c
Audio now working
stevenpitts Mar 1, 2019
ea3755c
Merge pull request #22 from makusu2/Audio
stevenpitts Mar 1, 2019
f16b7c9
Fixed some words not being recognized, but the dictionary is now very…
stevenpitts Mar 1, 2019
5fda1ff
Basic Saving & Loading
missingfragment Mar 1, 2019
0fe55c7
Fixed bug where xp would always show 0 on load
stevenpitts Mar 1, 2019
b1e51d5
Merge pull request #24 from makusu2/DictionaryIssues
stevenpitts Mar 1, 2019
26f4733
Merge branch 'missingfragment' of https://github.com/makusu2/code-jam-4
stevenpitts Mar 1, 2019
2aa2002
Merged menubar
stevenpitts Mar 1, 2019
58f2bc8
Merge pull request #25 from makusu2/Menubar
stevenpitts Mar 1, 2019
d808bed
Added letter scoring
stevenpitts Mar 1, 2019
6a4078b
Merge pull request #26 from makusu2/BetterScoring
stevenpitts Mar 1, 2019
c251828
Update gitignore
missingfragment Mar 1, 2019
3bd1800
Merge pull request #27 from makusu2/missingfragment
stevenpitts Mar 1, 2019
dc77e74
Preparing for pull from master
stevenpitts Mar 1, 2019
1ba1558
Merge branch 'master' of https://github.com/makusu2/code-jam-4 into T…
stevenpitts Mar 1, 2019
c6a04b8
Update gitignore
missingfragment Mar 1, 2019
676e6a1
Merge branch 'missingfragment' of https://github.com/makusu2/code-jam…
missingfragment Mar 1, 2019
93df85e
Added tutorial framework
stevenpitts Mar 1, 2019
97ee5b6
Added tutorial framework
stevenpitts Mar 1, 2019
5f5b0b6
Menu Buttons
missingfragment Mar 1, 2019
1dc09a5
New Lootbox sound effect
missingfragment Mar 1, 2019
9c33aef
Added better tutorial messages
stevenpitts Mar 1, 2019
84a995f
Merged with save/load/new icons
stevenpitts Mar 1, 2019
e164d3e
Updated some tutorials
stevenpitts Mar 1, 2019
0cfeb3e
Merge pull request #28 from makusu2/Tutorial
stevenpitts Mar 1, 2019
3f51431
Updated Tutorial Text
missingfragment Mar 1, 2019
d203a4a
Updated Tutorials
missingfragment Mar 2, 2019
471a770
Added async for audio file closing
stevenpitts Mar 2, 2019
e2cfe98
Merge with missingfragment, fixed async issues
stevenpitts Mar 2, 2019
d822e88
Merge pull request #29 from makusu2/asyncing
stevenpitts Mar 2, 2019
3b2ce7f
Added threading for audio preparation, should run much faster now
stevenpitts Mar 2, 2019
5c7e16d
Fixed memory leak on wave files
stevenpitts Mar 2, 2019
f84761c
Fixed delay AND allow multiple sounds at a time
stevenpitts Mar 2, 2019
9915448
Merge pull request #30 from makusu2/asyncing
stevenpitts Mar 2, 2019
130d3af
Added project information
stevenpitts Mar 2, 2019
5656dad
Added pipenv support for Windows, updated run instructions
stevenpitts Mar 3, 2019
22aba28
Merge pull request #31 from makusu2/projectinfo
stevenpitts Mar 3, 2019
a7cc3ae
Added better docstrings
stevenpitts Mar 3, 2019
852810b
Fixed some bad styling, added some docstrings
stevenpitts Mar 3, 2019
70403d9
Clarified pipenv requirements
stevenpitts 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
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,7 @@ venv.bak/

# mypy
.mypy_cache/

# custom
project/save_data.json
documents/*.*
6 changes: 5 additions & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,13 @@ verify_ssl = true
flake8 = "*"

[packages]
flake8 = "*"
pillow = "*"
pyaudio = {path = "./PyAudio-0.2.11-cp37-cp37m-win32.whl"}

[requires]
python_version = "3.7"

[scripts]
lint = "python -m flake8"
start = "python -m project"
lint = "python -m flake8"
105 changes: 97 additions & 8 deletions Pipfile.lock

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

Binary file added PyAudio-0.2.11-cp37-cp37m-win32.whl
Binary file not shown.
26 changes: 19 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

The theme for this code jam will be **This app hates you!**. You will be creating an application using a GUI library of your choice in Python. The application must serve a real purpose, but must also fit the theme.

You can use any GUI library that you wish to use, but you have to make _a desktop app_. For example, you may use frameworks like PySide, PyQt, tkinter, or wxPython. You can even use stuff like Kivy or PyGame, although we do not recommend that you do. You may not, however, use webframeworks like Django or Flask, and you may not use anything that turns HTML and CSS into a desktop app that runs as a browser.
You can use any GUI library that you wish to use, but you have to make _a desktop app_. For example, you may use frameworks like PySide, PyQt, tkinter, or wxPython. You can even use stuff like Kivy or PyGame, although we do not recommend that you do. You may not, however, use webframeworks like Django or Flask, and you may not use anything that turns HTML and CSS into a desktop app that runs as a browser.

Here are a couple of examples of what we mean by an application that "serves a real purpose but also fits the theme":
* A calculator app that calculates the right answers, but represents the answer in a way that's completely impractical.
* An image resizer where you have to specify which part of the image to resize, specify how much force to apply to the resize operation in newtons, and then manually resize the image by turning a crank.
* An alarm clock app that plays a very loud sound effect every 5 minutes reminding you that your alarm will ring in 6 hours. The closer it gets to the 6 hour mark, the lower the volume of the sound effect. When the time is up, the sound effect is virtually inaudible.

Remember that teamwork is not optional for our code jams - You must find a way to work together. For this jam, we've assigned a leader for each team based on their responses to the application form. Remember to listen to your leader, and communicate with the rest of your team!
Remember that teamwork is not optional for our code jams - You must find a way to work together. For this jam, we've assigned a leader for each team based on their responses to the application form. Remember to listen to your leader, and communicate with the rest of your team!

**Remember to provide instructions on how to set up and run your app at the bottom of this README**.

Expand All @@ -22,24 +22,36 @@ Remember that teamwork is not optional for our code jams - You must find a way t

# Setting Up

You should be using [Pipenv](https://pipenv.readthedocs.io/en/latest/). Take a look
You should be using [Pipenv](https://pipenv.readthedocs.io/en/latest/). Take a look
[at the documentation](https://pipenv.readthedocs.io/en/latest/) if you've never used it before. In short:

* Setting up for development: `pipenv install --dev`
* Running the application (assuming you use our project layout): `pipenv run start`

# Project Information

`# TODO`
High Tech Keyboard (HTT), a High Houses company (of the Adorable corperation)
You can run `project/__main__.py` on any device with the dependencies installed, but for pipenv to work you must be running up-to-date Windows x32.

## Description

`# TODO`
"Hello there! This is the High Tech Text Editor. Did you know that the first keyboard was invented in 1868? That was a long time ago!

Here at Adorable Laboratories, we don't live in 1868 anymore, so we believe in giving our users more modern features than they could ever need. And when you think of modern, accessible, and afforadable, what first comes to mind? Why lootboxes, of course!

Therefore, we are proud to introduce the first high-tech, personalized onscreen keyboard text editor with a built-in progression system! Go ahead, check it out!

## Setup & Installation

`# TODO`
Do to difficulties installing PyAudio with pip, there are some additional steps you may need to take if you encounter an error.
If you are using Windows x32, you can run `pipenv install --dev` and then `pipenv run start`.
If you are using a different OS, or if you are unable to run the pipenv install, you must manually install the dependencies found in the Pipfile and run project/__main__.py instead.
PyAudio installation instructions for your OS can be found at the [PyAudio Homepage](https://people.csail.mit.edu/hubert/pyaudio/).

## How do I use this thing?

`# TODO`
Our tutorial will guide you! Here's a brief rundown:
* Type words to get XP!
* Use XP to unlock lootboxes!
* Open lootboxes to get more keyboard keys!
* Use new keyboard keys to type new words!
Binary file added audio/decision4.wav
Binary file not shown.
Binary file added audio/pop.wav
Binary file not shown.
2 changes: 2 additions & 0 deletions audio/sources.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
pop.wav: http://soundbible.com/1977-Bubble-Gum-Pop.html
tap.wav: https://www.freesoundeffects.com/free-sounds/city-sounds-10028/40/tot_sold/20/3/
Binary file added audio/tap.wav
Binary file not shown.
Binary file added img/capsule1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/capsule2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/capsule_small.ico
Binary file not shown.
Binary file added img/new_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/open_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/save_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/tutorial_neutral.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/tutorial_smirk.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/window_icon.ico
Binary file not shown.
Loading