Christoph Oelckers
|
0d98e7f256
|
- put all Blood game code into a namespace.
|
2019-09-22 08:39:22 +02:00 |
|
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
|
edc6e2c0f7
|
Friendly fire and keep keys settings for multiplayer (#177)
# Conflicts:
# source/blood/src/levels.h
# source/blood/src/network.h
|
2019-09-21 11:47:54 +02:00 |
|
CommonLoon102
|
13a1861c8d
|
Show messages by priority (#175)
# Conflicts:
# source/blood/src/triggers.cpp
|
2019-09-21 11:46:54 +02:00 |
|
nukeykt
|
3458a88f8e
|
Backport framelimitter fix
# Conflicts:
# source/rr/src/demo.cpp
# source/rr/src/game.cpp
# source/rr/src/net.cpp
# source/rr/src/screens.cpp
|
2019-09-21 10:26:47 +02:00 |
|
Christoph Oelckers
|
0254bf82d3
|
- added NBlood source.
|
2019-09-20 00:42:45 +02:00 |
|