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

2b062ec2

Commit 2b062ec2 authored 10 years ago by DarkGod

Downloads
- Plain Diff

Merge branch 'shifting_particles' into 'master'

Shifting particles

Particle systems can now react to actor movements

parents 4a53b1fb f3a76223

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

game/engines/default/engine/Actor.lua 6 additions, 1 deletion

game/engines/default/engine/Actor.lua
game/engines/default/engine/Entity.lua 12 additions, 1 deletion

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

game/engines/default/engine/Particles.lua
game/modules/tome/class/Actor.lua 4 additions, 2 deletions

game/modules/tome/class/Actor.lua
game/modules/tome/class/Projectile.lua 1 addition, 1 deletion

game/modules/tome/class/Projectile.lua
game/modules/tome/class/WorldNPC.lua 3 additions, 1 deletion

game/modules/tome/class/WorldNPC.lua
game/modules/tome/data/gfx/particles/arcane_power.lua 7 additions, 6 deletions

game/modules/tome/data/gfx/particles/arcane_power.lua
game/modules/tome/data/gfx/particles_images/transpcircle.png 0 additions, 0 deletions

game/modules/tome/data/gfx/particles_images/transpcircle.png
game/modules/tome/dialogs/MapMenu.lua 2 additions, 0 deletions

game/modules/tome/dialogs/MapMenu.lua
src/map.c 18 additions, 10 deletions

src/map.c
src/map.h 2 additions, 1 deletion

src/map.h
src/particles.c 191 additions, 142 deletions

src/particles.c
src/particles.h 1 addition, 0 deletions

src/particles.h

with 258 additions and 165 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