Commit Graph

51 Commits

Author SHA1 Message Date
Andreas Zweili b207707fa3 I think this branch is newer. 2016-06-28 22:15:09 +02:00
Andreas Zweili 76769c2279 removing pet_variables because they're not needed anymore 2015-08-31 21:33:08 +02:00
Andreas Zweili be0e7e0bf4 enabling threading
fixing the deacrese_stats method
2015-08-31 21:31:44 +02:00
Andreas Zweili 3cb88fe198 some first changes to make the pet a class 2015-08-31 06:42:03 +02:00
Andreas Zweili 612896caff some first changes to make the pet a class 2015-08-31 06:40:33 +02:00
Andreas Zweili ce31b6c748 Moving the journal to my notes.
Fixing some typos
2015-08-30 11:49:38 +02:00
Andreas Zweili 6e327b4db9 Adding a second line after the functions 2015-08-30 11:46:29 +02:00
Andreas Zweili 53a9b92c01 deleting the .idea and __pycache__ from the repo 2015-07-26 18:36:10 +02:00
Andreas Zweili 637926ef77 try again 2015-07-26 18:33:12 +02:00
Andreas Zweili 1b4a341952 adding .idea and __pycache__ to the gitignore file 2015-07-26 18:30:08 +02:00
Andreas Zweili 2c5068a8a9 fixing two mistaks 2015-07-26 18:20:37 +02:00
Nebucatnetzer 1a352d361e Merge branch 'master' of github.com:Nebucatnetzer/tamagotchi 2015-07-15 12:36:04 +02:00
Nebucatnetzer 8bb7a8182c removing vim files 2015-07-15 12:35:32 +02:00
Nebucatnetzer 88969757c4 refactoring a bit and adding the .idea and __pycache__ folder to
ignore
2015-07-15 12:30:34 +02:00
Andreas Zweili f75423fb37 owncloud sync error 2015-07-14 23:14:44 +02:00
Andreas Zweili 61682342c3 Merge branch 'master' of github.com:Nebucatnetzer/tamagotchi 2015-07-14 23:13:44 +02:00
Andreas Zweili 17e3432c35 commiting changes 2015-07-14 23:12:32 +02:00
Nebucatnetzer be70f2180b adjusting how many time you can poke the pet 2015-07-14 19:28:19 +02:00
Nebucatnetzer 0f0c0fc12a Merge branch 'master' of github.com:Nebucatnetzer/tamagotchi 2015-07-14 12:41:06 +02:00
Nebucatnetzer 8d7d5223f6 finalizing the sleeping function 2015-07-14 12:39:47 +02:00
Andreas Zweili 99d625ea06 adding a sleep function to the sleeping activity
otherwise it passes too fast to see
2015-07-13 20:38:59 +02:00
Andreas Zweili e3fe4e7da3 doing some cleanup 2015-07-12 23:10:17 +02:00
Andreas Zweili a3bc091008 updated the readme 2015-07-12 22:56:25 +02:00
Andreas Zweili 8f090b951a add the basis for a function which let's the pet sleep 2015-07-12 22:53:40 +02:00
Nebucatnetzer a41cf688c9 Merge branch 'master' of github.com:Nebucatnetzer/tamagotchi 2015-07-12 22:12:37 +02:00
Nebucatnetzer 8d039f287e adding the mp3 files 2015-07-12 22:12:27 +02:00
Nebucatnetzer 3aee60bbc4 stuff inside which I don't know yet 2015-07-12 22:11:47 +02:00
Andreas Zweili 6c58cdd9c4 adding various comments to explain what the functions are doing 2015-07-12 22:02:49 +02:00
Andreas Zweili dd97541335 fix some small typos 2015-07-12 21:51:40 +02:00
Andreas Zweili aa64579cbe adding the sound files for angry and happy sounds 2015-07-12 21:47:52 +02:00
Andreas Zweili ee090b61a2 Merge branch 'master' of github.com:Nebucatnetzer/tamagotchi 2015-07-12 21:17:41 +02:00
Andreas Zweili 44f4428019 adding a function to poke the pet 2015-07-12 21:10:36 +02:00
Nebucatnetzer 3c43fe9ca7 catching the ValueError in the activity list
when pressing enter because enter is not an integer
2015-07-12 15:19:41 +02:00
Nebucatnetzer a72fe6c275 moving some variables into the pet_variables file 2015-07-12 13:41:15 +02:00
Nebucatnetzer 60c723522c Merge branch 'master' of github.com:Nebucatnetzer/tamagotchi
and clearing the terminal before displaying the stats to make it a bit
more readable
2015-07-10 12:14:06 +02:00
Nebucatnetzer b8049a48e9 adding a pause of 1 second to the stroking function to make it more
readable
2015-07-10 12:08:10 +02:00
Andreas Zweili 128db7946b fix a sync bug 2015-07-09 00:19:44 +02:00
Andreas Zweili 02ced24cba adding a stroking function 2015-07-09 00:15:36 +02:00
Andreas Zweili ae77fcb86c making the readme a bit more readable. 2015-07-08 18:34:21 +02:00
Nebucatnetzer 1bf51cafdf adding the ability to name the pet 2015-07-08 12:44:11 +02:00
Andreas Zweili 93133d2b37 see previous commit 2015-07-08 00:12:08 +02:00
Andreas Zweili 782222269c moving the decrease stats thread and the beginning_finished variable out of the main loop
fix various spelling mistakes.
2015-07-08 00:09:36 +02:00
Nebucatnetzer 3b1519ede5 Update README.md 2015-07-06 23:21:04 +02:00
Andreas Zweili 4bab53e82b fixing various spelling mistakes and reformated the code a bit. 2015-07-06 23:11:25 +02:00
Andreas Zweili 92dde20147 fixing some format and spelling errors.
In addition removing some lines which I probably pasted by mistake.
2015-07-06 22:52:34 +02:00
Andreas Zweili f85a867d7d fixing a spelling error 2015-07-06 22:47:35 +02:00
Andreas Zweili 395d072d0f apparently a comment starts with "# " not just with "#" 2015-07-06 22:46:29 +02:00
Andreas Zweili 6bbd3c3a32 fixing some minor things 2015-07-06 22:40:50 +02:00
Andreas Zweili e91eb9750a adding the programme files 2015-07-06 22:23:17 +02:00
Nebucatnetzer fa205f74ee Create README.md 2015-07-04 17:26:45 +02:00