GinjaNinja32 f52d48c91f Merge remote-tracking branch 'upstream/dev' into follow ...

Conflicts:
	.travis.yml

2015-08-13 05:54:30 +01:00

..

dead

Merge remote-tracking branch 'upstream/dev' into follow

2015-08-13 05:54:30 +01:00

freelook

Misc.

2015-08-11 17:33:03 +02:00

language

Merge pull request #10030 from GinjaNinja32/languages

2015-08-13 07:23:44 +03:00

living

Merge remote-tracking branch 'upstream/dev' into follow

2015-08-13 05:54:30 +01:00

new_player

Merge pull request #10030 from GinjaNinja32/languages

2015-08-13 07:23:44 +03:00

animations.dm

Refactors floating and magboot checks. Fixes #10256

2015-08-03 23:19:04 +10:00

death.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-27 10:20:20 +02:00

emote.dm

…

hear_say.dm

…

holder.dm

…

inventory.dm

…

login.dm

…

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-27 10:20:20 +02:00

mob_grab.dm

…

mob_helpers.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-30 10:49:37 +02:00

mob_movement.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-08-06 08:12:38 +02:00

mob_transformation_simple.dm

…

mob.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-08-11 18:47:05 +01:00

say.dm

…

transform_procs.dm

…

typing_indicator.dm

…

update_icons.dm

…