Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-28 02:36:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
4411 commits 10 branches 44 tags 528 MiB
Commit graph

4411 commits

This branch
This branch
All branches
Author SHA1 Message Date
Griatch
5d1c3cb27e Merge branch 'master' into develop 2018-01-02 21:52:43 +01:00
Griatch
74e8c74f80 Work towards resolving unittests with deferreds 2018-01-02 21:21:57 +01:00
Griatch
76555e6ca5 Resolve merge conflicts 2018-01-01 21:05:35 +01:00
Griatch
1b9a083b19 Add TIME_IGNORE_DOWNTIMES to allow for true 1:1 time ratios. Implements #1545 2018-01-01 21:03:11 +01:00
Griatch
a342353fd6 Add a slight delay to telnet handshake to give mudlet a chance to catch up 2018-01-01 20:58:48 +01:00
Griatch
42f74dc553 Minor refactoring and stabilizing 2018-01-01 15:27:21 +01:00
Griatch
ff7fae3c07 Fix issue with messaging at session-level 2018-01-01 13:19:59 +01:00
Griatch
bb835c3da6 bugfix of protocol_flag update mechanism 2017-12-31 23:36:58 +01:00
Griatch
c8b1dfcd20 Allow options to partially update portal session, correctly relay late handshakes. 2017-12-31 23:16:16 +01:00
Griatch
9355b255ad Fix typos in doc strings 2017-12-31 13:47:19 +01:00
Griatch
c18c0fc479 Merge branch 'master' into develop 2017-12-31 13:42:59 +01:00
Griatch
0d3b8f4079 Fix wrong call of _SEARCH_AT_RESULT from tutorial version of look, as reported in #1544. 2017-12-31 13:40:16 +01:00
Griatch
eb6c46a851 Merge pull request #1540 from TehomCD/django_admin_attr_fix 
Fix errors in django admin for Attributes
 2017-12-29 18:48:52 +01:00
Tehom
6dc4e52513 Fix errors in django admin for Attributes 2017-12-25 07:15:26 -05:00
Griatch
21403222dc Merge pull request #1536 from TehomCD/typeclass_set_attr 
Allow other typeclasses to have their Attributes set via command.
 2017-12-23 16:09:40 +01:00
Griatch
8fa0861b5d Merge pull request #1537 from TehomCD/log_exception_check 
Attempt to handle any errors in logging.
 2017-12-19 10:12:43 +01:00
Tehom
0adb346555 Try to clarify help file. 2017-12-19 00:42:23 -05:00
Tehom
c689b4d028 Attempt to handle any errors in logging. 2017-12-19 00:28:48 -05:00
Tehom
dd3e9ccbbe Allow other typeclasses to have their Attributes set via command. 2017-12-17 18:53:41 -05:00
Griatch
aca4605d47 Merge pull request #1530 from bostrt/tls-websockets 
Update websocket URL so proxy port can be utilized. Resolves #1421.
 2017-12-15 23:39:09 +01:00
Griatch
ab57d2da21 Merge pull request #1532 from chainsol/fix_1531 
Step through help and option popup when closing, fixes #1531
 2017-12-14 08:20:54 +01:00
Nicholas Matlaga
40d6f7fc7c Step through help and option popup when closing 2017-12-13 21:08:02 -05:00
Robert Bost
916246120a Update websocket URL so proxy port can be utilized. Resolves #1421. 2017-12-12 19:29:16 -05:00
Griatch
cc343aa4df Merge pull request #1528 from vlegoff/telnet_encoding 
Add a setting to change telnet default encoding
 2017-12-12 21:02:30 +01:00
Vincent Le Goff
9605d66646 Add a little check in case ENCODINGS is empty 2017-12-12 20:59:55 +01:00
Vincent Le Goff
0acf0246c7 Simplify telnet edefault encoding 2017-12-12 20:51:16 +01:00
Vincent Le Goff
8f5a28455e Remove TELNET_ENCODING and set ENCODINGS[0] 2017-12-12 19:46:28 +01:00
Vincent Le Goff
abaf8d0a19 Add a setting to change telnet default encoding 2017-12-12 18:56:36 +01:00
Griatch
2dae4c4c6f fix unittests 2017-12-10 10:26:20 +01:00
Griatch
5ff1da8e09 Change dockerfile entrypoint to launch evennia server, more suitable for docker-compose setups. Add websocket proxy envvar 2017-12-09 01:13:02 +01:00
Griatch
87918e4ce0 Resolve merge conflicts 2017-12-08 19:09:01 +01:00
Griatch
bafb88f2f4 Merge pull request #1527 from arumford/patch-1 
Update rplanguage.py
 2017-12-08 19:06:45 +01:00
Griatch
249cb0d21e Merge pull request #1526 from TehomCD/flexible_at_say 
Flexible at say
 2017-12-08 19:06:11 +01:00
Griatch
80e7a28e4f Merge pull request #1525 from TehomCD/fix_at_say_msg_receivers 
Fix msg_receivers to be used
 2017-12-08 19:04:11 +01:00
arumford
a7ebb7a04a Update rplanguage.py 
The docstring examples have a typo.  It lists the contrib file as 'rplanguages' but the file is actually 'rplanguage'.  It can be confusing.
 2017-12-08 10:14:19 -06:00
Tehom
dd2c74231f Fix error in passing non-strings to str.join() 2017-12-08 03:00:43 -05:00
Tehom
90dc745d73 Make at_say more flexible by not ignoring parameters passed 2017-12-08 02:59:29 -05:00
Tehom
71b039a180 Fix msg_receivers to be used 2017-12-08 02:41:33 -05:00
Griatch
9f81a35422 Add some more tests to catch faulty language definitions 2017-12-05 22:03:34 +01:00
Griatch
5111f195a9 Fix and cleanup the rplanguage contrib a bit 2017-12-05 19:54:40 +01:00
Griatch
13ebf768db Merge branch 'master' into develop 2017-12-05 17:14:25 +01:00
Griatch
25bfc8f9e8 Merge pull request #1515 from chainsol/fix_account_delete 
Change pop() to first() in commands/default/admin.py
 2017-11-29 20:11:55 +01:00
Griatch
264cdfb0f0 Merge pull request #1513 from TehomCD/fix_sethome 
Fix sethome's help file
 2017-11-29 20:04:35 +01:00
Griatch
a787836067 Merge pull request #1512 from TehomCD/template_deprecation_fix 
Replaced deprecated TEMPLATE_DEBUG setting
 2017-11-29 20:03:49 +01:00
Griatch
cad79dc285 Merge pull request #1511 from TehomCD/channel_admin_fix 
Fix search and timeout with large database
 2017-11-29 20:02:44 +01:00
Griatch
3b75bb2ad1 Update instructions for installing SSL requirements 2017-11-29 19:55:13 +01:00
Griatch
04e1cc86cd Merge pull request #1509 from FlutterSprite/healthbar 
contrib: Health bar
 2017-11-29 19:35:24 +01:00
Griatch
cc398f9851 Remove some spurious spaces 2017-11-29 19:32:50 +01:00
Griatch
86bfbe2cf6 Merge branch 'menutree' of https://github.com/FlutterSprite/evennia into FlutterSprite-menutree 2017-11-29 19:21:37 +01:00
FlutterSprite
f0630535e0 Fix variable in example menu function 
I changed this while making unit tests and forgot to change it
back. Whoops!
 2017-11-12 11:58:23 -08:00