CommonLoon102
70b5e67e6f
fix cultist respawn time ( #220 )
...
# Conflicts:
# source/blood/src/actor.cpp
2019-10-16 20:40:34 +02:00
Grind Core
9dd46c1c7c
- Fixes for refactor (wrong kills count)
...
- Fixes for refactor (proximity flag for dudes)
- Fixes for refactor (wrong kills count)
# Conflicts:
# source/blood/src/actor.cpp
2019-10-14 22:42:43 +02:00
Grind Core
16d4aebbb4
- Fixes for refactor
...
- Some ThrowError() calls was replaced my viewSetSystemMessage()
- New modern type playQAV (WIP)
# Conflicts:
# source/blood/src/actor.cpp
# source/blood/src/weapon.h
2019-10-14 22:42:43 +02:00
Grind Core
08dfee073c
- Added names for callbacks
...
- Added names for sprite, wall and sector types
- Added gModernMap protection for using new features only on different version of map
# Conflicts:
# source/blood/src/actor.cpp
# source/blood/src/callback.cpp
# source/blood/src/callback.h
# source/blood/src/triggers.h
2019-10-14 22:42:42 +02:00
Grind Core
f5f012ccb9
- Added names for statnums
...
- Added names for system RX/TX channels
- Detect if map requires new features to work properly via special TX and command
- Effect Gen update
# Conflicts:
# source/blood/src/actor.cpp
# source/blood/src/eventq.h
# source/blood/src/triggers.cpp
# source/blood/src/triggers.h
2019-10-08 22:27:45 +02:00
CommonLoon102
3b463bc38e
fix disappearing bodies in coop with respawning monsters ( #211 )
2019-10-07 17:41:16 +02:00
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
402d9b8f02
long -> int
2019-09-25 23:15:43 +02:00
CommonLoon102
67472623fe
Friendly fire related fixes ( #184 )
2019-09-23 01:29: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
Alexey Khokholov
ac8d31e39f
Oof, really silly typo
2019-09-21 13:17:01 +02:00
CommonLoon102
93fde9ba43
Fix coop frag count ( #183 )
2019-09-21 13:17:01 +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
nukeykt
c91a85a353
Use C++ heap for resource manager
...
# Conflicts:
# source/blood/src/actor.cpp
# source/blood/src/mapedit.cpp
2019-09-21 11:41:25 +02:00
Alexey Khokholov
2b443c2eac
Account for 16384 sprites for sprite owner value
2019-09-21 10:54:13 +02:00
nukeykt
d6d8762400
Seamless ROR transition
2019-09-21 10:51:48 +02:00
nukeykt
ddf02bda17
Fix GetZRange regression
2019-09-21 10:51:47 +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
CommonLoon102
9715b2281a
extra can be -1 then pointer will point to random ( #145 )
2019-09-21 10:46:24 +02:00
nukeykt
99775a8fe0
Add surface type enum
2019-09-21 10:43:26 +02:00
nukeykt
ce43103ae9
Use engine's cstat defines
...
# Conflicts:
# source/blood/src/mapedit.cpp
2019-09-21 10:18:24 +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
nukeykt
8fd6e0e183
TROR related tweaks
...
# Conflicts:
# source/blood/src/mirrors.cpp
2019-09-21 09:59:58 +02:00
nukeykt
388bf2665f
Enable TROR code and rotated wall cstat bit for blood
2019-09-21 09:59:16 +02:00
Christoph Oelckers
0254bf82d3
- added NBlood source.
2019-09-20 00:42:45 +02:00