Commit graph

8396 commits

Author SHA1 Message Date
nukeykt
316ddb1fb5 Mouse quick fix
# Conflicts:
#	source/blood/src/controls.cpp
2019-09-21 10:43:26 +02:00
nukeykt
fbd3bdb665 Backport new FPS limiter
# Conflicts:
#	source/rr/src/game.cpp
2019-09-21 10:40:54 +02:00
nukeykt
f87f38b8f0 Always load widescreen def file 2019-09-21 10:40:19 +02:00
nukeykt
0a74187512 Add blood specific parameters to tilefromtexture 2019-09-21 10:40:18 +02:00
nukeykt
f6ce571075 Fix improper callback id in FlareBurst.
Thanks to NoOne for report
2019-09-21 10:38:47 +02:00
nukeykt
68c7b8c402 Compile fix
# Conflicts:
#	source/build/include/build.h
2019-09-21 10:38:26 +02:00
nukeykt
d3994b0801 Revise polymost HOM issue workaround in Duke's E1L1. Add code to remove very thin spans.
This commit does not gain noticeable rendering performance, but at least should prevent weird polygon leakages
2019-09-21 10:31:34 +02:00
nukeykt
e999e2058c Do not mess up random seed in seq/qav 2019-09-21 10:31:34 +02:00
nukeykt
935084ae52 More hacks to emulate old clipping
# Conflicts:
#	source/build/src/clip.cpp
2019-09-21 10:28:10 +02:00
nukeykt
af2106c9d0 Finally Duke's DEMO1 is sync 2019-09-21 10:27:59 +02:00
nukeykt
05749679a8 I think this is enough 2019-09-21 10:27:59 +02:00
nukeykt
1aab7601df Add old lintersect implementation 2019-09-21 10:27:58 +02:00
nukeykt
5c099bea05 Start adding old collision code for demo compatibility.
DEMO2 and DEMO3 of Duke3D are sync again

# Conflicts:
#	source/build/src/clip.cpp
2019-09-21 10:27:58 +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
6fea4bf527 Fix compilation on linux 2019-09-21 10:24:13 +02:00
nukeykt
e6ffc816c9 Fix blood crash
# Conflicts:
#	source/build/src/engine.cpp
2019-09-21 10:24:13 +02:00
nukeykt
6c08ae1966 Fix 16-bit audio mixing 2019-09-21 10:21:27 +02:00
nukeykt
2762044313 Fix interpolation bitmap OOB issue 2019-09-21 10:21:26 +02:00
nukeykt
065cf13945 Fix in CanMove 2019-09-21 10:20:54 +02:00
nukeykt
a90711f328 Add extra field to tilefromtexture
# Conflicts:
#	source/build/src/defs.cpp
2019-09-21 10:20:43 +02:00
nukeykt
ce43103ae9 Use engine's cstat defines
# Conflicts:
#	source/blood/src/mapedit.cpp
2019-09-21 10:18:24 +02:00
nukeykt
9c5cbd6308 Delete pqueue.cpp 2019-09-21 10:18:20 +02:00
nukeykt
1561ffae9e make PriorityQueue template class, and extend index field in EVENT struct 2019-09-21 10:17:04 +02:00
nukeykt
e4174d4f2d Extend xobject reference field size to fit 16384 sprites/walls 2019-09-21 10:16:53 +02:00
Grind Core
dd79c66f20 Changes in adjustSprites
# Conflicts:
#	source/blood/src/mapedit.cpp
#	source/build/src/2d.cpp
2019-09-21 10:15:58 +02:00
nukeykt
599f086fd9 Xobjects editor wip
# Conflicts:
#	source/blood/src/mapedit.cpp
2019-09-21 10:13:02 +02:00
nukeykt
14401ca694 Fix TROR NULL texture 2019-09-21 10:11:03 +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
1fe344d273 Free cstat bit 14
# Conflicts:
#	source/blood/src/mapedit.cpp
#	source/build/src/build.cpp
#	source/build/src/engine.cpp
#	source/duke3d/src/astub.cpp
2019-09-21 10:10:15 +02:00
nukeykt
858da4351c Semi-working map save 2019-09-21 10:08:04 +02:00
nukeykt
140174d1ee Minor tweaks
# Conflicts:
#	source/blood/src/m32common.cpp
#	source/blood/src/mapedit.cpp
2019-09-21 10:08:04 +02:00
nukeykt
db5c628b34 Fix silly error with yax stuff 2019-09-21 10:07:11 +02:00
nukeykt
2867131c86 Add ability to load blood maps
# Conflicts:
#	platform/Windows/nmapedit.vcxproj
#	platform/Windows/nmapedit.vcxproj.filters
#	source/blood/src/mapedit.cpp
#	source/build/src/build.cpp
#	source/build/src/engine.cpp
2019-09-21 10:06:57 +02:00
nukeykt
57e9ff2fbc Move stuff around
# Conflicts:
#	platform/Windows/nmapedit.vcxproj
#	platform/Windows/nmapedit.vcxproj.filters
#	source/blood/src/config.cpp
#	source/blood/src/config.h
#	source/blood/src/mapedit.cpp
#	source/blood/src/screen.cpp
#	source/blood/src/screen.h
2019-09-21 10:05:26 +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
4e0a563cfe Add macros.h 2019-09-21 10:03:34 +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
nukeykt
d7865bfab4 nothing 2019-09-21 09:57:27 +02:00
nukeykt
d2c9734e9c Hope this fixes mp lags 2019-09-21 09:54:01 +02:00
nukeykt
dcc950378e Update prediction code to account for RR 2019-09-21 09:54:01 +02:00
nukeykt
dbe93a1671 Fix accept option in game setup not returning to host game menu
patch from Striker
2019-09-21 09:54:00 +02:00
nukeykt
976fb2c9e9 Fix squished player self fragging
patch from Striker
2019-09-21 09:54:00 +02:00
nukeykt
ab0cc0d578 Oops 2019-09-21 09:54:00 +02:00
nukeykt
222f9cc282 Network prediction 2019-09-21 09:53:59 +02:00
nukeykt
20420dc702 Semiworking mp 2019-09-21 09:53:59 +02:00
nukeykt
3ce70b7c3a Non mp stuff fix 2019-09-21 09:53:58 +02:00
nukeykt
5e182e2962 oldmp wip
# Conflicts:
#	source/rr/src/game.cpp
#	source/rr/src/net.cpp
2019-09-21 09:53:58 +02:00