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 |
|
Luca Carnegie
|
0da2e95425
|
added a removeRiddler() method.
|
2019-05-30 23:41:20 -04:00 |
|
Luca Carnegie
|
38a10f116d
|
new UML diagram
|
2019-05-30 19:48:03 -04:00 |
|
Luca Carnegie
|
4499f97120
|
Found a UML diagram plugin for eclipse and made some UML diagrams
|
2019-05-30 12:16:59 -04:00 |
|
Luca Carnegie
|
f49c7e94e0
|
Updated README after a conflict with git
|
2019-05-30 10:27:09 -04:00 |
|
Luca Carnegie
|
810579c7f2
|
Updated README
|
2019-05-30 10:25:09 -04:00 |
|
Luca Carnegie
|
078ab4bb8a
|
Update README.md
|
2019-05-29 23:26:36 -04:00 |
|
Luca Carnegie
|
eb8f1045c0
|
Create README.md
|
2019-05-29 23:20:19 -04:00 |
|
Luca Carnegie
|
c2949d37d7
|
Merge branch 'master' of https://github.com/jslightham/Zork
|
2019-05-29 23:17:39 -04:00 |
|
Luca Carnegie
|
2fd7b3ed6f
|
Changed riddler execution
|
2019-05-29 23:17:29 -04:00 |
|
vleevalerio
|
211a069172
|
Merge remote-tracking branch 'origin/master'
|
2019-05-29 23:05:57 -04:00 |
|
vleevalerio
|
e5d29e67c7
|
fixed minor formatting errors
|
2019-05-29 23:05:34 -04:00 |
|
Luca Carnegie
|
d052273a99
|
Merge remote-tracking branch 'origin/master'
|
2019-05-29 22:55:40 -04:00 |
|
Luca Carnegie
|
7173fc0208
|
Made riddle in Circle room pretty
|
2019-05-29 22:54:44 -04:00 |
|
vleevalerio
|
21e7189956
|
fixed riddles
|
2019-05-29 22:53:28 -04:00 |
|
vleevalerio
|
2df0c4abb2
|
added breaks in room descriptions
|
2019-05-29 22:42:23 -04:00 |
|
Luca Carnegie
|
48b8545cc6
|
riddles are done!
|
2019-05-29 22:32:44 -04:00 |
|
Luca Carnegie
|
0fc289deb0
|
riddler gives you a prize when riddle is successfully answered
|
2019-05-29 21:39:16 -04:00 |
|
Luca Carnegie
|
657b859686
|
Made it so that you can enter custom message for each riddler object
|
2019-05-29 21:16:36 -04:00 |
|
Luca Carnegie
|
52c383a482
|
Merge branch 'master' of https://github.com/jslightham/Zork
|
2019-05-29 19:48:04 -04:00 |
|
Luca Carnegie
|
87afdf44f4
|
worked on riddler
|
2019-05-29 19:47:53 -04:00 |
|