Commit Graph

8 Commits

Author SHA1 Message Date
Christoph Oelckers 30c47a8511 - include namespace file in all sources as the very first include. 2019-09-21 20:59:54 +02:00
Christoph Oelckers 998ac01157 - manual merge of all NBlood changes that couldn't get cherry picked. 2019-09-21 13:02:17 +02:00
CommonLoon102 c0b3e6f99f Don't allow the mouse to steal the focus when typing a save game name (#178) 2019-09-21 11:47:54 +02:00
nukeykt 90b005a44a Fix mouse centering in menu 2019-09-21 11:40:44 +02:00
CommonLoon102 e8337c783e Don't change item selection with mouse while scanning for new key bind (#159)
# Conflicts:
#	.gitignore
2019-09-21 10:53: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