CommonLoon102
|
160c93f0ab
|
Multiplayer suicide message was empty string (#170)
# Conflicts:
# .gitignore
|
2019-09-21 11:44:59 +02:00 |
|
CommonLoon102
|
55de5230ca
|
New HUD for CTF (#167)
# Conflicts:
# source/blood/src/blood.cpp
|
2019-09-21 11:40:59 +02:00 |
|
nukeykt
|
d6d8762400
|
Seamless ROR transition
|
2019-09-21 10:51:48 +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 |
|
nukeykt
|
38f2fd209f
|
Use fixed point number for XSPRITE scaling
|
2019-09-21 10:44:14 +02:00 |
|
nukeykt
|
381f5dcac2
|
Increase build objects count max size
# Conflicts:
# source/blood/src/mapedit.cpp
|
2019-09-21 10:04:03 +02:00 |
|
nukeykt
|
afff9ce61f
|
wip
# Conflicts:
# platform/Windows/nmapedit.vcxproj
# platform/Windows/nmapedit.vcxproj.filters
# source/blood/src/blood.cpp
# source/blood/src/blood.h
# source/blood/src/gui.cpp
# source/blood/src/m32def.cpp
# source/blood/src/m32def.h
# source/blood/src/m32exec.cpp
# source/blood/src/mapedit.cpp
|
2019-09-21 10:02:46 +02:00 |
|
Christoph Oelckers
|
0254bf82d3
|
- added NBlood source.
|
2019-09-20 00:42:45 +02:00 |
|