Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 81f5065c9e made some changes to command class Luca Carnegie 2019-05-29 11:33:05 -04:00
• 4f62ae7c0e removed test items jslightham 2019-05-29 10:57:40 -04:00
• bad3490b1e synonyms, and take all command jslightham 2019-05-29 10:56:22 -04:00
• 2d40e5954a Fixed some parser things Luca Carnegie 2019-05-28 23:28:34 -04:00
• 5ba426b51b Fixed some story errors and made a synonyms file for the parser Luca Carnegie 2019-05-28 23:02:13 -04:00
• 00ba095757 worked on riddle class Luca Carnegie 2019-05-28 22:49:21 -04:00
• 015c8508ee Create Game Map.JPG jslightham 2019-05-28 17:50:28 -04:00
• d04eb39853 fixed minor errors vleevalerio 2019-05-28 10:10:50 -04:00
• 9d073ef642 finish commit "made riddle class" Luca Carnegie 2019-05-27 22:54:53 -04:00
• 1d3188cb53 made a riddle class Luca Carnegie 2019-05-27 22:54:35 -04:00
• 0acb8bd223 Made rooms.dat file easier to read. Probably too late now, eh Victoria? Luca Carnegie 2019-05-27 20:48:45 -04:00
• 1d0888f0df Added Item-viewing functionality to the room class! Also changed some descriptions Luca Carnegie 2019-05-27 20:34:11 -04:00
• e4ba347415 finished combat, fixed open door null pointer bug jslightham 2019-05-27 18:39:23 -04:00
• 36fe007dd8 updated some things Luca Carnegie 2019-05-27 15:12:23 -04:00
• 81bd3b1c86 Fixed conflicts Luca Carnegie 2019-05-27 14:43:00 -04:00
• 9dede87f7f fixed welcome message Luca Carnegie 2019-05-27 14:40:58 -04:00
• c0fc0bc2cf worked on combat jslightham 2019-05-27 14:15:04 -04:00
• 9e8c5e812c enemies and combat jslightham 2019-05-27 12:47:12 -04:00
• 8f8a55949a eat, drop commands jslightham 2019-05-27 00:03:23 -04:00
• 58068b94d7 Merge branch 'master' of https://github.com/jslightham/Zork jslightham 2019-05-26 23:22:59 -04:00
• 5a5f4fc06a transfer - locked rooms jslightham 2019-05-26 23:22:51 -04:00
• bfcbba4197 made minor edits Luca Carnegie 2019-05-26 12:03:49 -04:00
• d597a1489b fixed conflict on Git Luca Carnegie 2019-05-23 14:06:12 -04:00
• c5e73ec253 Fixed title screen & help screen Luca Carnegie 2019-05-23 14:02:32 -04:00
• ba18bed404 Made a title screen and fixed help command Luca Carnegie 2019-05-23 13:59:29 -04:00
• cf185c25aa more words elacey 2019-05-23 13:48:25 -04:00
• d1337bdea7 Sword item added elacey 2019-05-23 13:46:12 -04:00
• c311ada15e Added new constructor for weapons elacey 2019-05-23 13:43:34 -04:00
• 31983e88a7 More items elacey 2019-05-23 13:37:47 -04:00
• 220d9b1268 fixed more things vleevalerio 2019-05-23 13:26:19 -04:00
• cd0a0c4220 fixed something vleevalerio 2019-05-23 13:24:18 -04:00
• c8258969f4 Merge remote-tracking branch 'origin/master' elacey 2019-05-23 13:21:51 -04:00
• 904e5bdefa Item classes added elacey 2019-05-23 13:21:27 -04:00
• 5a6802679a Merge branch 'master' of https://github.com/jslightham/Zork Luca Carnegie 2019-05-23 13:18:42 -04:00
• fa0cd81a81 Updated enemy class Luca Carnegie 2019-05-23 13:18:25 -04:00
• 0879ba4c20 added the "locked" feature to each room vleevalerio 2019-05-23 13:04:15 -04:00
• 66e42d62ac Merge branch 'master' of https://github.com/jslightham/Zork/ vleevalerio 2019-05-23 12:58:35 -04:00
• 74397502e4 added some more items vleevalerio 2019-05-23 12:56:43 -04:00
• f1c5c19652 Merge remote-tracking branch 'origin/master' elacey 2019-05-22 22:47:28 -04:00
• cfe2f0253d All items and some item classes added elacey 2019-05-22 22:46:57 -04:00
• d6ce3ea8b9 created Enemy class Luca Carnegie 2019-05-22 22:41:31 -04:00
• 59f51231c8 worked on locked doors jslightham 2019-05-22 14:44:22 -04:00
• ad302760eb added "u" and "d" to the case thing vleevalerio 2019-05-22 09:51:58 -04:00
• 19f1a5b941 finished the rooms vleevalerio 2019-05-21 17:21:56 -04:00
• f609ba8be2 finished some more rooms on first floor vleevalerio 2019-05-21 15:04:09 -04:00
• f1c18673d7 Merge remote-tracking branch 'origin/master' vleevalerio 2019-05-20 18:18:46 -04:00
• 561ceba8b9 Finished second floor! vleevalerio 2019-05-20 18:18:33 -04:00
• 2781520ba5 take and inventory command jslightham 2019-05-16 22:40:55 -04:00
• 4506c1e17f Items and classes added elacey 2019-05-16 20:47:49 -04:00
• 7a766cf76a blah vleevalerio 2019-05-16 15:25:41 -04:00
• 1645441b6a added more rooms vleevalerio 2019-05-16 14:15:44 -04:00
• 77c66f77d4 Merge remote-tracking branch 'origin/master' vleevalerio 2019-05-16 13:17:16 -04:00
• 136f318ad5 Made changes to rooms.dat vleevalerio 2019-05-16 13:17:01 -04:00
• 6da8464058 Merge remote-tracking branch 'origin/master' Luca Carnegie 2019-05-16 13:14:18 -04:00
• 7179bf1273 updated rooms.dat Luca Carnegie 2019-05-16 13:13:42 -04:00
• 13837003c2 New items and classes added elacey 2019-05-14 22:29:07 -04:00
• 04c8716308 Changed Welcome message and fixed rooms.dat again. Luca Carnegie 2019-05-14 20:02:22 -04:00
• 5e93aa35d6 Merge branch 'master' of https://github.com/jslightham/Zork Luca Carnegie 2019-05-14 19:50:32 -04:00
• 3138bf34c1 Fixed rooms.dat formatting (was throwing exceptions) Luca Carnegie 2019-05-14 15:41:26 -04:00
• 31a0198d37 bleh vleevalerio 2019-05-14 15:13:55 -04:00
• c1d572974d added more rooms... vleevalerio 2019-05-14 15:13:20 -04:00
• 690ff4abaf Updated Game Class Luca Carnegie 2019-05-14 14:41:18 -04:00
• 828d474908 Merge remote-tracking branch 'origin/master' vleevalerio 2019-05-10 18:08:59 -04:00
• 4dc3207fc6 added a few room vleevalerio 2019-05-10 18:08:42 -04:00
• 029d8d7cf5 Fixed spelling error. elacey 2019-05-10 15:39:51 -04:00
• b103875cec Two more items and their classes added. elacey 2019-05-10 15:37:36 -04:00
• fd9505f1cd Fixed item id elacey 2019-05-10 14:03:34 -04:00
• f922313470 Merge remote-tracking branch 'origin/master' elacey 2019-05-10 14:01:16 -04:00
• 73279ff515 Item Classes for 6 objects elacey 2019-05-10 14:00:31 -04:00
• 33f225ff5d Merge branch 'master' of https://github.com/jslightham/Zork/ vleevalerio 2019-05-10 13:52:05 -04:00
• 7300caadab fixed some more vleevalerio 2019-05-10 13:51:51 -04:00
• 62e041a20b Merge remote-tracking branch 'origin/master' elacey 2019-05-10 13:47:32 -04:00
• 531c672182 Added 5 items elacey 2019-05-10 13:42:31 -04:00
• 15b0b00300 changed some rooms vleevalerio 2019-05-10 13:40:13 -04:00
• fb88339836 changed some rooms vleevalerio 2019-05-10 13:34:13 -04:00
• 9b1cd284ee fixed rooms, worked on take command jslightham 2019-05-10 12:54:16 -04:00
• 37a428fa93 Merge remote-tracking branch 'origin/master' vleevalerio 2019-05-08 14:59:31 -04:00
• f1883a9962 added a few rooms vleevalerio 2019-05-08 14:54:08 -04:00
• b316d3daef Fixed small error with down (I think) elacey 2019-05-08 14:44:20 -04:00
• 83cdb4a057 Merge remote-tracking branch 'origin/master' vleevalerio 2019-05-08 14:35:26 -04:00
• 2d22d43fa4 Merge branch 'master' of https://github.com/jslightham/Zork/ vleevalerio 2019-05-08 14:35:10 -04:00
• 4aa2612cbe Test Commit elacey 2019-05-08 14:27:05 -04:00
• 7fa30879c0 Fixed parser, added items starting in rooms, moved item room storage jslightham 2019-05-08 11:43:21 -04:00
• dfd9b4ab51 its not done yet tho vleevalerio 2019-05-08 10:35:54 -04:00
• 0c44589f03 Edited rooms file elacey 2019-05-06 13:44:14 -04:00
• 3358439e02 items jslightham 2019-04-26 15:35:03 -04:00
• 14bd1aa83f import words through file jslightham 2019-04-24 22:52:15 -04:00
• 9805c8ea84 worked on parser jslightham 2019-04-24 21:25:48 -04:00
• 5023bddaad Added exciting text Luca Carnegie 2019-04-22 22:30:32 -04:00
• da5e32c57f added "!" vleevalerio 2019-04-08 15:28:47 -04:00
• 5ea003a714 Changed room 3 description Luca Carnegie 2019-02-09 13:34:41 -05:00
• 5b0c75dcda Create .project jslightham 2019-01-31 10:43:09 -05:00
• bf058f344c Update .gitignore jslightham 2019-01-29 20:44:09 -05:00
• 383b4500ef test commit jslightham 2019-01-16 10:15:27 -05:00
• 73dabdaef6 Update .gitignore jslightham 2019-01-16 10:11:54 -05:00
• edf347a11b Initial jslightham 2019-01-15 20:45:15 -05:00
• d8d4059314 Initial commit jslightham 2019-01-15 20:41:41 -05:00