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
nukeykt
c3fc897a3e
oldmp wip
...
# Conflicts:
# source/rr/src/net.cpp
2019-09-21 09:53:37 +02:00
nukeykt
fe80b46d54
OldMP wip
2019-09-21 09:53:19 +02:00
nukeykt
fb59a49342
Fix mirrors in polymost
2019-09-21 09:50:34 +02:00
nukeykt
6eaff57831
Accuracy fixes
2019-09-21 09:49:28 +02:00
nukeykt
36e932a6cb
Fix BOSS2 RPG attack
2019-09-21 09:49:28 +02:00
nukeykt
6b7245ec97
Revert tripbomb logic
2019-09-21 09:49:27 +02:00
nukeykt
1fb877445c
Fix player speed reduction logic
2019-09-21 09:49:27 +02:00
nukeykt
fdcf92e28b
Hack to parse checkbossXseekstate like Todd's code did
2019-09-21 09:46:26 +02:00
nukeykt
24c2b2473d
Off, thanks Todd for implicit if else conditions
2019-09-21 09:45:55 +02:00
nukeykt
7a877d8782
Remove EDuke32 VM leftovers
2019-09-21 09:45:15 +02:00
nukeykt
7b02bcbb3f
DUKE -> !RR
2019-09-21 09:44:41 +02:00
nukeykt
eafeb27996
Add NAM/NAPALM support
...
Big thanks to NY00123 for his NAM.EXE reconstruction work
2019-09-21 09:38:57 +02:00
nukeykt
75d2e81e98
Move midi stuff to audiolib
...
# Conflicts:
# platform/Windows/eduke32.vcxproj
# platform/Windows/nblood.vcxproj.filters
# source/audiolib/include/al_midi.h
# source/audiolib/include/opl3.h
# source/audiolib/include/oplmidi.h
# source/audiolib/src/_al_midi.h
# source/audiolib/src/_oplmidi.h
# source/audiolib/src/al_midi.cpp
# source/audiolib/src/opl3.cpp
# source/audiolib/src/oplmidi.cpp
# source/duke3d/Dependencies.mak
# source/duke3d/src/sdlmusic.cpp
2019-09-21 09:37:07 +02:00
nukeykt
9b63ab5279
GNU makefile
...
# Conflicts:
# GNUmakefile
2019-09-21 09:34:24 +02:00
Christoph Oelckers
6942d4c50b
- added missing #define
2019-09-21 09:33:39 +02:00
nukeykt
bdd7bb72d8
NRedneck compiles with MSVC now
...
# Conflicts:
# platform/Windows/eduke32.sln
# source/build/src/tilepacker.cpp
# source/rr/src/common.cpp
# source/rr/src/duke3d.h
# source/rr/src/game.cpp
# source/rr/src/menus.cpp
# source/rr/src/osdcmds.cpp
# source/rr/src/screens.cpp
2019-09-21 09:25:29 +02:00
Christoph Oelckers
26c0490763
- this define is not needed.
2019-09-20 23:52:38 +02:00
terminx
6317706b03
Derp
...
git-svn-id: https://svn.eduke32.com/eduke32@8133 1a8010ca-5511-0410-912e-c29ae57300e0
2019-09-20 23:29:40 +02:00
terminx
8de955053c
Update libxmp-lite
...
git-svn-id: https://svn.eduke32.com/eduke32@8132 1a8010ca-5511-0410-912e-c29ae57300e0
2019-09-20 23:29:40 +02:00
terminx
225be48aca
Fix issue where the borderless windowed mode menu option wasn't starting out reflecting the current value
...
git-svn-id: https://svn.eduke32.com/eduke32@8130 1a8010ca-5511-0410-912e-c29ae57300e0
2019-09-20 23:27:47 +02:00
terminx
4ad6dd65b1
EDUKE32_STANDALONE does, however, need this
...
git-svn-id: https://svn.eduke32.com/eduke32@8129 1a8010ca-5511-0410-912e-c29ae57300e0
2019-09-20 23:27:32 +02:00
terminx
d3448c0ccc
EDUKE32_STANDALONE doesn't need this
...
git-svn-id: https://svn.eduke32.com/eduke32@8128 1a8010ca-5511-0410-912e-c29ae57300e0
2019-09-20 23:27:32 +02:00
terminx
701c67eb9e
"digital axis shit based on mouse movement should be eliminated"
...
git-svn-id: https://svn.eduke32.com/eduke32@8127 1a8010ca-5511-0410-912e-c29ae57300e0
# Conflicts:
# source/duke3d/src/menus.cpp
2019-09-20 23:27:31 +02:00
terminx
97fd50e1ec
Hook CONTROL_MouseAxesScale[] up to mousex/mousey in ControlInfo
...
git-svn-id: https://svn.eduke32.com/eduke32@8126 1a8010ca-5511-0410-912e-c29ae57300e0
2019-09-20 23:26:30 +02:00
terminx
b99ac8c4a0
This should help with some of the player movement fuckery
...
This fixes the bug that let you jump through the ticket booth window in E1L1 and the problems jumping into vents when run mode is disabled.
git-svn-id: https://svn.eduke32.com/eduke32@8119 1a8010ca-5511-0410-912e-c29ae57300e0
2019-09-20 23:25:40 +02:00