Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-04-03 14:37:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
7331 commits 10 branches 44 tags 528 MiB
Commit graph

7331 commits

This branch
This branch
All branches
Author SHA1 Message Date
BattleJenkins
24866df8cd Attempt to fix TickerHandler error in unit tests 2017-11-29 15:08:55 -08:00
BattleJenkins
273b66267f Unit tests for tb_items 2017-11-29 15:01:49 -08:00
FlutterSprite
9119ffa165
Merge pull request #5 from FlutterSprite/develop 
Merge develop changes
 2017-11-29 14:24:21 -08:00
FlutterSprite
4ae293874f
Merge pull request #4 from evennia/develop 
Merging from base develop
 2017-11-29 14:23:15 -08:00
BattleJenkins
0fae112643 Added options for conditions at top of module 2017-11-29 13:54:22 -08:00
Griatch
5986f99424
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
b2547bb7d2
Merge pull request #1513 from TehomCD/fix_sethome 
Fix sethome's help file
 2017-11-29 20:04:35 +01:00
Griatch
b515b382f2
Merge pull request #1512 from TehomCD/template_deprecation_fix 
Replaced deprecated TEMPLATE_DEBUG setting
 2017-11-29 20:03:49 +01:00
Griatch
c6b89b2664
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
60e3e0e864 Update instructions for installing SSL requirements 2017-11-29 19:55:13 +01:00
Griatch
615fc909ae
Merge pull request #1509 from FlutterSprite/healthbar 
contrib: Health bar
 2017-11-29 19:35:24 +01:00
Griatch
deac554bcc Remove some spurious spaces 2017-11-29 19:32:50 +01:00
Griatch
c1e23ae7f7 Merge branch 'menutree' of https://github.com/FlutterSprite/evennia into FlutterSprite-menutree 2017-11-29 19:21:37 +01:00
FlutterSprite
0b714a2d0a Fix readme spacing 2017-11-19 13:25:37 -08:00
FlutterSprite
6417aaa70b Update readme 2017-11-19 13:24:44 -08:00
FlutterSprite
fcac893f94 More item prototypes - probably ready to go! 2017-11-19 13:18:55 -08:00
FlutterSprite
ea12145ce1 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
ad2724630c More conditions and documentation 2017-11-19 12:16:38 -08:00
BattleJenkins
d60f23ec1c 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
93d5cb6036 More documentation, 'True' duration for indefinite conditions 2017-11-18 18:02:54 -08:00
BattleJenkins
0a9d23c62a 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
9f39f2e621
Merge pull request #3 from FlutterSprite/tb_items 
Merge magic and items branches
 2017-11-18 13:51:51 -08:00
FlutterSprite
df36be1caa
Merge pull request #2 from FlutterSprite/develop 
Merge develop
 2017-11-18 13:44:25 -08:00
BattleJenkins
228c4740bb Fix condition ticking 2017-11-18 13:25:47 -08:00
BattleJenkins
d9d4a8292f Added functional condition, TickerHandler countdown 2017-11-18 13:22:03 -08:00
BattleJenkins
b54a167989 Fix weird spacing in use_item() 2017-11-17 21:19:02 -08:00
BattleJenkins
c3ffa7b906 Start porting in condition code from coolbattles 2017-11-17 21:17:35 -08:00
BattleJenkins
9f8c92e4d4 Move some item logic from CmdUse to new func use_item 2017-11-17 16:46:27 -08:00
BattleJenkins
fd5f6ba981 Proper implementation of spend_item_use() 2017-11-16 00:15:20 -08:00
BattleJenkins
57cfb8e025 Added 'use' command, item functions, example items 2017-11-15 23:12:25 -08:00
FlutterSprite
97ab816508
Create tb_items.py 2017-11-15 16:25:08 -08:00
FlutterSprite
7fbd473d14
Merge pull request #1 from evennia/develop 
Sync with develop
 2017-11-15 16:23:38 -08:00
BattleJenkins
89ed833c76 Final touches 2017-11-15 14:58:25 -08:00
BattleJenkins
473fbe8a81 Comments and documentation, CmdStatus() added 2017-11-15 14:41:43 -08:00
FlutterSprite
19c278afcd Formatting and documentation 2017-11-15 14:14:16 -08:00
FlutterSprite
792c54996a Added attack spells, more healing spell variants 2017-11-12 21:11:28 -08:00
FlutterSprite
d87be0c529 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
37aef859ed 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
f82f629f85
Update tree_select.py 2017-11-12 11:51:53 -08:00
FlutterSprite
ee462dcdb3
Catch callback errors with logger 2017-11-12 11:46:59 -08:00
FlutterSprite
b431025a79
Fix order of args for the callback in documentation 2017-11-12 02:21:49 -08:00
FlutterSprite
2e7a9bb29e
Add mention of how the callback is used 2017-11-12 01:56:35 -08:00
Nicholas
74bbd0efea Change pop() to first() 2017-11-11 12:29:07 -05:00
Griatch
34acefc587 Merge branch 'master' into develop 2017-11-11 01:02:26 +01:00
Griatch
c1735ec2a1 Fix dockerfile dependency. Resolve #1510. 2017-11-11 01:02:05 +01:00
Tehom
4d7a1f9b9a Fix sethome's help file 2017-11-10 14:42:21 -05:00
BattleJenkins
84c8284805 Added tb_magic.py - only basic input parsing 2017-11-09 22:36:11 -08:00
Tehom
989a046bc9 Move deprecated TEMPLATE_DEBUG setting to the 'options' field of TEMPLATES. 2017-11-10 00:34:20 -05:00
Tehom
ae3c3c526e Fix search and timeout with large database 2017-11-09 22:33:08 -05:00
FlutterSprite
f653d0d149
Add unit tests for health_bar contrib 2017-11-05 18:42:55 -08:00