Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-16 21:06:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
4296 commits 11 branches 44 tags 527 MiB
Commit graph

4296 commits

This branch
This branch
All branches
Author SHA1 Message Date
Griatch
4499dad455 Merge branch 'develop' of github.com:evennia/evennia into develop 2017-10-19 21:43:32 +02:00
Griatch
0fdb7c8174 Merge branch 'master' into develop 2017-10-19 21:43:07 +02:00
Griatch
4a219e1360 Merge pull request #1482 from BlauFeuer/develop 
Text corrections in comments and strings
 2017-10-18 20:52:34 +02:00
AmberFennek
fe6be5069a Text corrections in comments and strings 2017-10-16 15:13:53 -04:00
Scyfris Talivinsky
9d10ca4f39 Fix an issue with adding an empty column to an EvTable 
There seems to be an issue with adding an empty column (i.e. a column
with empty data) to an EvTable that has already been set up.  It seems
that the column with empty data is added with one extra row than the
rest of the table, and when a new call to add_rows() is made to EvTable,
the data in the column that was added previously is offset by 1.

This change fixes that by calculating the size of the new column to take
into account the headers BEFORE making the calculation on whether to
expand the column to match the table's size or not.
 2017-10-15 13:38:53 -07:00
Griatch
1f54d464a9 Include EvMenu etc in evennia init step. 2017-10-14 20:53:41 +02:00
Griatch
3e02f96566 Add ability to search_script by typeclass 2017-10-14 20:15:44 +02:00
Griatch
a447a22c87 Merge branch 'master' into develop 2017-10-13 23:11:34 +02:00
Griatch
14348eafab Remove left-over debug statements in irc module 2017-10-13 23:09:58 +02:00
Griatch
d70e7c52d2 Merge branch 'develop' of git://github.com/FlutterSprite/evennia into FlutterSprite-develop 2017-10-13 23:05:06 +02:00
Griatch
8be657ba43 Merge branch 'master' into develop 2017-10-13 23:04:37 +02:00
Griatch
fbaad6c3b7 Further cleanup of a module 2017-10-12 19:35:42 +02:00
Griatch
eeacf01427 Merge branch 'master' of git://github.com/vonzimr/evennia into vonzimr-master 2017-10-12 19:28:33 +02:00
Griatch
9f7fb2734c Make @py output appear for all sessions in MULTISESSION_MODE=1 
Resolves #1356.
 2017-10-12 18:03:48 +02:00
Griatch
4d6464cf89 Merge pull request #1476 from RyanStein/master 
resolve #1448, fix 'no help entry' not popping up in webclient
 2017-10-12 17:27:08 +02:00
vonzimr
3d2e7a7efd remove blank tests 2017-10-11 19:53:48 -07:00
Ryan Stein
53a4fc0b66 resolve #1448, fix 'no help entry' not popping up in webclient 2017-10-10 12:51:09 -04:00
FlutterSprite
8bdfa011fb Added more tb_equip tests 
The unit tests for tb_basic and tb_equip are almost the same, with a few minor differences created by the different default values for unarmed attack and damage rolls.
 2017-10-09 17:44:47 -07:00
vonzimr
5d2ee7e5f4 added IRC_INVERT code according to: https://github.com/myano/jenni/wiki/IRC-String-Formatting 2017-10-09 14:14:14 -07:00
vonzimr
9ddd79b202 extra tests for irc parsing functions 2017-10-09 14:13:48 -07:00
vonzimr
d01e9d9c32 fix spelling of variable to be more consistent with comments. 2017-10-09 12:32:03 -07:00
FlutterSprite
576e2b4be6 Updated typeclass names & added tests for tb_equip commands 2017-10-09 00:16:14 -07:00
FlutterSprite
da8b20e0b1 Renamed typeclasses to avoid conflicts 2017-10-09 00:14:32 -07:00
FlutterSprite
f031ba1b21 Renamed typeclasses to avoid conflicts 2017-10-09 00:13:03 -07:00
FlutterSprite
a3fd45bebb Update contrib unit tests for turnbattle 
Points the contrib unit tests to the turnbattle module's new location in its subfolder.
 2017-10-08 20:09:30 -07:00
