Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-31 04:57:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
6205 commits 10 branches 44 tags 528 MiB
Commit graph

6205 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Griatch
20a1d6139c Merge branch 'aws-s3-cdn' of https://github.com/trhr/evennia into trhr-aws-s3-cdn 2020-04-11 21:14:43 +02:00
Griatch
1843dbb3ea Add unit test for ANSIString bug 2020-04-11 21:02:43 +02:00
Griatch
88ea3c7db0 Update the CHANGELOG 2020-04-11 20:42:19 +02:00
Griatch
66ed25b885 Correct unit tests for grid generator 2020-04-11 20:40:15 +02:00
Griatch
642f17be68 Fix bug in ANSIString 2020-04-11 20:28:29 +02:00
Griatch
458df00272 Fix bugs in format_grid, include verbatim elements 2020-04-11 13:28:24 +02:00
Griatch
a863ff77db Further fixes to format_grid 2020-04-11 11:37:30 +02:00