Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-04-05 23:47:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
6084 commits 10 branches 44 tags 528 MiB
Commit graph

6084 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
FlutterSprite
2302408072 Merge pull request #3 from FlutterSprite/tb_items 
Merge magic and items branches
 2017-11-18 13:51:51 -08:00
FlutterSprite
44b570e5f0 Merge pull request #2 from FlutterSprite/develop 
Merge develop
 2017-11-18 13:44:25 -08:00
BattleJenkins
686b290b5d Fix condition ticking 2017-11-18 13:25:47 -08:00
BattleJenkins
44c75d8d18 Added functional condition, TickerHandler countdown 2017-11-18 13:22:03 -08:00
BattleJenkins
ae060ecc77 Fix weird spacing in use_item() 2017-11-17 21:19:02 -08:00
BattleJenkins
e61df0a400 Start porting in condition code from coolbattles 2017-11-17 21:17:35 -08:00
BattleJenkins
91c333e6d3 Move some item logic from CmdUse to new func use_item 2017-11-17 16:46:27 -08:00
BattleJenkins
5ce18379c0 Proper implementation of spend_item_use() 2017-11-16 00:15:20 -08:00
BattleJenkins
35340f86c8 Added 'use' command, item functions, example items 2017-11-15 23:12:25 -08:00
FlutterSprite
0616e0b218 Create tb_items.py 2017-11-15 16:25:08 -08:00
FlutterSprite
ed5c198d65 Merge pull request #1 from evennia/develop 
Sync with develop
 2017-11-15 16:23:38 -08:00
BattleJenkins
fda565b274 Final touches 2017-11-15 14:58:25 -08:00
BattleJenkins
7701d5f92b Comments and documentation, CmdStatus() added 2017-11-15 14:41:43 -08:00
FlutterSprite
858494eebb Formatting and documentation 2017-11-15 14:14:16 -08:00
FlutterSprite
83579a2e06 Added attack spells, more healing spell variants 2017-11-12 21:11:28 -08:00
FlutterSprite
5fe3cd186d Added functional 'cure wounds' spell 
Also added more spell verification in the 'cast' command,
accounting for spell's MP cost and whether it can be used in
combat
 2017-11-12 18:23:22 -08:00
FlutterSprite
f0630535e0 Fix variable in example menu function 
I changed this while making unit tests and forgot to change it
back. Whoops!
 2017-11-12 11:58:23 -08:00
FlutterSprite
53d8536744 Update tree_select.py 2017-11-12 11:51:53 -08:00
FlutterSprite
7d10570424 Catch callback errors with logger 2017-11-12 11:46:59 -08:00
FlutterSprite
ebe7c6f4b3 Fix order of args for the callback in documentation 2017-11-12 02:21:49 -08:00
FlutterSprite
4a554a4409 Add mention of how the callback is used 2017-11-12 01:56:35 -08:00
Nicholas
814ddc567e Change pop() to first() 2017-11-11 12:29:07 -05:00
Griatch
4507c7aa2d Merge branch 'master' into develop 2017-11-11 01:02:26 +01:00
Griatch
e3766762ee Fix dockerfile dependency. Resolve #1510. 2017-11-11 01:02:05 +01:00
Tehom
8049112186 Fix sethome's help file 2017-11-10 14:42:21 -05:00
BattleJenkins
7ddb5162ab Added tb_magic.py - only basic input parsing 2017-11-09 22:36:11 -08:00