Fix merge conflicts

This commit is contained in:
Griatch 2022-04-09 20:19:24 +02:00
commit b2e41c2ddc
26 changed files with 999 additions and 573 deletions

View file

@ -160,10 +160,12 @@ Up requirements to Django 4.0+, Twisted 22+, Python 3.9 or 3.10
- Attribute storage support defaultdics (Hendher)
- Add ObjectParent mixin to default game folder template as an easy, ready-made
way to override features on all ObjectDB-inheriting objects easily.
source location, mimicking behavior of `at_pre_move` hook - returning False will abort move.
- Add `TagProperty`, `AliasProperty` and `PermissionProperty` to assign these
data in a similar way to django fields.
- New `at_pre_object_receive(obj, source_location)` method on Objects. Called on
destination, mimicking behavior of `at_pre_move` hook - returning False will abort move.
- New `at_pre_object_leave(obj, destination)` method on Objects. Called on
source location, mimicking behavior of `at_pre_move` hook - returning False will abort move.
## Evennia 0.9.5