nukeykt
|
528e7f8320
|
More meaningful names for build object struct members
|
2019-09-30 20:31:11 +02:00 |
|
nukeykt
|
61b4fae6e0
|
Simplify voxel rotation handling
# Conflicts:
# source/build/include/mdsprite.h
|
2019-09-30 20:31:09 +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 |
|
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
|
56365d65ce
|
Don't show team flags and scores when no HUD is displayed (#176)
# Conflicts:
# .gitignore
|
2019-09-21 11:47:40 +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 |
|
CommonLoon102
|
16e1b39fb3
|
CTF HUD fixes (#172)
|
2019-09-21 11:45:12 +02:00 |
|
CommonLoon102
|
55de5230ca
|
New HUD for CTF (#167)
# Conflicts:
# source/blood/src/blood.cpp
|
2019-09-21 11:40:59 +02:00 |
|
CommonLoon102
|
3fbb171990
|
Powerup counter color (#166)
|
2019-09-21 11:40:43 +02:00 |
|
CommonLoon102
|
4423164ca5
|
More smooth fadeout for the map title. (#165)
|
2019-09-21 11:40:43 +02:00 |
|
nukeykt
|
996dfde6d0
|
Fix compile errors, backport input code for RR
# Conflicts:
# platform/Windows/voidsw.vcxproj
# source/blood/src/controls.cpp
# source/blood/src/m32common.cpp
# source/rr/src/actors.cpp
# source/rr/src/anim.cpp
# source/rr/src/demo.cpp
# source/rr/src/game.cpp
# source/rr/src/gameexec.cpp
# source/rr/src/global.h
# source/rr/src/menus.cpp
# source/rr/src/menus.h
# source/rr/src/net.cpp
# source/rr/src/player.cpp
# source/rr/src/premap.cpp
# source/rr/src/savegame.cpp
# source/rr/src/sbar.cpp
# source/rr/src/screens.cpp
# source/rr/src/sector.cpp
|
2019-09-21 11:39:19 +02:00 |
|
nukeykt
|
f6cd86d77e
|
Simplify map title rendering code and enable alpha for classic renderer
|
2019-09-21 10:54:54 +02:00 |
|
nukeykt
|
8b0fb8dfe2
|
Fix invisible player on mirror
|
2019-09-21 10:53:27 +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
|
0dcca3583f
|
Backport frame limiter (again)
# Conflicts:
# source/rr/src/game.cpp
|
2019-09-21 10:43:45 +02:00 |
|
nukeykt
|
fbd3bdb665
|
Backport new FPS limiter
# Conflicts:
# source/rr/src/game.cpp
|
2019-09-21 10:40: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 |
|
nukeykt
|
2762044313
|
Fix interpolation bitmap OOB issue
|
2019-09-21 10:21:26 +02:00 |
|
nukeykt
|
2f49b549df
|
Oops
|
2019-09-21 10:11:02 +02:00 |
|
nukeykt
|
107a630883
|
Add TROR rendering
# Conflicts:
# source/blood/src/mapedit.cpp
# source/build/include/editor.h
# source/build/include/polymer.h
# source/build/src/build.cpp
# source/build/src/polymer.cpp
|
2019-09-21 10:11:02 +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
|
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 |
|