skull132 05c0d13013 Merge branch 'master' into development ...

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

2018-06-03 14:15:41 +03:00

..

__defines

Priority Tweaks (#4814)

2018-06-01 23:43:39 +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

Priority Tweaks (#4814)

2018-06-01 23:43:39 +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-06-03 14:15:41 +03:00

js

…

modules

Merge branch 'master' into development

2018-06-03 14:15:41 +03:00

unit_tests

Up-hint and UI cleanup (#3773)

2018-01-27 12:11:22 -06:00

ZAS

Merge pull request #4306 from Lohikar/movable_sanity

2018-03-10 20:36:03 +02:00

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

Merge branch 'master' into development

2018-03-05 17:56:28 -06:00