skull132 9d2dfbd9c0 Merge branch 'master' into development ...

# Conflicts:
#	maps/aurora/aurora-4_mainlevel.dmm

2018-05-29 22:49:41 +03:00

..

__defines

Adds Asthma (#4723)

2018-05-26 23:54:25 +03:00

_helpers

Devour Fixes Pt. 5 (#4782)

2018-05-22 01:20:57 +03:00

_onclick

Remove duplicate macros (#4683)

2018-05-06 18:31:03 +03:00

ATMOSPHERICS

Remove duplicate macros (#4683)

2018-05-06 18:31:03 +03:00

controllers

News Loader Changes (#4788)

2018-05-24 20:59:35 +03:00

datums

Merge branch 'master' into development

2018-05-13 19:19:52 +03:00

defines

Load static lore news from the DB at the start of the round (#4618)

2018-04-29 22:47:30 +03:00

game

Merge branch 'master' into development

2018-05-29 22:49:41 +03:00

js

…

modules

Merge branch 'master' into development

2018-05-29 22:49:41 +03:00

unit_tests

…

ZAS

…

global.dm

…

hub.dm

…

names.dm

…

stylesheet.dm

Adds the ability to partially understand other languages and a bit more (#4625)

2018-05-01 23:27:55 +03:00

world.dm

…