NBlood - r2091 - Built: Sun 26 Jan 14:58:01 EET 2020 --- commit cf7226187b603aa69e9868eb3fa6a618c0fd620d Merge: 4ef7801 eb5584f Author: Alexey Khokholov Date: Sun Jan 26 21:57:44 2020 +0900 Merge pull request #294 from nukeykt/mapedit Mapedit commit eb5584f89da2df327a3cb0dc9bc0ca46817bac85 Merge: 68a0279 4ef7801 Author: Alexey Khokholov Date: Sun Jan 26 21:57:03 2020 +0900 Merge branch 'master' into mapedit commit 68a0279c70cf4a612e92733c744391971143da66 Author: NoOneBlood Date: Sun Jan 26 14:19:01 2020 +0300 - Added ifdefs for NOONE_EXTENSIONS that provides modern features for mappers and changes that was required to minimize their amount in code. commit 4994fdd59334ebc28e1c17c6b0e20817add64383 Merge: dad5cba 385fb42 Author: NoOneBlood Date: Sun Jan 12 23:32:29 2020 +0300 Merge branch 'master' of https://github.com/nukeykt/NBlood into mapedit Resolved conflicts: source/blood/src/actor.cpp