Commit Graph

188 Commits

Author SHA1 Message Date
Luca Carnegie
0df48979b3 woot 2019-06-01 01:09:58 -04:00
Luca Carnegie
41d22a83b2 UML 2019-06-01 01:09:04 -04:00
Luca Carnegie
6473a76418 Merge branch 'master' of https://github.com/jslightham/Zork 2019-06-01 01:07:04 -04:00
Luca Carnegie
41dab1ca1a new UML files. we're done!! 2019-06-01 01:06:56 -04:00
Luca Carnegie
7d8e495fa0 Add files via upload 2019-06-01 01:05:20 -04:00
jslightham
0ad9098d2e final 2019-06-01 01:04:16 -04:00
jslightham
8083d3a848 Merge branch 'master' of https://github.com/jslightham/Zork 2019-06-01 00:50:34 -04:00
jslightham
33586d7f35 fixed bugs 2019-06-01 00:49:31 -04:00
Luca Carnegie
cd76933723 made changing descriptions and added a spicy new riddle 2019-06-01 00:46:40 -04:00
Luca Carnegie
3787f4b1f2 Merge remote-tracking branch 'origin/master' 2019-06-01 00:34:45 -04:00
Luca Carnegie
e88785ba82 changed some things 2019-06-01 00:34:36 -04:00
jslightham
c8642adc5c Merge branch 'master' of https://github.com/jslightham/Zork 2019-06-01 00:18:59 -04:00
jslightham
05a1c46cbb Update rooms.dat 2019-06-01 00:18:52 -04:00
Luca Carnegie
efdace7467 Merge remote-tracking branch 'origin/master' 2019-06-01 00:05:05 -04:00
Luca Carnegie
b3faf296e8 made some funny command words 2019-06-01 00:04:55 -04:00
jslightham
7291e08319 lucaaaaaaaaaaaaaaaaaaaaaaaaaaaa 2019-06-01 00:03:20 -04:00
Luca Carnegie
43085ca83d Merge branch 'master' of https://github.com/jslightham/Zork 2019-05-31 23:50:38 -04:00
Luca Carnegie
23f0535a0a added notebook reading 2019-05-31 23:50:24 -04:00
jslightham
90911daccc remove item on use 2019-05-31 23:37:24 -04:00
jslightham
f9f86d221b fixed missing i-- bug 2019-05-31 23:22:53 -04:00
jslightham
c6b31c2512 fixed OP enemies 2019-05-31 23:15:25 -04:00
jslightham
1232f150c9 bleeding and bandages 2019-05-31 23:15:01 -04:00
vleevalerio
ff32ca6ab5 Merge branch 'master' of https://github.com/jslightham/Zork/ 2019-05-31 22:02:11 -04:00
vleevalerio
c50c8f6c9f fixed a bug, hopefully 2019-05-31 22:01:47 -04:00
jslightham
2d16686a06 battering ram break boards 2019-05-31 21:49:04 -04:00
jslightham
762ba0f04e Merge branch 'master' of https://github.com/jslightham/Zork 2019-05-31 21:38:17 -04:00
jslightham
dc33a5f896 fixed removal of enemies 2019-05-31 21:38:10 -04:00
Luca Carnegie
5d56d97cb7 Merge branch 'master' of https://github.com/jslightham/Zork 2019-05-31 21:34:04 -04:00
Luca Carnegie
e8da25c867 commit 2019-05-31 21:33:57 -04:00
jslightham
9641156e5b Merge branch 'master' of https://github.com/jslightham/Zork 2019-05-31 21:19:09 -04:00
jslightham
df4842cefd added key unlocking 2019-05-31 21:18:59 -04:00
Luca Carnegie
3243641071 player does not have god-like abilities anymore 2019-05-31 21:13:23 -04:00
Luca Carnegie
d7206c1a43 fixed some things 2019-05-31 21:12:16 -04:00
Luca Carnegie
671f6eacb0 Made warmbread class 2019-05-31 20:59:14 -04:00
Luca Carnegie
8cac7a4315 fixed items display bug 2019-05-31 20:33:29 -04:00
Luca Carnegie
39ab9f2332 Merge branch 'master' of https://github.com/jslightham/Zork
Conflicts:
	src/com/bayviewglen/zork/Game.java
2019-05-31 20:20:28 -04:00
Luca Carnegie
389a7e3c05 fixing item display 2019-05-31 20:10:16 -04:00
jslightham
788271ff3d fixed enemy bug 2019-05-31 19:57:43 -04:00
jslightham
67839c569e added lady pellatt 2019-05-31 19:46:51 -04:00
jslightham
cfc9741f19 enemy drop loot on death 2019-05-31 19:14:21 -04:00
jslightham
45fe341059 finished crafting 2019-05-31 19:02:52 -04:00
Luca Carnegie
ad08e5482a commit 2019-05-31 17:34:05 -04:00
Luca Carnegie
7f11141f58 Merge branch 'master' of https://github.com/jslightham/Zork 2019-05-31 17:32:06 -04:00
Luca Carnegie
37aec4befc made scream command 2019-05-31 17:31:56 -04:00
elacey
7c1d2918e2 synonyms.dat updated 2019-05-31 17:08:22 -04:00
elacey
25a55c095a words.dat updated 2019-05-31 17:07:41 -04:00
elacey
1c15107db4 Fixed capitals 2019-05-31 17:05:37 -04:00
vleevalerio
b1f410da49 fixed a few things in rooms.dat
i think it's done...maybe someone else should check too tho
2019-05-31 09:53:16 -04:00
jslightham
ec64080aa1 Merge branch 'master' of https://github.com/jslightham/Zork 2019-05-30 23:46:15 -04:00
jslightham
df3d031933 shavingcream blindness 2019-05-30 23:44:30 -04:00