CommonLoon102
|
55de5230ca
|
New HUD for CTF (#167)
# Conflicts:
# source/blood/src/blood.cpp
|
2019-09-21 11:40:59 +02:00 |
|
nukeykt
|
4527da61a2
|
Ignore dosbox specific command line options
|
2019-09-21 11:40:44 +02:00 |
|
nukeykt
|
5a93d301b6
|
minor changes
|
2019-09-21 11:40:44 +02:00 |
|
nukeykt
|
90b005a44a
|
Fix mouse centering in menu
|
2019-09-21 11:40:44 +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 |
|
Alexey Khokholov
|
2b443c2eac
|
Account for 16384 sprites for sprite owner value
|
2019-09-21 10:54:13 +02:00 |
|
nukeykt
|
8b0fb8dfe2
|
Fix invisible player on mirror
|
2019-09-21 10:53:27 +02:00 |
|
CommonLoon102
|
e8337c783e
|
Don't change item selection with mouse while scanning for new key bind (#159)
# Conflicts:
# .gitignore
|
2019-09-21 10:53:17 +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
|
78a3240c3e
|
Fix flat sky y offset
|
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 |
|
CommonLoon102
|
44bcd26fab
|
fix endgame credits listing (#140)
# Conflicts:
# .gitignore
|
2019-09-21 10:46:12 +02:00 |
|
nukeykt
|
38f2fd209f
|
Use fixed point number for XSPRITE scaling
|
2019-09-21 10:44:14 +02:00 |
|
nukeykt
|
0dcca3583f
|
Backport frame limiter (again)
# Conflicts:
# source/rr/src/game.cpp
|
2019-09-21 10:43:45 +02:00 |
|
nukeykt
|
99775a8fe0
|
Add surface type enum
|
2019-09-21 10:43:26 +02:00 |
|
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 |
|