7847 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
3eluk	0f6858a630	Create t.txt	2020-04-19 22:34:40 +03:00
Griatch	175fcce405	Start to add timer component	2020-04-19 19:30:40 +02:00
Griatch	5e2bbedd52	Add desc-support to traits	2020-04-19 18:12:16 +02:00
Griatch	4156c37818	Make Trait unit tests pass for base trait types	2020-04-19 17:42:11 +02:00
Griatch	162b3a0c96	Make Trait unit tests pass for base trait types	2020-04-19 15:47:11 +02:00
Griatch	0a4d939e78	Fix all unit tests	2020-04-19 12:58:33 +02:00
Griatch	fce0f404aa	Fix all unit tests	2020-04-19 12:55:21 +02:00
Griatch	5571ef8a7d	Refactor gauge trait to match description of it	2020-04-19 12:51:05 +02:00
Griatch	7c12e4d362	Refactor gauge trait to match description of it	2020-04-18 21:48:37 +02:00
Andrew Bastien	6cf005a645	Minor fix to sync attrs to make it less stupid.	2020-04-18 08:12:16 -07:00
Griatch	c41fd0a33b	Add unit tests for base traits	2020-04-18 14:43:10 +02:00
dayport	5f69d29b48	Fix ssh server getKeyPair fun ... Correct the ssh server getKeyPair function to correctly use the cryptography module instead of the Crypto module.	2020-04-16 16:23:55 -07:00
Griatch	b442946d0f	Start to add trait tests based on the Ainneve ones	2020-04-17 00:10:17 +02:00
Griatch	56410c85d6	Merge pull request #2104 from trhr/i18n ... i18n stuff	2020-04-16 13:37:15 +02:00
trhr	f088207091	fixing fstring	2020-04-16 06:14:03 -05:00
trhr	518c21e661	fixing fstring	2020-04-16 05:57:51 -05:00
trhr	0f8c0ad9bf	fixing fstring	2020-04-16 05:53:51 -05:00
Griatch	5032575fb0	Merge pull request #2103 from JadedCtrl/master ... comms i18n	2020-04-16 10:41:45 +02:00
Griatch	0bc7866da3	Testing out github's inbuilt fund-link feature	2020-04-16 09:44:10 +02:00
trhr	e3426d2124	i18n	2020-04-15 21:59:09 -05:00
trhr	a4a6df4219	i18n	2020-04-15 21:58:28 -05:00
trhr	95fe5c060f	i18n	2020-04-15 21:21:16 -05:00
Jaidyn Ann	0d6988244b	comms i18n	2020-04-15 21:12:42 -05:00
Griatch	7c31e8bd5a	Made TraitHandler classes replaceable and generic	2020-04-16 00:47:27 +02:00
Griatch	fb8403e729	Fix some spurious traithandler bugs	2020-04-14 00:46:45 +02:00
Griatch	e0717fd07c	Add replacable Trait classes	2020-04-14 00:32:37 +02:00
Andrew Bastien	109627090e	Made initial_setup.py replaceable in settings.py	2020-04-13 14:16:22 -07:00
Griatch	485ab5907c	Start copying Traithandler from Ainneve to contribs	2020-04-13 22:29:06 +02:00
Griatch	7d78eda3fd	Move networking replaceables further down in settings file	2020-04-13 12:31:27 +02:00
Griatch	c3140a0bbf	Resolve merge conflicts	2020-04-13 12:17:39 +02:00
Griatch	7ac53b576f	Add more unit tests for content types	2020-04-13 11:48:06 +02:00
Griatch	556091c395	Add simple ContentHandler unit test	2020-04-13 11:34:12 +02:00
Griatch	74b73c69f9	Resolve merge conflicts	2020-04-13 11:22:19 +02:00
Andrew Bastien	d7623cd8a5	Added AMP support to the Replaceable Networking effort. Can now replace the AMP protocols. Also cleaned up some imports.	2020-04-12 17:01:43 -07:00
Andrew Bastien	ff04849031	Fixed some really stupid bugs.	2020-04-12 15:43:29 -07:00
Andrew Bastien	0639d43ddc	Cleaned up the pep8	2020-04-12 13:00:47 -07:00
Andrew Bastien	58230504c5	Missed a tiny detail in portalsessionhandler.py	2020-04-12 10:29:51 -07:00
Andrew Bastien	948d14a0fb	Made almost the entire networking guts replaceable.	2020-04-12 10:24:31 -07:00
Griatch	11941f21fb	Merge branch 'master' into develop	2020-04-12 18:32:04 +02:00
Griatch	56ff8faacb	Test with travis fix	2020-04-12 18:18:41 +02:00
Griatch	5fb65175f5	Use TESTS= instead of tests= to run subset of tests	2020-04-12 14:29:44 +02:00
Griatch	21d62e651a	Ran black on sources	2020-04-12 12:19:15 +02:00
Griatch	cc5aa91be1	Resolve merge conflicts	2020-04-12 12:19:03 +02:00
Griatch	ca341278e9	Ran black on sources	2020-04-12 12:17:06 +02:00
Griatch	f9d23985d8	Merge branch 'master' into develop	2020-04-11 23:31:50 +02:00
Griatch	86805ef306	Make Player #1's Character have Player perm to make quell work more intuitively.	2020-04-11 23:31:31 +02:00
Andrew Bastien	467fd93f12	Cleaned up the contents indexer.	2020-04-11 13:34:28 -07:00
Andrew Bastien	2d8b93a5b1	Merge remote-tracking branch 'origin/contents_indexer' into contents_indexer ... # Conflicts: # CHANGELOG.md	2020-04-11 12:47:32 -07:00
Andrew Bastien	c031072287	Add a contents indexer to optimize inventory lookups.	2020-04-11 12:40:58 -07:00
Andrew Bastien	2fcb6e9466	Add a contents indexer to optimize inventory lookups.	2020-04-11 12:39:52 -07:00