jslightham
|
e4a725cd22
|
fix conflicts
|
2019-05-29 12:55:16 -04:00 |
|
vleevalerio
|
8e73e9e024
|
added another riddle and took out scroll 2
subject to change
|
2019-05-29 11:42:30 -04:00 |
|
jslightham
|
28a4b723ff
|
boarded rooms
|
2019-05-29 11:42:22 -04:00 |
|
Luca Carnegie
|
7c2e8f8df6
|
Merge branch 'master' of https://github.com/jslightham/Zork
|
2019-05-29 11:33:17 -04:00 |
|
Luca Carnegie
|
81f5065c9e
|
made some changes to command class
|
2019-05-29 11:33:05 -04:00 |
|
jslightham
|
4f62ae7c0e
|
removed test items
|
2019-05-29 10:57:40 -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
|
5ba426b51b
|
Fixed some story errors and made a synonyms file for the parser
|
2019-05-28 23:02:13 -04:00 |
|
Luca Carnegie
|
00ba095757
|
worked on riddle class
|
2019-05-28 22:49:21 -04:00 |
|
jslightham
|
015c8508ee
|
Create Game Map.JPG
|
2019-05-28 17:50:28 -04:00 |
|
vleevalerio
|
d04eb39853
|
fixed minor errors
|
2019-05-28 10:10:50 -04:00 |
|
Luca Carnegie
|
9d073ef642
|
finish commit "made riddle class"
|
2019-05-27 22:54:53 -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 |
|
jslightham
|
e4ba347415
|
finished combat, fixed open door null pointer bug
|
2019-05-27 18:39:23 -04:00 |
|
Luca Carnegie
|
36fe007dd8
|
updated some things
|
2019-05-27 15:12:23 -04:00 |
|
Luca Carnegie
|
81bd3b1c86
|
Fixed conflicts
|
2019-05-27 14:43:00 -04:00 |
|
Luca Carnegie
|
9dede87f7f
|
fixed welcome message
|
2019-05-27 14:40:58 -04:00 |
|
jslightham
|
c0fc0bc2cf
|
worked on combat
|
2019-05-27 14:15:04 -04:00 |
|
jslightham
|
9e8c5e812c
|
enemies and combat
|
2019-05-27 12:47:12 -04:00 |
|
jslightham
|
8f8a55949a
|
eat, drop commands
|
2019-05-27 00:03:23 -04:00 |
|
jslightham
|
58068b94d7
|
Merge branch 'master' of https://github.com/jslightham/Zork
|
2019-05-26 23:22:59 -04:00 |
|
jslightham
|
5a5f4fc06a
|
transfer - locked rooms
|
2019-05-26 23:22:51 -04:00 |
|
Luca Carnegie
|
bfcbba4197
|
made minor edits
|
2019-05-26 12:03:49 -04:00 |
|
Luca Carnegie
|
d597a1489b
|
fixed conflict on Git
|
2019-05-23 14:06:12 -04:00 |
|
Luca Carnegie
|
c5e73ec253
|
Fixed title screen & help screen
|
2019-05-23 14:02:32 -04:00 |
|
Luca Carnegie
|
ba18bed404
|
Made a title screen and fixed help command
|
2019-05-23 13:59:29 -04:00 |
|
elacey
|
cf185c25aa
|
more words
|
2019-05-23 13:48:25 -04:00 |
|
elacey
|
d1337bdea7
|
Sword item added
|
2019-05-23 13:46:12 -04:00 |
|
elacey
|
c311ada15e
|
Added new constructor for weapons
|
2019-05-23 13:43:34 -04:00 |
|
elacey
|
31983e88a7
|
More items
|
2019-05-23 13:37:47 -04:00 |
|
vleevalerio
|
220d9b1268
|
fixed more things
|
2019-05-23 13:26:19 -04:00 |
|
vleevalerio
|
cd0a0c4220
|
fixed something
|
2019-05-23 13:24:18 -04:00 |
|
elacey
|
c8258969f4
|
Merge remote-tracking branch 'origin/master'
|
2019-05-23 13:21:51 -04:00 |
|
elacey
|
904e5bdefa
|
Item classes added
|
2019-05-23 13:21:27 -04:00 |
|
Luca Carnegie
|
5a6802679a
|
Merge branch 'master' of https://github.com/jslightham/Zork
|
2019-05-23 13:18:42 -04:00 |
|
Luca Carnegie
|
fa0cd81a81
|
Updated enemy class
|
2019-05-23 13:18:25 -04:00 |
|
vleevalerio
|
0879ba4c20
|
added the "locked" feature to each room
|
2019-05-23 13:04:15 -04:00 |
|
vleevalerio
|
66e42d62ac
|
Merge branch 'master' of https://github.com/jslightham/Zork/
Conflicts:
data/rooms.dat
|
2019-05-23 12:58:35 -04:00 |
|
vleevalerio
|
74397502e4
|
added some more items
|
2019-05-23 12:56:43 -04:00 |
|
elacey
|
f1c5c19652
|
Merge remote-tracking branch 'origin/master'
|
2019-05-22 22:47:28 -04:00 |
|
elacey
|
cfe2f0253d
|
All items and some item classes added
|
2019-05-22 22:46:57 -04:00 |
|
Luca Carnegie
|
d6ce3ea8b9
|
created Enemy class
|
2019-05-22 22:41:31 -04:00 |
|
jslightham
|
59f51231c8
|
worked on locked doors
|
2019-05-22 14:44:22 -04:00 |
|
vleevalerio
|
ad302760eb
|
added "u" and "d" to the case thing
|
2019-05-22 09:51:58 -04:00 |
|
vleevalerio
|
19f1a5b941
|
finished the rooms
just wondering were to put the "floating" items
also, please check to make sure i didn't make any mistakes
|
2019-05-21 17:21:56 -04:00 |
|
vleevalerio
|
f609ba8be2
|
finished some more rooms on first floor
|
2019-05-21 15:04:09 -04:00 |
|
vleevalerio
|
f1c18673d7
|
Merge remote-tracking branch 'origin/master'
|
2019-05-20 18:18:46 -04:00 |
|