Kelenius d8d94b9d64 Merge branch 'dev' into ofSleepersAndNano ...

Conflicts:
	code/game/machinery/Sleeper.dm
	maps/exodus-1.dmm

2015-08-13 09:20:51 +03:00

..

interaction

Merge branch 'dev' into ofSleepersAndNano

2015-08-13 09:20:51 +03:00

modules

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

2015-08-12 21:18:18 +02:00

_JSON.dm

better nanoui caching + fixes

2015-05-14 22:35:50 +01:00

JSON Reader.dm

…

JSON Writer.dm

better nanoui caching + fixes

2015-05-14 22:35:50 +01:00

nanoexternal.dm

NanoUI sources can now be datums instead of atom/movable.

2015-06-08 17:06:06 +02:00

nanomanager.dm

NanoUI windows now close on Destroy(), preventing all sorts of qdel issues.

2015-08-12 09:41:22 +02:00

nanomapgen.dm

…

nanoui.dm

NanoUI sources can now be datums instead of atom/movable.

2015-06-08 17:06:06 +02:00