Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Tales of MajEyal
- Activity
- Members
- Labels
- Releases
- Model registry
- Environments

Snippets Groups Projects

ff9f52b1

Commit ff9f52b1 authored 10 years ago by DarkGod

Downloads
- Plain Diff

Merge branch 'rest_wait_objects' into 'master'

player rest wait for objects

Resting will wait for objects' cooldowns and even powers recharge, if you hit "r" enough times.

parents 0464cdf8 c170f510

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

game/engines/default/engine/HotkeysIconsDisplay.lua 6 additions, 7 deletions

game/engines/default/engine/HotkeysIconsDisplay.lua
game/engines/default/engine/interface/ObjectActivable.lua 20 additions, 25 deletions

game/engines/default/engine/interface/ObjectActivable.lua
game/modules/tome/class/Object.lua 82 additions, 0 deletions

game/modules/tome/class/Object.lua
game/modules/tome/class/Player.lua 23 additions, 0 deletions

game/modules/tome/class/Player.lua

with 131 additions and 32 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