FlutterSprite
b50c7a1f3e __init__.py for Turnbattle folder 2017-10-08 20:08:08 -07:00
FlutterSprite
d4d8a9c1b8 Readme for turnbattle folder 2017-10-08 20:07:29 -07:00
FlutterSprite
83791e619a Add 'tb_equip', weapon & armor system for 'turnbattle' 
Adds a new module, 'tb_equip', an implementation of the 'turnbattle' system that includes weapons and armor, which can be wielded and donned to modify attack damage and accuracy.
 2017-10-08 20:05:53 -07:00
FlutterSprite
5cb1ce5b6e Move turnbattle.py to turnbattle/tb_basic.py 
Moves the basic turnbattle module to a new module file in a new 'turnbattle' subfolder. Also fixes a minor bug where the first character in the turn order was not being initialized properly at the start of a fight.
 2017-10-08 20:04:00 -07:00
Griatch
bb79299bf1 Merge pull request #1473 from edawine/complete-dependencies-for-ssh-client 
Fix ImportError for SSH client
 2017-10-08 10:01:55 +02:00
Edwin Sutanto
9620ddb2e0 Fix ImportError for SSH client 
Added instruction to also install pyasn1.
 2017-10-08 10:02:29 +07:00
Griatch
48a1ae1371 Merge branch 'master' into develop 2017-10-07 11:28:32 +02:00
Griatch
70fea693e6 Refactor utils test suite into utils/tests/ 2017-10-07 11:27:47 +02:00
Scyfris Talivinsky
b6649bcef8 Add a @spawn unit test 
Tests the @spawn command and its variations.  The test is designed to
aslo check the properties of the spawned objects for some common/obvious
settings.

Test also adds a new prototypes file to be used with the Evennia unit
tester for any tests that require named prototypes.  The spawner test
requires testing named prototypes, so it is added in this change.
 2017-10-06 01:59:45 -07:00
Griatch
2585d33e7c Merge branch 'master' into develop 2017-10-05 23:18:22 +02:00
Griatch
a994fd3c63 Merge branch 'fix_notification_webclient' of git://github.com/chainsol/evennia into chainsol-fix_notification_webclient 2017-10-05 23:10:19 +02:00
Ryan Stein
866e5dce41 make help command's matching respect CMD_IGNORE_PREFIXES 2017-10-05 23:06:22 +02:00
Griatch
349affe305 Minor doc string update in evennia.js 2017-10-05 22:53:45 +02:00
Griatch
2d030afb36 Update AJAX client with the corrected Autologin functionality 2017-10-05 22:43:12 +02:00
Griatch
8eff4678b4 Cleanup and more help entries for the Admin Attr/Tag inline forms 2017-10-05 21:29:05 +02:00
Griatch
2c88963e3c Fix to handle changed Widget signature affecting picklefield in admin 2017-10-05 20:18:57 +02:00
Nicholas Matlaga
5ecaa9daca fix Notification not being available crash 2017-10-05 11:45:01 -04:00
Ryan Stein
4b9db9570c add @tel/loc functionality, fix unescaped | in @tel error message 2017-10-03 12:41:51 -04:00
Griatch
313a907a3a Merge branch 'master' into develop 2017-10-03 09:36:42 +02:00
Griatch
5ad10d7055 Merge pull request #1464 from amfl/fix-at-before-say 
RPsystem contrib: Pass at_before_say the corrent number of arguments
 2017-10-03 09:36:00 +02:00
amfl
75ad8d843d Pass at_before_say the corrent number of arguments 2017-10-03 19:38:25 +13:00
Griatch
39a7eb9b11 Merge pull request #1463 from chainsol/fix_login_css 
Rename card-block to card-body on Login and Logout Pages
 2017-10-03 00:12:07 +02:00
Nicholas Matlaga
3a6fe2acae rename card-block to card-body 2017-10-02 18:06:23 -04:00
Griatch
b51c94e65c Move noidletimeout default lock setting to the right place 2017-10-02 23:45:07 +02:00
dhruvhacks
0640392c38 Fixed #1460 2017-10-02 22:15:23 +05:30