Commit graph

6231 commits

Author SHA1 Message Date
Griatch
2bb49a7600 Merge branch 'attribute_refactor' of https://github.com/volundmush/evennia into volundmush-attribute_refactor 2020-05-16 15:26:11 +02:00
Griatch
8e38420f57 Merge branch 'master' into develop 2020-05-16 10:30:59 +02:00
Griatch
6026174936 Add evennia-launcher support for createsuperuser 2020-05-16 10:30:01 +02:00
Griatch
9795e878bd Merge branch 'master' into develop 2020-05-16 09:56:56 +02:00
Griatch
4708ea537e Fix server-time-snapshot unittest patch issue 2020-05-16 09:56:29 +02:00
Griatch
138fe87685
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
25350874e6 Bug: Puzzles do not survive server reload (because their scripts aren't persisted). 2020-05-15 22:12:23 -04:00
Griatch
38c7aa40fe
Merge pull request #2115 from trhr/test_resources
LocalEvenniaTest - uses settings-defined typeclasses
2020-05-09 21:27:48 +02:00
Griatch
6c968af313
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
3f90db1b08 Server timekeeper no longer assume 60s between snapshots 2020-04-23 19:08:23 +02:00
trhr
872865f415 added docstring 2020-04-22 19:50:49 -05:00
Andrew Bastien
8f7fc5092d Completely refactored the Attribute Refactor into a single fresh branch. 2020-04-22 17:17:37 -07:00
David Estrada
534df9529b No longer passing quiet argument to _AT_SEARCH_RESULT. Took out empty line 2020-04-20 19:23:04 -07:00
David Estrada
224ad5322f 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
5f5f51304b Seems DefaultObject search should return a list, even if _AT_SEARCH_RESULT returns None 2020-04-20 18:59:55 -07:00
David Estrada
66c8bb2be8 Send Search Results through _AT_SEARCH_RESULT in DefaultObject class 2020-04-20 18:36:49 -07:00
David Estrada
f294af2106 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
d6fc428911
Merge pull request #2099 from volundmush/replaceable_init_setup
Replaceable init setup
2020-04-21 00:36:50 +02:00
Griatch
80e41deabf Merge branch 'master' into develop 2020-04-20 23:39:14 +02:00
Griatch
854c391f10 Run black on sources 2020-04-20 23:39:09 +02:00
Griatch
69fd31d4de Fixed typos and docstring style 2020-04-20 23:28:33 +02:00
Griatch
d7cbf07b4d Merge branch 'master' of https://github.com/serprinss/evennia into serprinss-master 2020-04-20 23:26:14 +02:00
Griatch
8abc2a03e0 Merge branch 'master' into develop 2020-04-20 23:15:53 +02:00
Griatch
67a8ad054c
Merge pull request #2113 from 3eluk/master
Russian .mo and .po files
2020-04-20 23:05:41 +02:00
Griatch
e87f68da03 Fix wrong path reference in settings_default. Resolve #2111 2020-04-20 20:33:40 +02:00
Griatch
5b29d3c3af
Merge pull request #2110 from volundmush/fix_sync
Fix sync
2020-04-20 20:31:20 +02:00
Griatch
cd10d6db3a Update utils.search argument strings. Resolves #2106. 2020-04-20 20:15:39 +02:00
Griatch
1462f312f7
Merge pull request #2108 from dayport/patch-1
Fix ssh server getKeyPair method
2020-04-20 19:59:01 +02:00
trhr
0a26ad7bcc EvenniaLocalTest - uses settings-defined typeclasses 2020-04-20 00:54:33 -05:00
3eluk
166d198034
Russian translation added 2020-04-19 22:37:07 +03:00
3eluk
69f3dd8508
Add files via upload 2020-04-19 22:35:10 +03:00
3eluk
ded25fccad
Create t.txt 2020-04-19 22:34:40 +03:00
Andrew Bastien
fe98b5c6cc Minor fix to sync attrs to make it less stupid. 2020-04-18 08:12:16 -07:00
dayport
fbee844944
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
b5891bbca7
Merge pull request #2104 from trhr/i18n
i18n stuff
2020-04-16 13:37:15 +02:00
trhr
5af43fbee6 fixing fstring 2020-04-16 06:14:03 -05:00
trhr
220fb47e89 fixing fstring 2020-04-16 05:57:51 -05:00
trhr
5c51bb7e97 fixing fstring 2020-04-16 05:53:51 -05:00
Griatch
cb4a6673a8
Merge pull request #2103 from JadedCtrl/master
comms i18n
2020-04-16 10:41:45 +02:00
Griatch
27175c56e1
Testing out github's inbuilt fund-link feature 2020-04-16 09:44:10 +02:00
trhr
e0c868fc53 i18n 2020-04-15 21:59:09 -05:00
trhr
b6d5b937b5 i18n 2020-04-15 21:58:28 -05:00
trhr
af0eaed28a i18n 2020-04-15 21:21:16 -05:00
Jaidyn Ann
af212fa030 comms i18n 2020-04-15 21:12:42 -05:00
Andrew Bastien
a4f359c6ac Made initial_setup.py replaceable in settings.py 2020-04-13 14:16:22 -07:00
Griatch
b82cce6cb2 Move networking replaceables further down in settings file 2020-04-13 12:31:27 +02:00
Griatch
983bbb613e Resolve merge conflicts 2020-04-13 12:17:39 +02:00
Griatch
3f41c02c01 Add more unit tests for content types 2020-04-13 11:48:06 +02:00
Griatch
f2fb86a1ad Add simple ContentHandler unit test 2020-04-13 11:34:12 +02:00
Griatch
990e270374 Resolve merge conflicts 2020-04-13 11:22:19 +02:00