Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 02043ed5e9 removed god mode (again). master Luca Carnegie 2019-06-01 13:19:58 -04:00
• 9575409815 Merge branch 'master' of https://github.com/jslightham/Zork Luca Carnegie 2019-06-01 11:42:23 -04:00
• 2a413c304f Absolute final commit Luca Carnegie 2019-06-01 11:42:12 -04:00
• d941264ec1 comments jslightham 2019-06-01 02:05:37 -04:00
• f937a017cd comments jslightham 2019-06-01 02:05:04 -04:00
• c0ffa91d70 final commit Luca Carnegie 2019-06-01 01:18:49 -04:00
• d57a0df5b5 now it should work Luca Carnegie 2019-06-01 01:10:57 -04:00
• b75abf9368 Merge branch 'master' of https://github.com/jslightham/Zork Luca Carnegie 2019-06-01 01:10:11 -04:00
• 0df48979b3 woot Luca Carnegie 2019-06-01 01:09:58 -04:00
• 808a7c1963 Delete ZorkUML.jpg Luca Carnegie 2019-06-01 01:09:29 -04:00
• 41d22a83b2 UML Luca Carnegie 2019-06-01 01:09:04 -04:00
• 6473a76418 Merge branch 'master' of https://github.com/jslightham/Zork Luca Carnegie 2019-06-01 01:07:04 -04:00
• 41dab1ca1a new UML files. we're done!! Luca Carnegie 2019-06-01 01:06:56 -04:00
• 7d8e495fa0 Add files via upload Luca Carnegie 2019-06-01 01:05:20 -04:00
• 0ad9098d2e final jslightham 2019-06-01 01:04:16 -04:00
• 8083d3a848 Merge branch 'master' of https://github.com/jslightham/Zork jslightham 2019-06-01 00:50:34 -04:00
• 33586d7f35 fixed bugs jslightham 2019-06-01 00:49:31 -04:00
• cd76933723 made changing descriptions and added a spicy new riddle Luca Carnegie 2019-06-01 00:46:40 -04:00
• 3787f4b1f2 Merge remote-tracking branch 'origin/master' Luca Carnegie 2019-06-01 00:34:45 -04:00
• e88785ba82 changed some things Luca Carnegie 2019-06-01 00:34:36 -04:00
• c8642adc5c Merge branch 'master' of https://github.com/jslightham/Zork jslightham 2019-06-01 00:18:59 -04:00
• 05a1c46cbb Update rooms.dat jslightham 2019-06-01 00:18:52 -04:00
• efdace7467 Merge remote-tracking branch 'origin/master' Luca Carnegie 2019-06-01 00:05:05 -04:00
• b3faf296e8 made some funny command words Luca Carnegie 2019-06-01 00:04:55 -04:00
• 7291e08319 lucaaaaaaaaaaaaaaaaaaaaaaaaaaaa jslightham 2019-06-01 00:03:20 -04:00
• 43085ca83d Merge branch 'master' of https://github.com/jslightham/Zork Luca Carnegie 2019-05-31 23:50:38 -04:00
• 23f0535a0a added notebook reading Luca Carnegie 2019-05-31 23:50:24 -04:00
• 90911daccc remove item on use jslightham 2019-05-31 23:37:24 -04:00
• f9f86d221b fixed missing i-- bug jslightham 2019-05-31 23:22:53 -04:00
• c6b31c2512 fixed OP enemies jslightham 2019-05-31 23:15:25 -04:00
• 1232f150c9 bleeding and bandages jslightham 2019-05-31 23:15:01 -04:00
• ff32ca6ab5 Merge branch 'master' of https://github.com/jslightham/Zork/ vleevalerio 2019-05-31 22:02:11 -04:00
• c50c8f6c9f fixed a bug, hopefully vleevalerio 2019-05-31 22:01:47 -04:00
• 2d16686a06 battering ram break boards jslightham 2019-05-31 21:49:04 -04:00
• 762ba0f04e Merge branch 'master' of https://github.com/jslightham/Zork jslightham 2019-05-31 21:38:17 -04:00
• dc33a5f896 fixed removal of enemies jslightham 2019-05-31 21:38:10 -04:00
• 5d56d97cb7 Merge branch 'master' of https://github.com/jslightham/Zork Luca Carnegie 2019-05-31 21:34:04 -04:00
• e8da25c867 commit Luca Carnegie 2019-05-31 21:33:57 -04:00
• 9641156e5b Merge branch 'master' of https://github.com/jslightham/Zork jslightham 2019-05-31 21:19:09 -04:00
• df4842cefd added key unlocking jslightham 2019-05-31 21:18:59 -04:00
• 3243641071 player does not have god-like abilities anymore Luca Carnegie 2019-05-31 21:13:23 -04:00
• d7206c1a43 fixed some things Luca Carnegie 2019-05-31 21:12:16 -04:00
• 671f6eacb0 Made warmbread class Luca Carnegie 2019-05-31 20:59:14 -04:00
• 8cac7a4315 fixed items display bug Luca Carnegie 2019-05-31 20:33:29 -04:00
• 39ab9f2332 Merge branch 'master' of https://github.com/jslightham/Zork Luca Carnegie 2019-05-31 20:20:28 -04:00
• 389a7e3c05 fixing item display Luca Carnegie 2019-05-31 20:10:16 -04:00
• 788271ff3d fixed enemy bug jslightham 2019-05-31 19:57:43 -04:00
• 67839c569e added lady pellatt jslightham 2019-05-31 19:46:51 -04:00
• cfc9741f19 enemy drop loot on death jslightham 2019-05-31 19:14:21 -04:00
• 45fe341059 finished crafting jslightham 2019-05-31 19:02:52 -04:00
• ad08e5482a commit Luca Carnegie 2019-05-31 17:34:05 -04:00
• 7f11141f58 Merge branch 'master' of https://github.com/jslightham/Zork Luca Carnegie 2019-05-31 17:32:06 -04:00
• 37aec4befc made scream command Luca Carnegie 2019-05-31 17:31:56 -04:00
• 7c1d2918e2 synonyms.dat updated elacey 2019-05-31 17:08:22 -04:00
• 25a55c095a words.dat updated elacey 2019-05-31 17:07:41 -04:00
• 1c15107db4 Fixed capitals elacey 2019-05-31 17:05:37 -04:00
• b1f410da49 fixed a few things in rooms.dat vleevalerio 2019-05-31 09:53:16 -04:00
• ec64080aa1 Merge branch 'master' of https://github.com/jslightham/Zork jslightham 2019-05-30 23:46:15 -04:00
• df3d031933 shavingcream blindness jslightham 2019-05-30 23:44:30 -04:00
• 0da2e95425 added a removeRiddler() method. Luca Carnegie 2019-05-30 23:41:20 -04:00
• 38a10f116d new UML diagram Luca Carnegie 2019-05-30 19:48:03 -04:00
• 4499f97120 Found a UML diagram plugin for eclipse and made some UML diagrams Luca Carnegie 2019-05-30 12:16:59 -04:00
• f49c7e94e0 Updated README after a conflict with git Luca Carnegie 2019-05-30 10:27:09 -04:00
• 810579c7f2 Updated README Luca Carnegie 2019-05-30 10:25:09 -04:00
• 078ab4bb8a Update README.md Luca Carnegie 2019-05-29 23:26:36 -04:00
• eb8f1045c0 Create README.md Luca Carnegie 2019-05-29 23:20:19 -04:00
• c2949d37d7 Merge branch 'master' of https://github.com/jslightham/Zork Luca Carnegie 2019-05-29 23:17:39 -04:00
• 2fd7b3ed6f Changed riddler execution Luca Carnegie 2019-05-29 23:17:29 -04:00
• 211a069172 Merge remote-tracking branch 'origin/master' vleevalerio 2019-05-29 23:05:57 -04:00
• e5d29e67c7 fixed minor formatting errors vleevalerio 2019-05-29 23:05:34 -04:00
• d052273a99 Merge remote-tracking branch 'origin/master' Luca Carnegie 2019-05-29 22:55:40 -04:00
• 7173fc0208 Made riddle in Circle room pretty Luca Carnegie 2019-05-29 22:54:44 -04:00
• 21e7189956 fixed riddles vleevalerio 2019-05-29 22:53:28 -04:00
• 2df0c4abb2 added breaks in room descriptions vleevalerio 2019-05-29 22:42:23 -04:00
• 48b8545cc6 riddles are done! Luca Carnegie 2019-05-29 22:32:44 -04:00
• 0fc289deb0 riddler gives you a prize when riddle is successfully answered Luca Carnegie 2019-05-29 21:39:16 -04:00
• 657b859686 Made it so that you can enter custom message for each riddler object Luca Carnegie 2019-05-29 21:16:36 -04:00
• 52c383a482 Merge branch 'master' of https://github.com/jslightham/Zork Luca Carnegie 2019-05-29 19:48:04 -04:00
• 87afdf44f4 worked on riddler Luca Carnegie 2019-05-29 19:47:53 -04:00
• 96b1e7b7e1 fixed minor errors vleevalerio 2019-05-29 18:08:44 -04:00
• c633473df6 Merge branch 'master' of https://github.com/jslightham/Zork Luca Carnegie 2019-05-29 14:13:23 -04:00
• 9daad10509 worked on riddle class Luca Carnegie 2019-05-29 14:13:10 -04:00
• 10e5d86a69 Merge remote-tracking branch 'origin/master' elacey 2019-05-29 13:45:56 -04:00
• b1677e58aa Removed one of the leave's elacey 2019-05-29 13:45:35 -04:00
• 67e7c0ba54 Merge branch 'master' of https://github.com/jslightham/Zork Luca Carnegie 2019-05-29 13:43:06 -04:00
• c50c63477c made riddler for rooms, etc... Luca Carnegie 2019-05-29 13:42:53 -04:00
• 01bfc4d473 fixed some more vleevalerio 2019-05-29 13:41:53 -04:00
• b4312ce26b Merge branch 'master' of https://github.com/jslightham/Zork/ vleevalerio 2019-05-29 13:35:12 -04:00
• 48f9d828ff fixed some errors vleevalerio 2019-05-29 13:34:11 -04:00
• 81c8b92f1e New items and classes added elacey 2019-05-29 13:24:48 -04:00
• 0b4d4f3aa4 Merge remote-tracking branch 'origin/master' elacey 2019-05-29 13:13:53 -04:00
• 8aff29156b Updated item weights elacey 2019-05-29 13:13:28 -04:00
• b7058c3beb Update rooms.dat jslightham 2019-05-29 12:59:54 -04:00
• d3914c22d5 Merge branch 'master' of https://github.com/jslightham/Zork jslightham 2019-05-29 12:59:43 -04:00
• 4c54b3aa50 fix conflicts jslightham 2019-05-29 12:59:39 -04:00
• f55e19a76f fix conflicts Johnathon Slightham 2019-05-29 12:57:42 -04:00
• e4a725cd22 fix conflicts jslightham 2019-05-29 12:55:16 -04:00
• 8e73e9e024 added another riddle and took out scroll 2 vleevalerio 2019-05-29 11:42:30 -04:00
• 28a4b723ff boarded rooms jslightham 2019-05-29 11:42:22 -04:00
• 7c2e8f8df6 Merge branch 'master' of https://github.com/jslightham/Zork Luca Carnegie 2019-05-29 11:33:17 -04:00