Commit graph

4665 commits

Author SHA1 Message Date
Griatch
b154e78070 Resolve merge conflicts 2018-06-12 20:13:22 +02:00
Griatch
3931d877ae
Merge pull request #1626 from TehomCD/fix_saverlist_add
Fix __add__ in SaverList
2018-06-12 19:00:40 +02:00
Griatch
831f2baacd
Merge pull request #1621 from TehomCD/fix_duplicate_scripts
Fix duplicate script calls
2018-06-12 18:59:51 +02:00
Griatch
b8e71fdeaf
Merge pull request #1615 from TehomCD/fix_negative_numbers_in_commandtest
Fix regex in CommandTest breaking negative numbers
2018-06-12 18:57:44 +02:00
Tehom
26205acc39 Fix __add__ in SaverList 2018-05-29 23:05:34 -04:00
Tehom
058c65074e Handle scripts with negative intervals. 2018-05-10 19:40:58 -04:00
Tehom
9ee420458c Fix paused tasks. 2018-05-10 19:30:58 -04:00
Tehom
59d136f405 Add special handling for scripts when flushed from cache to avoid duplicate ExtendedLoopingCalls. 2018-05-10 19:23:59 -04:00
Griatch
5edea757c9 Fix lockhandler singleton implmentation with a dummyobj 2018-04-25 22:34:33 +02:00
Griatch
5335f21718
Update CODING_STYLE.md 2018-04-25 21:53:28 +02:00
Tehom
ebf0fcf0e3 Call parse_ansi on each returned message before passing to regex to handle individually colored characters. 2018-04-24 06:03:01 -04:00
Griatch
b810ca8a1c Add check_lockstring as a function in locks/lockhandler.py 2018-04-22 22:28:43 +02:00
Rachel Blackman
84620256c6 Switch /contains to default, add /startswith switch instead. 2018-04-22 16:02:12 +02:00
Rachel Blackman
3b99e10a6a 0.8 has switches defined in the command, need to make the change from the 0.7 changeset this originated from. 2018-04-22 16:02:12 +02:00
Rachel Blackman
895cc2de52 Add /contains switch to find. 2018-04-22 16:02:12 +02:00
Griatch
1518aaa6f2 Merge branch 'master' into develop 2018-04-22 15:04:59 +02:00
Griatch
24fc553784 Make EvTable respect col-widths while retaining total table width.
Resolves #1614.
2018-04-22 14:50:17 +02:00
Griatch
c97ba87e9b Fix error if sending string to list_node select callback 2018-04-22 13:39:47 +02:00
Tehom
b34920059b Add yet more hyphens. 2018-04-22 07:37:14 -04:00
Tehom
1480ac9acc Add hyphens to some tests. Probably more to come 2018-04-22 07:25:01 -04:00
Tehom
3bebe2ac22 Fix regex in CommandTest breaking negative numbers 2018-04-22 06:56:27 -04:00
Griatch
3c2e3f8d63
Merge pull request #1592 from friarzen/master
Alpha webclient split interface support
2018-04-21 19:10:11 +02:00
friarzen
b580123b19 Attempt to make append/replace dialog text more clear 2018-04-21 17:03:01 +00:00
Griatch
a71f112d80 Inject selection in list_node decorator if select kwarg is a string 2018-04-21 15:31:30 +02:00
Griatch
894969da13 Fix unittests 2018-04-20 19:51:12 +02:00
Griatch
405516d530 Cherry-pick EvMenu list_node decorator from olc branch 2018-04-19 22:47:13 +02:00
Griatch
df664f0ee6
Merge pull request #1610 from TehomCD/fix_commandtest_at_pre_cmd
Fix CommandTest to stop if at_pre_cmd should stop execution.
2018-04-18 09:16:26 +02:00
Tehom
e48ce5b9a3 Fix CommandTest to stop if at_pre_cmd should stop execution. 2018-04-18 02:26:01 -04:00
Griatch
0538160c5f style fix 2018-04-17 22:49:01 +02:00
Griatch
33347bd2cb Fix unittest 2018-04-16 20:34:52 +02:00
Griatch
5eeaf87e9c Resolve merge conflict 2018-04-16 20:06:48 +02:00
Griatch
a0aa1d6e7a
Merge pull request #1609 from adityac8/patch-1
Update rpsystem.py
2018-04-16 15:53:48 +02:00
Aditya Arora
7ae3a43424
Update rpsystem.py 2018-04-16 18:41:02 +05:30
Griatch
47e71487e0
Merge pull request #1607 from CloudKeeper1/patch-8
Wrong symbol on line 499
2018-04-13 20:11:15 +02:00
CloudKeeper1
235d41a104
Wrong symbol on line 499
Wrong symbol on line 499
2018-04-14 00:23:52 +10:00
Brenden Tuck
ab811c81c8 Added an undo button for multi-level undo of splits 2018-04-08 12:33:38 -04:00
Griatch
cd192733af
Merge pull request #1603 from Packetdancer/master
Add support for MUDINFO 1.1 query at login screen
2018-04-01 09:48:33 +02:00
Rachel Blackman
2ab99ee1bf Add test for unconnected commands, add INFO command to test set. 2018-04-01 00:39:16 -07:00
Rachel Blackman
567243a3fc Update INFO command to take a single msg() call, and add better docstring. 2018-03-31 23:15:28 -07:00
Griatch
748245e13e Merge branch 'master' into develop 2018-03-31 12:42:26 +02:00
Griatch
e875717b32 Fix of output handling in msg() when text is None 2018-03-31 12:40:57 +02:00
Rachel Blackman
9f3c3c5cb9 Add 'INFO' command to unlogged-in command set, so that we can be polled by Mudconnector and Mudstats. 2018-03-29 18:02:45 -07:00
friarzen
8bde43a3e3 adjust css to match existing toolbar and toggle split/pane popup 2018-03-22 00:52:19 +00:00
friarzen
36c89799cd Add user selected names to each new pane and some CSS 2018-03-21 18:35:48 +00:00
friarzen
9599c3e47a Merge branch 'develop' of github.com:/evennia/evennia 2018-03-19 23:37:05 +00:00
Brenden Tuck
58cff92a8f
Merge pull request #1 from chainsol/friarzen_webclient
Fixed 500 Error in Webclient
2018-03-19 14:01:05 -04:00
Nicholas Matlaga
acc78186e3 fix webclient/base.html (500 error) 2018-03-19 11:20:08 -04:00
friarzen
36e294a9d4 Fix append scrolling -- needs more testing 2018-03-19 00:59:28 +00:00
Brenden Tuck
417acad648
Merge branch 'develop' into master 2018-03-18 20:16:06 -04:00
friarzen
665ba8d0f4 Make the initial login 'look' match CmdLook 2018-03-18 00:45:23 +00:00