Commit graph

5307 commits

Author SHA1 Message Date
Griatch
7fc74f3d2e Resolve merge conflict 2019-01-17 23:04:11 +01:00
Griatch
9e55741818 Correct use of callable in prototype creation 2019-01-17 23:03:11 +01:00
Griatch
2e843f5796 Merge branch 'Henddher-puzzles' into develop 2019-01-17 21:32:18 +01:00
Griatch
c9059e4e46 Some minor cleanup, PEP8, doc fixes
- Removed mention of @puzzle/arm switch since this didn't appear to
exist anymore
- Added full help docstrings for commands, including examples
- Added mention of other puzzle-commands to help, to aid the process
of creating and using a puzzle
- PEP8 cleanup
2019-01-17 21:30:24 +01:00
Griatch
d0bb45e2fd Merge branch 'puzzles' of https://github.com/Henddher/evennia into Henddher-puzzles 2019-01-17 20:45:16 +01:00
Griatch
3efaf6844e
Merge pull request #1767 from vincent-lg/fix_candidates
Fix a slight error in search with candidates
2019-01-13 12:40:51 +01:00
Vincent Le Goff
e54fb1c3d5 Fix a slight error in search with candidates 2019-01-06 21:27:19 +01:00
Griatch
b802f3ebd1 Merge branch 'master' into develop 2019-01-04 19:53:15 +01:00
Griatch
c37a231948 Fix traceback in nick cmd. Resolves #1761 2019-01-04 19:52:55 +01:00
Griatch
3582a0c565 Fix nix traceback. Resolves #1761. 2019-01-04 19:51:26 +01:00
Griatch
90777aba7a Re-add missing fix for candidates removed in refactor
Resolves #1763.
2019-01-04 19:36:31 +01:00
Griatch
b8dc257b49 Merge branch 'master' into develop 2019-01-04 19:33:18 +01:00
Griatch
8721d8c157 Further clarifications in search docstring 2019-01-04 14:35:44 +01:00
Griatch
a7de87b42d Clarifying use_dbref docstring 2019-01-04 12:56:43 +01:00
Henddher Pedroza
d629fba2ed Remove FIXME:. Scripts names are case-insensitive 2019-01-03 20:07:27 -06:00
Henddher Pedroza
8b782e145f Refactor use command to abstract puzzle matching functionality into unit-testable functions. More tests 2019-01-01 23:05:41 -06:00
Griatch
29f61c3c4d Merge branch 'master' into develop 2019-01-01 15:15:30 +01:00
Griatch
1b5da3e85d Make help command accept use without a session 2019-01-01 03:29:55 +01:00
Henddher Pedroza
b9a3f22f1f Cleanup 2018-12-30 21:36:42 -06:00
Griatch
599838bee2 Merge branch 'master' into develop 2018-12-30 11:15:10 +01:00
Griatch
0f34519958 Cleanup of contrib readme 2018-12-30 11:14:16 +01:00
Griatch
dc9044351b
Merge pull request #1756 from Antrare/patch-1
BugFix - Delete Prototypes using spawn command
2018-12-19 00:04:41 +01:00
Antrare
3afe08a1cf
BugFix - Delete Prototypes using spawn command
Spawn/delete <prototypekey> was not actually deleting anything.  This enables the command to work as expected.
2018-12-18 20:31:14 +11:00
Griatch
5e98127e22
Merge pull request #1755 from vincent-lg/fix_1754
Fix #1754: WindowsError is replaced with OSError
2018-12-17 09:15:02 +01:00
Griatch
ccdad894be
Merge pull request #1750 from vincent-lg/fr
Update the fr translation
2018-12-16 21:11:39 +01:00
Griatch
3685a666e3
Merge pull request #1752 from friarzen/master
Some Webclient bugfixes
2018-12-16 14:16:46 +01:00
Vincent Le Goff
b7893e7319 Fix #1754: WindowsError is replaced with OSError 2018-12-11 17:54:27 +01:00
Henddher Pedroza
6c3e6bd15f Replace word stone with word steel 2018-12-02 12:09:00 -06:00
Henddher Pedroza
543ceca819 Cleanup 2018-12-02 11:15:50 -06:00
Henddher Pedroza
bd13518a0e Merge branch 'master' of https://github.com/evennia/evennia into puzzles 2018-12-02 10:34:59 -06:00
Griatch
95839780fb Merge branch 'master' into develop 2018-12-02 16:28:45 +01:00
Griatch
811ab0045e Correct command name in doc 2018-12-02 16:28:31 +01:00
Griatch
c0f4dce2a4
Merge pull request #1749 from vincent-lg/fix-translation
Allow the 'makemessages' and 'compilemessages' commands
2018-12-02 16:08:06 +01:00
Griatch
d4cac059da
Merge pull request #1748 from vincent-lg/frozen
Fix slight bugs that prevent a frozen version
2018-12-02 16:05:15 +01:00
Griatch
9492805234
Merge pull request #1742 from strikaco/admincontact
Adds STAFF_CONTACT_EMAIL setting and value to unloggedin help command
2018-12-02 15:59:22 +01:00
Griatch
5e266ddd8f
Merge pull request #1741 from strikaco/charlocks
Adds delete() lock to new character objects (#1729)
2018-12-02 15:58:16 +01:00
Griatch
b03c050dd3
Merge pull request #1716 from Henddher/bug_1704
#1704: traceback when prototype key contains `#Number` [READY FOR REVIEW/MERGE]
2018-12-02 14:53:12 +01:00
Brenden Tuck
0554f83b69 adjust so splithandler dialogs dont get trumped by default_in 2018-11-27 20:35:53 -05:00
friarzen
ce3a1da1dc open help popup when the option is set. 2018-11-27 08:29:49 -05:00
friarzen
57551c791d Modal dialogs should capture all keystrokes but not interfere with other onKeydowns 2018-11-27 04:20:22 +00:00
friarzen
21451d0f9b fix hotbuttons css/layout issues 2018-11-27 03:43:20 +00:00
friarzen
07663e6a27 whitespace cleanup 2018-11-27 03:42:37 +00:00
Vincent Le Goff
1ae112cbce Update the fr translation 2018-11-22 10:17:52 +01:00
Vincent Le Goff
354b54d369 Allow the 'makemessages' and 'compilemessages' commands 2018-11-22 08:46:54 +01:00
Vincent Le Goff
9d3938d0f5 Fix slight bugs that prevent a frozen version 2018-11-21 16:11:44 +01:00
Henddher Pedroza
d1d85033af Cleanup 2018-11-11 19:17:52 -06:00
Henddher Pedroza
6114b8ddee Addition of mask to puzzles. Mask allows to mask-out part attributes during parts-and-recipes matching 2018-11-11 18:54:15 -06:00
Johnny
2748c94be6 Adds public point of contact email to settings and unloggedin help command. 2018-11-07 21:26:34 +00:00
Johnny
65387c59ae Adds delete() lock to characters by default. 2018-11-07 20:44:48 +00:00
Griatch
4be8a1462c Merge branch 'master' into develop 2018-11-07 18:59:06 +01:00