Commit graph

6252 commits

Author SHA1 Message Date
Griatch
4bfaa154d9 Resolve merge conflicts 2020-05-16 15:38:09 +02:00
Griatch
e9e92fab33 Merge branch 'attribute_refactor' of https://github.com/volundmush/evennia into volundmush-attribute_refactor 2020-05-16 15:26:11 +02:00
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
Andrew Bastien
43ce2285a5 Completely refactored the Attribute Refactor into a single fresh branch. 2020-04-22 17:17:37 -07: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
Griatch
5761a91f2f Ran black on sources 2020-04-20 09:23:44 +02:00
Griatch
06cb85ea6c Cleanup and simplifications of Trait props
Remove NumericTrait type, instead incorporating it into the
Trait base. Change .actual to .value to homogenize the interface
for all Trait subclasses. Rename data_keys to default_keys.
Improve and correct documentation in several places.
2020-04-20 09:17:06 +02:00
trhr
e2b878ff3c EvenniaLocalTest - uses settings-defined typeclasses 2020-04-20 00:54:33 -05:00
Griatch
39c7889336 Updated CHANGELOG 2020-04-20 01:10:50 +02:00
Griatch
11a7d80bd6 fix percentage util unit test too 2020-04-20 00:39:52 +02:00
Griatch
2d45acb364 Update Trait doc string to new version 2020-04-20 00:30:49 +02:00
Griatch
f180e160f2 Add timer component and made unittests pass 2020-04-19 23:14:25 +02: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
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