Commit graph

6229 commits

Author SHA1 Message Date
Griatch
50cdf6a0cb Merge branch 'master' into develop 2020-05-16 10:30:59 +02:00
Griatch
f989f3514b Add evennia-launcher support for createsuperuser 2020-05-16 10:30:01 +02:00
Griatch
8f11b38422 Merge branch 'master' into develop 2020-05-16 09:56:56 +02:00
Griatch
dfea32ec82 Fix server-time-snapshot unittest patch issue 2020-05-16 09:56:29 +02:00
Griatch
dff5d9e5df Merge pull request #2137 from Henddher/bug_puzzles_arent_persisted
Bug: Puzzles do not survive server reload (because their scripts aren't persisted)
2020-05-16 09:38:44 +02:00
Henddher Pedroza
60ca9f19cf Bug: Puzzles do not survive server reload (because their scripts aren't persisted). 2020-05-15 22:12:23 -04:00
Griatch
c6b4e3993d Merge pull request #2115 from trhr/test_resources
LocalEvenniaTest - uses settings-defined typeclasses
2020-05-09 21:27:48 +02:00
Griatch
f0eda7db74 Merge pull request #2091 from davidamandoestrada/BugFix#2088
Manager.py is returning a couple of querysets instead of lists. Fix for bug #2088
2020-04-23 19:19:46 +02:00
Griatch
586414247f Server timekeeper no longer assume 60s between snapshots 2020-04-23 19:08:23 +02:00
trhr
e270ea8651 added docstring 2020-04-22 19:50:49 -05:00
David Estrada
2c8603bdc1 No longer passing quiet argument to _AT_SEARCH_RESULT. Took out empty line 2020-04-20 19:23:04 -07:00
David Estrada
638bb2f4e7 Misunderstood what the quiet flag was doing. If quiet flag is set, DefaultObject will return a list 2020-04-20 19:20:50 -07:00
David Estrada
8e294e68ff Seems DefaultObject search should return a list, even if _AT_SEARCH_RESULT returns None 2020-04-20 18:59:55 -07:00
David Estrada
508052ed2e Send Search Results through _AT_SEARCH_RESULT in DefaultObject class 2020-04-20 18:36:49 -07:00
David Estrada
8512364560 Some of the doc strings were incorrect in manager.py. Manager.py methods should return querySets, not lists 2020-04-20 18:36:08 -07:00
Griatch
770d2e6b43 Merge pull request #2099 from volundmush/replaceable_init_setup
Replaceable init setup
2020-04-21 00:36:50 +02:00
Griatch
f204f3efe8 Merge branch 'master' into develop 2020-04-20 23:39:14 +02:00
Griatch
8b2b23873f Run black on sources 2020-04-20 23:39:09 +02:00
Griatch
cd5beed8d7 Fixed typos and docstring style 2020-04-20 23:28:33 +02:00
Griatch
6ffa8c74b7 Merge branch 'master' of https://github.com/serprinss/evennia into serprinss-master 2020-04-20 23:26:14 +02:00
Griatch
dc81d275e6 Merge branch 'master' into develop 2020-04-20 23:15:53 +02:00
Griatch
8618e47b72 Merge pull request #2113 from 3eluk/master
Russian .mo and .po files
2020-04-20 23:05:41 +02:00
Griatch
3520b76dcb Fix wrong path reference in settings_default. Resolve #2111 2020-04-20 20:33:40 +02:00
Griatch
97a99db33f Merge pull request #2110 from volundmush/fix_sync
Fix sync
2020-04-20 20:31:20 +02:00
Griatch
399dc3640d Update utils.search argument strings. Resolves #2106. 2020-04-20 20:15:39 +02:00
Griatch
0281105b4a Merge pull request #2108 from dayport/patch-1
Fix ssh server getKeyPair method
2020-04-20 19:59:01 +02:00
trhr
e2b878ff3c EvenniaLocalTest - uses settings-defined typeclasses 2020-04-20 00:54:33 -05:00
3eluk
42c87df73b Russian translation added 2020-04-19 22:37:07 +03:00
3eluk
f65c059220 Add files via upload 2020-04-19 22:35:10 +03:00
3eluk
0f6858a630 Create t.txt 2020-04-19 22:34:40 +03:00
Andrew Bastien
6cf005a645 Minor fix to sync attrs to make it less stupid. 2020-04-18 08:12:16 -07: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
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
Andrew Bastien
109627090e Made initial_setup.py replaceable in settings.py 2020-04-13 14:16:22 -07: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