Commit graph

5309 commits

Author SHA1 Message Date
Griatch
d6ab9b3f5a Merge branch 'master' into develop 2019-01-23 21:16:24 +01:00
Griatch
ae979e852d Catch keyerrors in amp box, as per #1306 2019-01-23 21:15:14 +01:00
Griatch
f33407802d Resolve merge conflict 2019-01-17 23:04:11 +01:00
Griatch
a9fd49474d Correct use of callable in prototype creation 2019-01-17 23:03:11 +01:00
Griatch
bec9752b90 Merge branch 'Henddher-puzzles' into develop 2019-01-17 21:32:18 +01:00
Griatch
5a79cd6661 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
ef0832707d Merge branch 'puzzles' of https://github.com/Henddher/evennia into Henddher-puzzles 2019-01-17 20:45:16 +01:00
Griatch
484e5e6b1c 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
22481fe752 Fix a slight error in search with candidates 2019-01-06 21:27:19 +01:00
Griatch
92c1444a3a Merge branch 'master' into develop 2019-01-04 19:53:15 +01:00
Griatch
f7857d6a2c Fix traceback in nick cmd. Resolves #1761 2019-01-04 19:52:55 +01:00
Griatch
b45cdcf8c2 Fix nix traceback. Resolves #1761. 2019-01-04 19:51:26 +01:00
Griatch
855e7f32b0 Re-add missing fix for candidates removed in refactor
Resolves #1763.
2019-01-04 19:36:31 +01:00
Griatch
598126d25c Merge branch 'master' into develop 2019-01-04 19:33:18 +01:00
Griatch
2bea75c27d Further clarifications in search docstring 2019-01-04 14:35:44 +01:00
Griatch
692266d1bb Clarifying use_dbref docstring 2019-01-04 12:56:43 +01:00
Henddher Pedroza
74279720b6 Remove FIXME:. Scripts names are case-insensitive 2019-01-03 20:07:27 -06:00
Henddher Pedroza
54e68f99c4 Refactor use command to abstract puzzle matching functionality into unit-testable functions. More tests 2019-01-01 23:05:41 -06:00
Griatch
e016ba921e Merge branch 'master' into develop 2019-01-01 15:15:30 +01:00
Griatch
352582541f Make help command accept use without a session 2019-01-01 03:29:55 +01:00
Henddher Pedroza
9d5c84f3d6 Cleanup 2018-12-30 21:36:42 -06:00
Griatch
daa9c55653 Merge branch 'master' into develop 2018-12-30 11:15:10 +01:00
Griatch
9a556aa57b Cleanup of contrib readme 2018-12-30 11:14:16 +01:00
Griatch
0779fd6c67 Merge pull request #1756 from Antrare/patch-1
BugFix - Delete Prototypes using spawn command
2018-12-19 00:04:41 +01:00
Antrare
e102782ab0 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
92726040e7 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
532fe8eb5a Merge pull request #1750 from vincent-lg/fr
Update the fr translation
2018-12-16 21:11:39 +01:00
Griatch
47bda92a97 Merge pull request #1752 from friarzen/master
Some Webclient bugfixes
2018-12-16 14:16:46 +01:00
Vincent Le Goff
03d0d015d7 Fix #1754: WindowsError is replaced with OSError 2018-12-11 17:54:27 +01:00
Henddher Pedroza
45e123fe78 Replace word stone with word steel 2018-12-02 12:09:00 -06:00
Henddher Pedroza
b10049c0df Cleanup 2018-12-02 11:15:50 -06:00
Henddher Pedroza
271d5aa0a5 Merge branch 'master' of https://github.com/evennia/evennia into puzzles 2018-12-02 10:34:59 -06:00
Griatch
9b2ae6caed Merge branch 'master' into develop 2018-12-02 16:28:45 +01:00
Griatch
1ac0b38984 Correct command name in doc 2018-12-02 16:28:31 +01:00
Griatch
f0bb6b91ef Merge pull request #1749 from vincent-lg/fix-translation
Allow the 'makemessages' and 'compilemessages' commands
2018-12-02 16:08:06 +01:00
Griatch
941ac1db45 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
54843dfa71 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
df47eb8cc7 Merge pull request #1741 from strikaco/charlocks
Adds delete() lock to new character objects (#1729)
2018-12-02 15:58:16 +01:00
Griatch
8ba00beef1 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
8f15256dff adjust so splithandler dialogs dont get trumped by default_in 2018-11-27 20:35:53 -05:00
friarzen
b91504110f open help popup when the option is set. 2018-11-27 08:29:49 -05:00
friarzen
303fc584c9 Modal dialogs should capture all keystrokes but not interfere with other onKeydowns 2018-11-27 04:20:22 +00:00
friarzen
ad05ca1515 fix hotbuttons css/layout issues 2018-11-27 03:43:20 +00:00
friarzen
69ef732caf whitespace cleanup 2018-11-27 03:42:37 +00:00
Vincent Le Goff
650029a09e Update the fr translation 2018-11-22 10:17:52 +01:00
Vincent Le Goff
1788cc8e19 Allow the 'makemessages' and 'compilemessages' commands 2018-11-22 08:46:54 +01:00
Vincent Le Goff
ddbd39fce5 Fix slight bugs that prevent a frozen version 2018-11-21 16:11:44 +01:00
Henddher Pedroza
1e4cfafdaa Cleanup 2018-11-11 19:17:52 -06:00
Henddher Pedroza
e52e68a08e 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
81de57adfd Adds public point of contact email to settings and unloggedin help command. 2018-11-07 21:26:34 +00:00