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

6127 commits

This branch
This branch
All branches
Author SHA1 Message Date
Griatch
0133636b95 Fix typos in doc strings 2017-12-31 13:47:19 +01:00
Griatch
35b552d08d Merge branch 'master' into develop 2017-12-31 13:42:59 +01:00
Griatch
7de45c429b 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
b0fc3e7ae3
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
81806fe89b Add automatic escaping of the settings docstring for Windows' sake in py3k 2017-12-28 14:06:20 +01:00
Tehom
181adeaa90 Fix errors in django admin for Attributes 2017-12-25 07:15:26 -05:00
Griatch
1f98f9534f
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
3a14df2353
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
33645df6dd Try to clarify help file. 2017-12-19 00:42:23 -05:00
Tehom
08365a5ef5 Attempt to handle any errors in logging. 2017-12-19 00:28:48 -05:00
Tehom
56d9887825 Allow other typeclasses to have their Attributes set via command. 2017-12-17 18:53:41 -05:00
FlutterSprite
be8cf70621
Merge pull request #6 from evennia/develop 
Update Develop
 2017-12-16 17:29:13 -08:00
Griatch
6c5648aa39
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
3a740913ba
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
583ce9b71e Step through help and option popup when closing 2017-12-13 21:08:02 -05:00
Robert Bost
af1057d190 Update websocket URL so proxy port can be utilized. Resolves #1421. 2017-12-12 19:29:16 -05:00
Griatch
0ae5989e91
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
7fb30c5bc3 Add a little check in case ENCODINGS is empty 2017-12-12 20:59:55 +01:00
Vincent Le Goff
94e271c693 Simplify telnet edefault encoding 2017-12-12 20:51:16 +01:00
Vincent Le Goff
f3c909ed6a Remove TELNET_ENCODING and set ENCODINGS[0] 2017-12-12 19:46:28 +01:00
Vincent Le Goff
5aa9dfc24c Add a setting to change telnet default encoding 2017-12-12 18:56:36 +01:00
BattleJenkins
9e6de0846c Unit tests for tb_magic 2017-12-11 14:35:18 -08:00
BattleJenkins
3423cc9f67 Merge branch 'tb_magic' of http://github.com/FlutterSprite/evennia into tb_magic 2017-12-10 18:54:37 -08:00
FlutterSprite
f550c03411
Use test character class instead 2017-12-10 18:53:10 -08:00
FlutterSprite
81ac38ec23
Add tickerhandler-free character class for tests 2017-12-10 18:52:34 -08:00
BattleJenkins
961a86b7be Test character class without tickerhandler 2017-12-10 18:50:34 -08:00
Griatch
7e1900e617 fix unittests 2017-12-10 10:26:20 +01:00
Griatch
391132bed2 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
af542b863e Resolve merge conflicts 2017-12-08 19:09:01 +01:00
Griatch
a5658260c5
Merge pull request #1527 from arumford/patch-1 
Update rplanguage.py
 2017-12-08 19:06:45 +01:00
Griatch
144bb03a08
Merge pull request #1526 from TehomCD/flexible_at_say 
Flexible at say
 2017-12-08 19:06:11 +01:00
Griatch
1e6f9bc001
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
d9532d6a23
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
0e1fadddca Fix error in passing non-strings to str.join() 2017-12-08 03:00:43 -05:00
Tehom
fa52cf9173 Make at_say more flexible by not ignoring parameters passed 2017-12-08 02:59:29 -05:00
Tehom
c2fbd10bca Fix msg_receivers to be used 2017-12-08 02:41:33 -05:00
Griatch
a1dee8d1a1 Add some more tests to catch faulty language definitions 2017-12-05 22:03:34 +01:00
Griatch
d4b2ed6b8a Fix and cleanup the rplanguage contrib a bit 2017-12-05 19:54:40 +01:00
Griatch
d3c2461ba8 Merge branch 'master' into develop 2017-12-05 17:14:25 +01:00
FlutterSprite
ccdc0979df
Comment it out right this time 2017-11-29 20:32:00 -08:00
FlutterSprite
619bf01348
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
4234ad2373
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
3576219a2f
Comment out tb_items tests for now 2017-11-29 20:08:22 -08:00
BattleJenkins
36070c8def Ugh!!! TickerHandler changes, more 2017-11-29 15:37:40 -08:00
BattleJenkins
8cd33261fa TickerHandler stuff, more 2017-11-29 15:29:49 -08:00
BattleJenkins
d6a5af1f21 Manually unsubscribe ticker handler 2017-11-29 15:15:47 -08:00
BattleJenkins
24866df8cd Attempt to fix TickerHandler error in unit tests 2017-11-29 15:08:55 -08:00
BattleJenkins
273b66267f Unit tests for tb_items 2017-11-29 15:01:49 -08:00
FlutterSprite
9119ffa165
Merge pull request #5 from FlutterSprite/develop 
Merge develop changes
 2017-11-29 14:24:21 -08:00
FlutterSprite
4ae293874f
Merge pull request #4 from evennia/develop 
Merging from base develop
 2017-11-29 14:23:15 -08:00