Commit Graph

61 Commits

Author SHA1 Message Date
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
elacey
029d8d7cf5 Fixed spelling error. 2019-05-10 15:39:51 -04:00
elacey
b103875cec Two more items and their classes added. 2019-05-10 15:37:36 -04:00
elacey
fd9505f1cd Fixed item id 2019-05-10 14:03:34 -04:00
elacey
f922313470 Merge remote-tracking branch 'origin/master' 2019-05-10 14:01:16 -04:00
elacey
73279ff515 Item Classes for 6 objects 2019-05-10 14:00:31 -04:00
vleevalerio
33f225ff5d Merge branch 'master' of https://github.com/jslightham/Zork/ 2019-05-10 13:52:05 -04:00
vleevalerio
7300caadab fixed some more 2019-05-10 13:51:51 -04:00
elacey
62e041a20b Merge remote-tracking branch 'origin/master' 2019-05-10 13:47:32 -04:00
elacey
531c672182 Added 5 items 2019-05-10 13:42:31 -04:00
vleevalerio
15b0b00300 changed some rooms 2019-05-10 13:40:13 -04:00
vleevalerio
fb88339836 changed some rooms 2019-05-10 13:34:13 -04:00
jslightham
9b1cd284ee fixed rooms, worked on take command 2019-05-10 12:54:16 -04:00
vleevalerio
37a428fa93 Merge remote-tracking branch 'origin/master' 2019-05-08 14:59:31 -04:00
vleevalerio
f1883a9962 added a few rooms 2019-05-08 14:54:08 -04:00
elacey
b316d3daef Fixed small error with down (I think) 2019-05-08 14:44:20 -04:00
vleevalerio
83cdb4a057 Merge remote-tracking branch 'origin/master' 2019-05-08 14:35:26 -04:00
vleevalerio
2d22d43fa4 Merge branch 'master' of https://github.com/jslightham/Zork/
Conflicts:
	data/rooms.dat
2019-05-08 14:35:10 -04:00
elacey
4aa2612cbe Test Commit 2019-05-08 14:27:05 -04:00
jslightham
7fa30879c0 Fixed parser, added items starting in rooms, moved item room storage 2019-05-08 11:43:21 -04:00
vleevalerio
dfd9b4ab51 its not done yet tho 2019-05-08 10:35:54 -04:00
elacey
0c44589f03 Edited rooms file 2019-05-06 13:44:14 -04:00
jslightham
3358439e02 items 2019-04-26 15:35:03 -04:00