Christoph Oelckers
|
5855886a5f
|
- removed extern "C" from rr and blood folders.
|
2019-09-21 19:57:41 +02:00 |
|
Christoph Oelckers
|
71b332459b
|
- removed Android and Mapster headers plus raw EDuke assets in Blood folder.
|
2019-09-21 19:30:20 +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 |
|
nukeykt
|
5a93d301b6
|
minor changes
|
2019-09-21 11:40:44 +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
|
0dcca3583f
|
Backport frame limiter (again)
# Conflicts:
# source/rr/src/game.cpp
|
2019-09-21 10:43:45 +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
|
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
|
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
|
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 |
|
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 |
|
Christoph Oelckers
|
625586b729
|
- delete unneeded content from rsrc folders.
None of these will be used in any way so they may just go.
|
2019-09-20 22:16:34 +02:00 |
|
Christoph Oelckers
|
94cfcb4fbd
|
- Redneck Rampage fixes for changes in timer and mouse input interface.
|
2019-09-20 22:07:53 +02:00 |
|
Christoph Oelckers
|
20f5972b9b
|
- fixed everything to compile again.
|
2019-09-20 19:37:29 +02:00 |
|
Christoph Oelckers
|
ceceb63b5e
|
- adjustments for frame rate limiting copied from Duke3D project.
|
2019-09-20 13:54:27 +02:00 |
|
Christoph Oelckers
|
33b122d88a
|
- renamed remaining vec2s_t's.
|
2019-09-20 11:47:21 +02:00 |
|
Christoph Oelckers
|
0254bf82d3
|
- added NBlood source.
|
2019-09-20 00:42:45 +02:00 |
|
Christoph Oelckers
|
23bc385393
|
- everything works again, some changes were apparently lost in the last merge.
|
2019-09-19 23:39:35 +02:00 |
|
Christoph Oelckers
|
8074d8251e
|
- can be compiled again but crashes.
|
2019-09-19 23:02:57 +02:00 |
|
Christoph Oelckers
|
c2e4a6cb64
|
- sound system additions from NBlood, except for the backing code for OPL playback.
|
2019-09-19 20:22:09 +02:00 |
|
Christoph Oelckers
|
ea631cb6ac
|
- fixed some warnings
|
2019-09-19 14:18:44 +02:00 |
|
Christoph Oelckers
|
e1e8b835db
|
- make it compile again.
|
2019-09-19 11:43:11 +02:00 |
|
Christoph Oelckers
|
0168b9ddf2
|
- fix RedNukem input.
|
2019-09-19 01:10:07 +02:00 |
|
Christoph Oelckers
|
588fbc26f9
|
- added RedNukem project.
|
2019-09-19 00:27:46 +02:00 |
|