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
9560 commits 10 branches 44 tags 528 MiB
Commit graph

9560 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
BattleJenkins
eb95416ee8 Unit tests for tb_items 2017-11-29 15:01:49 -08:00
FlutterSprite
d1de36c2bb Merge pull request #5 from FlutterSprite/develop 
Merge develop changes
 2017-11-29 14:24:21 -08:00
FlutterSprite
90ccd56ba7 Merge pull request #4 from evennia/develop 
Merging from base develop
 2017-11-29 14:23:15 -08:00
BattleJenkins
0c0b5c982a Added options for conditions at top of module 2017-11-29 13:54:22 -08: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
9f86034cf3 Fix readme spacing 2017-11-19 13:25:37 -08:00
FlutterSprite
68e46f1e4e Update readme 2017-11-19 13:24:44 -08:00
FlutterSprite
d99b0b7819 More item prototypes - probably ready to go! 2017-11-19 13:18:55 -08:00
FlutterSprite
ba964797de 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
42db3aa7f5 More conditions and documentation 2017-11-19 12:16:38 -08:00
BattleJenkins
1d65a0a0cf 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
7a933425f3 More documentation, 'True' duration for indefinite conditions 2017-11-18 18:02:54 -08:00
BattleJenkins
9d7921fee5 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