works !
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
No related branches found
No related tags found
Showing
- .gitignore 13 additions, 0 deletions.gitignore
- game/engines/default/data/font/INSULA__.ttf 0 additions, 0 deletionsgame/engines/default/data/font/INSULA__.ttf
- game/engines/default/data/font/SVBasicManual-Bold.ttf 0 additions, 0 deletionsgame/engines/default/data/font/SVBasicManual-Bold.ttf
- game/engines/default/data/font/SVBasicManual.ttf 0 additions, 0 deletionsgame/engines/default/data/font/SVBasicManual.ttf
- game/engines/default/data/font/Salsa-Mono.ttf 0 additions, 0 deletionsgame/engines/default/data/font/Salsa-Mono.ttf
- game/engines/default/data/font/Salsa-Regular.ttf 0 additions, 0 deletionsgame/engines/default/data/font/Salsa-Regular.ttf
- game/engines/default/data/font/USENETA.ttf 0 additions, 0 deletionsgame/engines/default/data/font/USENETA.ttf
- game/engines/default/data/font/USENET_.ttf 0 additions, 0 deletionsgame/engines/default/data/font/USENET_.ttf
- game/engines/default/data/font/packages/default.lua 54 additions, 0 deletionsgame/engines/default/data/font/packages/default.lua
- game/engines/default/engine/Actor.lua 10 additions, 4 deletionsgame/engines/default/engine/Actor.lua
- game/engines/default/engine/Entity.lua 42 additions, 19 deletionsgame/engines/default/engine/Entity.lua
- game/engines/default/engine/FontPackage.lua 84 additions, 0 deletionsgame/engines/default/engine/FontPackage.lua
- game/engines/default/engine/Game.lua 16 additions, 5 deletionsgame/engines/default/engine/Game.lua
- game/engines/default/engine/Map.lua 8 additions, 6 deletionsgame/engines/default/engine/Map.lua
- game/engines/default/engine/Module.lua 128 additions, 20 deletionsgame/engines/default/engine/Module.lua
- game/engines/default/engine/Object.lua 37 additions, 19 deletionsgame/engines/default/engine/Object.lua
- game/engines/default/engine/Particles.lua 1 addition, 1 deletiongame/engines/default/engine/Particles.lua
- game/engines/default/engine/PlayerProfile.lua 24 additions, 3 deletionsgame/engines/default/engine/PlayerProfile.lua
- game/engines/default/engine/Projectile.lua 8 additions, 1 deletiongame/engines/default/engine/Projectile.lua
- game/engines/default/engine/Savefile.lua 1 addition, 1 deletiongame/engines/default/engine/Savefile.lua
Loading
Please register or sign in to comment