Grind Core
|
05a1c94df4
|
- Changes for Enemy Target Changer
- Debris physics update
# Conflicts:
# source/blood/src/actor.cpp
|
2019-10-07 00:09:32 +02:00 |
|
nukeykt
|
528e7f8320
|
More meaningful names for build object struct members
|
2019-09-30 20:31:11 +02:00 |
|
nukeykt
|
c00ff59579
|
Fix enemy respawning. Verified in disassembly
|
2019-09-30 20:30:57 +02:00 |
|
nukeykt
|
402d9b8f02
|
long -> int
|
2019-09-25 23:15:43 +02:00 |
|
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
|
13a1861c8d
|
Show messages by priority (#175)
# Conflicts:
# source/blood/src/triggers.cpp
|
2019-09-21 11:46:54 +02:00 |
|
CommonLoon102
|
9be59caef8
|
Colorful view messages (#173)
|
2019-09-21 11:45:13 +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
|
ce43103ae9
|
Use engine's cstat defines
# Conflicts:
# source/blood/src/mapedit.cpp
|
2019-09-21 10:18:24 +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 |
|
nukeykt
|
8fd6e0e183
|
TROR related tweaks
# Conflicts:
# source/blood/src/mirrors.cpp
|
2019-09-21 09:59:58 +02:00 |
|
Christoph Oelckers
|
0254bf82d3
|
- added NBlood source.
|
2019-09-20 00:42:45 +02:00 |
|