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

8280 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Vincent Le Goff
3ad9633de6 Add automatic escaping of the settings docstring for Windows' sake in py3k 2017-12-28 14:06:20 +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
FlutterSprite
e14b18eaaf Merge pull request #6 from evennia/develop 
Update Develop
 2017-12-16 17:29:13 -08: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
BattleJenkins
717999f56f Unit tests for tb_magic 2017-12-11 14:35:18 -08:00
BattleJenkins
a945c40ff6 Merge branch 'tb_magic' of http://github.com/FlutterSprite/evennia into tb_magic 2017-12-10 18:54:37 -08:00
FlutterSprite
52d505b011 Use test character class instead 2017-12-10 18:53:10 -08:00
FlutterSprite
f738427ff3 Add tickerhandler-free character class for tests 2017-12-10 18:52:34 -08:00
BattleJenkins
b213f4a243 Test character class without tickerhandler 2017-12-10 18:50:34 -08: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
FlutterSprite
1420c8773e Comment it out right this time 2017-11-29 20:32:00 -08:00
FlutterSprite
a3caaf8c5f Just comment it all out. 
Travis won't even tell me why it failed this time.
 2017-11-29 20:26:26 -08:00
FlutterSprite
0932a839ba Also remove ticker handler for 'attacker' and 'defender' 
Whoops! I forgot that ALL my test characters are getting subscribed to the ticker handler here - maybe that's the problem?
 2017-11-29 20:18:54 -08:00
FlutterSprite
2549a8d8e1 Comment out tb_items tests for now 2017-11-29 20:08:22 -08:00
BattleJenkins
dc67f4b871 Ugh!!! TickerHandler changes, more 2017-11-29 15:37:40 -08:00
BattleJenkins
0c8db01d56 TickerHandler stuff, more 2017-11-29 15:29:49 -08:00
BattleJenkins
9e8a400049 Manually unsubscribe ticker handler 2017-11-29 15:15:47 -08:00
BattleJenkins
785522fb3c Attempt to fix TickerHandler error in unit tests 2017-11-29 15:08:55 -08:00