src · 0cd5509dd1be7caff32e2b16d0677abea00c3238 · K'van / Tales of MajEyal

6660 commits behind the upstream repository.

DarkGod authored 10 years ago

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

f12dedc7 10 years ago

History

Name	Last commit	Last update
..
bzip2
expat
fov
libtcod_import
lpeg
lua
luabitop
luajit2
luamd5
luaprofiler
luasocket
lxp
lzlib
mac
physfs
runner
web-awesomium
web-cef3
windows
zlib
SFMT-params.h
SFMT-params19937.h
SFMT.c
SFMT.h
auxiliar.c
auxiliar.h
bspatch.c
bspatch.h
core_display.luadoc
core_game.luadoc
core_key.luadoc
core_lua.c
core_lua.h
core_mouse.luadoc
core_rng.luadoc
display.h
display_sdl.c
display_sdl.h
dmnd_square.c
fov.c
fov.h
getself.c
getself.h
glew.c
glew.h
glxew.h
lua_externs.h
main.c
main.h
map.c
map.h
music.c
music.h
noise.c
particles.c
particles.h
particles_gas.c
particles_gas.h
physfs.c
profile.c
profile.h
script.h
sdnoise1234.c
sdnoise1234.h
serial.c
serial.h
shaders.c
shaders.h
struct.c
tSDL.h
te4web.h
tgl.h
types.h
useshader.h
wait.c
web-external.h
web.c
wglew.h