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 |
|
vleevalerio
|
561ceba8b9
|
Finished second floor!
please add an up and down direction for the stairs.
|
2019-05-20 18:18:33 -04:00 |
|
jslightham
|
2781520ba5
|
take and inventory command
|
2019-05-16 22:40:55 -04:00 |
|
elacey
|
4506c1e17f
|
Items and classes added
|
2019-05-16 20:47:49 -04:00 |
|
vleevalerio
|
7a766cf76a
|
blah
|
2019-05-16 15:25:41 -04:00 |
|
vleevalerio
|
1645441b6a
|
added more rooms
|
2019-05-16 14:15:44 -04:00 |
|
vleevalerio
|
77c66f77d4
|
Merge remote-tracking branch 'origin/master'
|
2019-05-16 13:17:16 -04:00 |
|
vleevalerio
|
136f318ad5
|
Made changes to rooms.dat
|
2019-05-16 13:17:01 -04:00 |
|
Luca Carnegie
|
6da8464058
|
Merge remote-tracking branch 'origin/master'
|
2019-05-16 13:14:18 -04:00 |
|
Luca Carnegie
|
7179bf1273
|
updated rooms.dat
|
2019-05-16 13:13:42 -04:00 |
|
elacey
|
13837003c2
|
New items and classes added
|
2019-05-14 22:29:07 -04:00 |
|
Luca Carnegie
|
04c8716308
|
Changed Welcome message and fixed rooms.dat again.
|
2019-05-14 20:02:22 -04:00 |
|
Luca Carnegie
|
5e93aa35d6
|
Merge branch 'master' of https://github.com/jslightham/Zork
Conflicts:
data/rooms.dat
|
2019-05-14 19:50:32 -04:00 |
|
Luca Carnegie
|
3138bf34c1
|
Fixed rooms.dat formatting (was throwing exceptions)
|
2019-05-14 15:41:26 -04:00 |
|
vleevalerio
|
31a0198d37
|
bleh
|
2019-05-14 15:13:55 -04:00 |
|
vleevalerio
|
c1d572974d
|
added more rooms...
|
2019-05-14 15:13:20 -04:00 |
|
Luca Carnegie
|
690ff4abaf
|
Updated Game Class
|
2019-05-14 14:41:18 -04:00 |
|
vleevalerio
|
828d474908
|
Merge remote-tracking branch 'origin/master'
|
2019-05-10 18:08:59 -04:00 |
|
vleevalerio
|
4dc3207fc6
|
added a few room
|
2019-05-10 18:08:42 -04:00 |
|