Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Tales of MajEyal
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

53cdcb82

Commit 53cdcb82 authored 12 years ago by dg

Downloads
- Patches
- Plain Diff

Entity:addTemporaryValue can use "highest" and "lowest" merge algorithms

git-svn-id: http://svn.net-core.org/repos/t-engine4@5064 51575b47-30f0-44d4-a5cc-537603b46e54

parent fb0ea448

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

game/engines/default/engine/Entity.lua 18 additions, 0 deletions

game/engines/default/engine/Entity.lua
game/engines/default/engine/utils.lua 24 additions, 0 deletions

game/engines/default/engine/utils.lua
game/modules/tome/class/Actor.lua 8 additions, 2 deletions

game/modules/tome/class/Actor.lua
game/modules/tome/data/damage_types.lua 19 additions, 1 deletion

game/modules/tome/data/damage_types.lua
game/modules/tome/data/general/objects/egos/torques-powers.lua 2 additions, 2 deletions

...modules/tome/data/general/objects/egos/torques-powers.lua
game/modules/tome/data/general/objects/egos/totems-powers.lua 1 addition, 1 deletion

.../modules/tome/data/general/objects/egos/totems-powers.lua

with 72 additions and 6 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment