Luca Carnegie
|
9575409815
|
Merge branch 'master' of https://github.com/jslightham/Zork
|
2019-06-01 11:42:23 -04:00 |
|
Luca Carnegie
|
2a413c304f
|
Absolute final commit
|
2019-06-01 11:42:12 -04:00 |
|
jslightham
|
f937a017cd
|
comments
|
2019-06-01 02:05:04 -04:00 |
|
Luca Carnegie
|
c0ffa91d70
|
final commit
|
2019-06-01 01:18:49 -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
|
e88785ba82
|
changed some things
|
2019-06-01 00:34:36 -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
|
1232f150c9
|
bleeding and bandages
|
2019-05-31 23:15:01 -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
|
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
|
37aec4befc
|
made scream command
|
2019-05-31 17:31:56 -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
|
2fd7b3ed6f
|
Changed riddler execution
|
2019-05-29 23:17:29 -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
|
87afdf44f4
|
worked on riddler
|
2019-05-29 19:47:53 -04:00 |
|
Luca Carnegie
|
67e7c0ba54
|
Merge branch 'master' of https://github.com/jslightham/Zork
|
2019-05-29 13:43:06 -04:00 |
|
Luca Carnegie
|
c50c63477c
|
made riddler for rooms, etc...
|
2019-05-29 13:42:53 -04:00 |
|
jslightham
|
28a4b723ff
|
boarded rooms
|
2019-05-29 11:42:22 -04:00 |
|
jslightham
|
bad3490b1e
|
synonyms, and take all command
|
2019-05-29 10:56:22 -04:00 |
|
Luca Carnegie
|
2d40e5954a
|
Fixed some parser things
|
2019-05-28 23:28:34 -04:00 |
|
Luca Carnegie
|
00ba095757
|
worked on riddle class
|
2019-05-28 22:49:21 -04:00 |
|
Luca Carnegie
|
1d3188cb53
|
made a riddle class
|
2019-05-27 22:54:35 -04:00 |
|
Luca Carnegie
|
0acb8bd223
|
Made rooms.dat file easier to read. Probably too late now, eh Victoria?
|
2019-05-27 20:48:45 -04:00 |
|
Luca Carnegie
|
1d0888f0df
|
Added Item-viewing functionality to the room class! Also changed some
descriptions
|
2019-05-27 20:34:11 -04:00 |
|