175 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
pokesudenk	9b6936e944	trying this	2018-02-24 20:20:09 -05:00
Alee	60f687c882	Fixes	2018-02-24 20:17:06 -05:00
Alee	be182bf521	Now story is embeded	2018-02-24 20:16:05 -05:00
pokesudenk	27e2001844	dimb	2018-02-24 20:13:51 -05:00
pokesudenk	1ab04840cd	ficks	2018-02-24 20:13:11 -05:00
pokesudenk	51192d170d	added display names	2018-02-24 20:12:04 -05:00
pokesudenk	8d519e3778	Merge branch 'master' of https://github.com/PokeWorld/PokeBot	2018-02-24 20:00:22 -05:00
pokesudenk	aa5a3cbb82	bancounts	2018-02-24 20:00:13 -05:00
Unknown	cfcbb3174b	colro	2018-02-24 19:59:10 -05:00
pokesudenk	f7c9219876	unrape	2018-02-24 19:57:05 -05:00
pokesudenk	e9f85ec2d5	vscode fucks files	2018-02-24 19:55:49 -05:00
Unknown	52704755a4	Merge remote-tracking branch 'origin/master'	2018-02-24 19:54:33 -05:00
Unknown	3d56a3964f	fix the trey error	2018-02-24 19:54:10 -05:00
pokesudenk	0f93e19914	forgot	2018-02-24 19:53:59 -05:00
pokesudenk	f3fbfe2eb4	userinfo comm; to be expanded on later	2018-02-24 19:52:20 -05:00
pokesudenk	2414fb821c	new ways to cure boredom	2018-02-24 19:21:57 -05:00
Unknown	6a65f53155	add trey to package.json	2018-02-24 19:02:42 -05:00
Unknown	1f64bb8824	Merge remote-tracking branch 'origin/master'	2018-02-24 18:39:33 -05:00
Unknown	3e223e6e0f	Cange	2018-02-24 18:38:43 -05:00
Trey	b711de974e	new server invite	2018-02-24 18:33:54 -05:00
Trey	2031ec8dc3	new server	2018-02-24 18:31:50 -05:00
Unknown	a4d1af8d48	Things	2018-02-24 18:29:00 -05:00
pokesudenk	f43114a42d	Merge branch 'master' of https://github.com/PokeWorld/PokeBot	2018-02-24 18:20:00 -05:00
pokesudenk	4306933c08	eval me bby	2018-02-24 18:19:57 -05:00
Unknown	e989ecd2b4	Eval error	2018-02-24 15:44:17 -05:00
Unknown	6f928a3320	forgot to change the prefix	2018-02-24 15:24:10 -05:00
Unknown	959440761a	DONE DONE ODNE	2018-02-24 15:22:51 -05:00
Unknown	69888042fc	fix eval	2018-02-24 15:09:36 -05:00
Unknown	448d794372	eval	2018-02-24 15:08:05 -05:00
Unknown	c484753ee1	New Command system	2018-02-24 14:59:35 -05:00
Unknown	3d36bcf059	Hopefully it works	2018-02-24 14:28:47 -05:00
Unknown	10d53c4d45	prettify story command	2018-02-24 14:25:33 -05:00
Unknown	5539797809	Merge remote-tracking branch 'origin/master'	2018-02-24 14:24:48 -05:00
Unknown	b93ce2f771	all events in seperate files	2018-02-24 14:24:42 -05:00
Alee	0285915d26	Merge branch 'master' of https://github.com/PokeWorld/PokeBot	2018-02-24 14:21:47 -05:00
Alee	0624fc9f52	Edited story 2	2018-02-24 14:21:41 -05:00
Unknown	6f510d3f3e	Merge remote-tracking branch 'origin/master'	2018-02-24 14:21:17 -05:00
Unknown	bc32800b67	Part one of moving events to new file	2018-02-24 14:21:11 -05:00
Alee	99bab67446	More fixes	2018-02-24 14:18:27 -05:00
Alee	4c59b0713c	Fixes	2018-02-24 14:17:44 -05:00
Alee	ec9d43f27b	Merge branch 'master' of https://github.com/PokeWorld/PokeBot	2018-02-24 14:14:17 -05:00
Alee	d29bd5f7de	Story Command + 4 temporary stories	2018-02-24 14:14:13 -05:00
Unknown	0af8a767a2	fixed\s	2018-02-24 14:05:39 -05:00
Unknown	4e492c95ea	Auto stash before merge of "master" and "origin/master"	2018-02-24 14:02:03 -05:00
pokesudenk	5bad09948e	added back italics	2018-02-24 13:59:38 -05:00
Unknown	c5ec51222c	speeling	2018-02-24 13:57:49 -05:00
Unknown	b3f97d1226	real 8ball	2018-02-24 13:57:05 -05:00
pokesudenk	0da14b210b	8ball	2018-02-24 13:53:11 -05:00
pokesudenk	6858acb6a5	gram mar	2018-02-24 13:42:48 -05:00
Unknown	d1c03a7fe6	ship	2018-02-24 13:41:04 -05:00