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

a7b9bae0

Commit a7b9bae0 authored 10 years ago by DarkGod

Downloads
- Plain Diff

Merge branch 'small_fixes' into 'master'

Friendlyfire fixes

friendlyblock now works consistently with friendlyfire & alch bombs too.

parents ed1fd9b4 4d989487

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

game/engines/default/engine/Target.lua 1 addition, 1 deletion

game/engines/default/engine/Target.lua
game/modules/tome/data/talents/spells/energy-alchemy.lua 1 addition, 1 deletion

game/modules/tome/data/talents/spells/energy-alchemy.lua
game/modules/tome/data/talents/spells/explosives.lua 1 addition, 1 deletion

game/modules/tome/data/talents/spells/explosives.lua

with 3 additions and 3 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