Skip to content
Snippets Groups Projects
Forked from tome / Tales of MajEyal
Source project has a limited visibility.
  • DarkGod's avatar
    f12dedc7
    works ! · f12dedc7
    DarkGod authored
    Merge branch 'master' into shifting_particles
    
    Conflicts:
    	game/engines/default/engine/Actor.lua
    	game/engines/default/engine/Entity.lua
    	game/modules/tome/class/Actor.lua
    f12dedc7
    History
    works !
    DarkGod authored
    Merge branch 'master' into shifting_particles
    
    Conflicts:
    	game/engines/default/engine/Actor.lua
    	game/engines/default/engine/Entity.lua
    	game/modules/tome/class/Actor.lua