vleevalerio
|
211a069172
|
Merge remote-tracking branch 'origin/master'
|
2019-05-29 23:05:57 -04:00 |
|
vleevalerio
|
e5d29e67c7
|
fixed minor formatting errors
|
2019-05-29 23:05:34 -04:00 |
|
Luca Carnegie
|
d052273a99
|
Merge remote-tracking branch 'origin/master'
|
2019-05-29 22:55:40 -04:00 |
|
Luca Carnegie
|
7173fc0208
|
Made riddle in Circle room pretty
|
2019-05-29 22:54:44 -04:00 |
|
vleevalerio
|
21e7189956
|
fixed riddles
|
2019-05-29 22:53:28 -04:00 |
|
vleevalerio
|
2df0c4abb2
|
added breaks in room descriptions
|
2019-05-29 22:42:23 -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
|
52c383a482
|
Merge branch 'master' of https://github.com/jslightham/Zork
|
2019-05-29 19:48:04 -04:00 |
|
Luca Carnegie
|
87afdf44f4
|
worked on riddler
|
2019-05-29 19:47:53 -04:00 |
|
vleevalerio
|
96b1e7b7e1
|
fixed minor errors
|
2019-05-29 18:08:44 -04:00 |
|
Luca Carnegie
|
c633473df6
|
Merge branch 'master' of https://github.com/jslightham/Zork
|
2019-05-29 14:13:23 -04:00 |
|
Luca Carnegie
|
9daad10509
|
worked on riddle class
|
2019-05-29 14:13:10 -04:00 |
|
elacey
|
10e5d86a69
|
Merge remote-tracking branch 'origin/master'
|
2019-05-29 13:45:56 -04:00 |
|
elacey
|
b1677e58aa
|
Removed one of the leave's
|
2019-05-29 13:45:35 -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 |
|
vleevalerio
|
01bfc4d473
|
fixed some more
|
2019-05-29 13:41:53 -04:00 |
|
vleevalerio
|
b4312ce26b
|
Merge branch 'master' of https://github.com/jslightham/Zork/
Conflicts:
data/rooms.dat
|
2019-05-29 13:35:12 -04:00 |
|
vleevalerio
|
48f9d828ff
|
fixed some errors
|
2019-05-29 13:34:11 -04:00 |
|
elacey
|
81c8b92f1e
|
New items and classes added
|
2019-05-29 13:24:48 -04:00 |
|
elacey
|
0b4d4f3aa4
|
Merge remote-tracking branch 'origin/master'
|
2019-05-29 13:13:53 -04:00 |
|
elacey
|
8aff29156b
|
Updated item weights
|
2019-05-29 13:13:28 -04:00 |
|
jslightham
|
b7058c3beb
|
Update rooms.dat
|
2019-05-29 12:59:54 -04:00 |
|
jslightham
|
d3914c22d5
|
Merge branch 'master' of https://github.com/jslightham/Zork
|
2019-05-29 12:59:43 -04:00 |
|
jslightham
|
4c54b3aa50
|
fix conflicts
|
2019-05-29 12:59:39 -04:00 |
|
Johnathon Slightham
|
f55e19a76f
|
fix conflicts
|
2019-05-29 12:57:42 -04:00 |
|
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 |
|