Commit Graph

32 Commits

Author SHA1 Message Date
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
jslightham
14bd1aa83f import words through file 2019-04-24 22:52:15 -04:00
jslightham
9805c8ea84 worked on parser 2019-04-24 21:25:48 -04:00
Luca Carnegie
5023bddaad Added exciting text 2019-04-22 22:30:32 -04:00
vleevalerio
da5e32c57f added "!" 2019-04-08 15:28:47 -04:00
Luca Carnegie
5ea003a714 Changed room 3 description 2019-02-09 13:34:41 -05:00
jslightham
5b0c75dcda Create .project 2019-01-31 10:43:09 -05:00
jslightham
bf058f344c Update .gitignore 2019-01-29 20:44:09 -05:00
jslightham
383b4500ef test commit 2019-01-16 10:15:27 -05:00
jslightham
73dabdaef6 Update .gitignore 2019-01-16 10:11:54 -05:00
jslightham
edf347a11b Initial 2019-01-15 20:45:15 -05:00
jslightham
d8d4059314 Initial commit 2019-01-15 20:41:41 -05:00