54 commits

Author	SHA1	Message	Date
Christoph Oelckers	998ac01157	- manual merge of all NBlood changes that couldn't get cherry picked.	2019-09-21 13:02:17 +02:00
nukeykt	7a9209d857	Fix compile error ... # Conflicts: # source/blood/src/ai.cpp # source/blood/src/aiunicult.cpp # source/blood/src/blood.cpp # source/blood/src/choke.cpp # source/blood/src/credits.cpp # source/blood/src/gamemenu.cpp # source/blood/src/gamemenu.h # source/blood/src/gui.cpp # source/blood/src/mapedit.cpp # source/blood/src/replace.cpp	2019-09-21 10:51:29 +02:00
Christoph Oelckers	afe5128c70	- Blood fixes for changes in timer and mouse input interface-	2019-09-20 22:08:06 +02:00
Christoph Oelckers	0254bf82d3	- added NBlood source.	2019-09-20 00:42:45 +02:00