Commit graph

5077 commits

Author SHA1 Message Date
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
BattleJenkins
0fae112643 Added options for conditions at top of module 2017-11-29 13:54:22 -08:00
Griatch
5986f99424
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
b2547bb7d2
Merge pull request #1513 from TehomCD/fix_sethome
Fix sethome's help file
2017-11-29 20:04:35 +01:00
Griatch
b515b382f2
Merge pull request #1512 from TehomCD/template_deprecation_fix
Replaced deprecated TEMPLATE_DEBUG setting
2017-11-29 20:03:49 +01:00
Griatch
c6b89b2664
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
60e3e0e864 Update instructions for installing SSL requirements 2017-11-29 19:55:13 +01:00
Griatch
615fc909ae
Merge pull request #1509 from FlutterSprite/healthbar
contrib: Health bar
2017-11-29 19:35:24 +01:00
Griatch
deac554bcc Remove some spurious spaces 2017-11-29 19:32:50 +01:00
Griatch
c1e23ae7f7 Merge branch 'menutree' of https://github.com/FlutterSprite/evennia into FlutterSprite-menutree 2017-11-29 19:21:37 +01:00
FlutterSprite
0b714a2d0a Fix readme spacing 2017-11-19 13:25:37 -08:00
FlutterSprite
6417aaa70b Update readme 2017-11-19 13:24:44 -08:00
FlutterSprite
fcac893f94 More item prototypes - probably ready to go! 2017-11-19 13:18:55 -08:00
FlutterSprite
ea12145ce1 Fixed all conditions lasting indefinitely
Turns out 1 == True, but not 1 is True - learn something new
every day!
2017-11-19 12:59:07 -08:00
FlutterSprite
ad2724630c More conditions and documentation 2017-11-19 12:16:38 -08:00
BattleJenkins
d60f23ec1c More documentation, fix error in at_update()
at_update() erroneously changed the turnchar on conditions during
combat - this has been fixed.
2017-11-18 18:43:14 -08:00
BattleJenkins
93d5cb6036 More documentation, 'True' duration for indefinite conditions 2017-11-18 18:02:54 -08:00
BattleJenkins
0a9d23c62a Add "Poisoned" condition, more condition items
Added the ability for attack items to inflict conditions on hit,
as well as items that can cure specific conditions.
2017-11-18 17:28:52 -08:00
FlutterSprite
9f39f2e621
Merge pull request #3 from FlutterSprite/tb_items
Merge magic and items branches
2017-11-18 13:51:51 -08:00
FlutterSprite
df36be1caa
Merge pull request #2 from FlutterSprite/develop
Merge develop
2017-11-18 13:44:25 -08:00
BattleJenkins
228c4740bb Fix condition ticking 2017-11-18 13:25:47 -08:00