summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* leave restrictions for s2e1George Angelopoulos2013-04-201-0/+9
* Added the final bug tile. ToDo: leave restrictionsGeorge Angelopoulos2013-04-201-0/+21
* wrong indentation on previous commitGeorge Angelopoulos2013-04-201-1/+1
* added a pause after leave textGeorge Angelopoulos2013-04-201-0/+1
* Fixed bug I had made on leave method for e1.George Angelopoulos2013-04-201-1/+3
* Added leave text if not going after the bug.George Angelopoulos2013-04-201-4/+10
* Fixed leave bug in s1e1 and modified output text.George Angelopoulos2013-04-201-2/+10
* Added first bug tile.George Angelopoulos2013-04-201-0/+21
* added south leave text for e1George Angelopoulos2013-04-201-0/+7
* Another minor grammar fix.George Angelopoulos2013-04-191-1/+1
* Fixed some grammatical and spelling errors.George Angelopoulos2013-04-191-1/+1
* Merge pull request #17 from lathan/masterThomas Kluyver2013-04-1811-33/+47
|\
| * Added vim .swp files to .gitignoreGeorge Angelopoulos2013-04-181-0/+2
| * added a comment for clarityGeorge Angelopoulos2013-04-181-0/+3
| * PEP 8 police: Wrapped 80+ char lines in all tiles!George Angelopoulos2013-04-189-29/+35
| * Checks for challenge completion before complainingGeorge Angelopoulos2013-04-181-1/+1
| * PEP 8 police: Wrapped long strings to less than 80 charactersGeorge Angelopoulos2013-04-181-3/+6
|/
* Merge pull request #10 from gradi3nt/southern-tiles-1Thomas Kluyver2013-01-285-1/+112
|\
| * Made changes recommended by takluyverJulian Irwin2013-01-273-10/+14
| * Finished s3 encounter w/ short manJulian Irwin2013-01-263-15/+46
| * Merge branch 'master' of git://github.com/takluyver/weatbag into southern-til...Julian Irwin2013-01-266-10/+103
| |\ | |/ |/|
* | Merge pull request #13 from SmartViking/masterThomas Kluyver2013-01-141-4/+2
|\ \
| * | Changed action.get_action to handle prepositions differentlySmart Viking2013-01-141-4/+2
|/ /
* | Merge pull request #11 from takluyver/items-frameworkThomas Kluyver2013-01-136-6/+101
|\ \
| * | Document combining itemsThomas Kluyver2013-01-131-0/+20
| * | New framework to allow combining items.Thomas Kluyver2013-01-135-6/+81
|/ /
| * Merge remote-tracking branch 'upstream/master' into southern-tiles-1Julian Irwin2013-01-112-2/+11
| |\ | |/ |/|
* | Merge pull request #8 from kkpattern/eat_berriesThomas Kluyver2013-01-112-2/+11
|\ \
| * | Now player can eat berries to recover 2 hit point in tile n3.kylerzhang2013-01-112-2/+11
|/ /
| * Merge remote-tracking branch 'upstream/master' into southern-tiles-1Julian Irwin2013-01-106-4/+109
| |\ | |/ |/|
* | Allow custom message when player attempts to move to nonexistent tile.Thomas Kluyver2013-01-103-9/+12
* | Merge pull request #4 from ben174/masterThomas Kluyver2013-01-095-1/+103
|\ \
| * | Fixed leave condition at cave entrance.Ben Friedland2013-01-071-0/+5
| * | Else condition for reporting health is now a catch-all (in case they go into ...Ben Friedland2013-01-071-1/+1
| * | leave method returns True if they manage to fleeBen Friedland2013-01-071-0/+1
| * | Support for attack words.Ben Friedland2013-01-072-2/+3
| * | Removed additional player_life attribute from n3 tile. It's been moved to Pla...Ben Friedland2013-01-071-1/+0
| * | Orc battle at entrance of cave. Player now has hit_points.Ben Friedland2013-01-074-1/+97
| | * Half way done with s3Julian Irwin2013-01-103-26/+59
| | * Fleshed out s2Julian Irwin2013-01-092-6/+38
| | * Added s2 (basically stub). I plan to add some adventures in this direction.Julian Irwin2013-01-082-1/+12
| |/ |/|
* | Add a simple way to test tilesThomas Kluyver2013-01-075-13/+80
* | Merge pull request #5 from lathan/masterThomas Kluyver2013-01-071-1/+1
|\ \
| * | added missing whitespace in stringGeorge Angelopoulos2013-01-071-1/+1
|/ /
* / Add transfer() utility function.Thomas Kluyver2013-01-073-3/+29
|/
* Small fix for tile n2Thomas Kluyver2013-01-071-1/+2
* Merge pull request #3 from ben174/masterThomas Kluyver2013-01-071-9/+13
|\
| * Tile e2 now contains a dwarf rather than a wizard. Torch is given unlit. Gues...Ben Friedland2013-01-071-9/+13
* | Merge pull request #1 from ben174/masterThomas Kluyver2013-01-072-1/+40
|\|
| * Error handling for invalid guesses in wizard's challenge.Ben Friedland2013-01-071-11/+14