Christoph Oelckers
d83b3f34a3
- restored original whitespacing in blood/actor.cpp.
...
This ensures that future cherry picks won't conflict as badly.
2019-10-20 16:50:47 +02:00
Grind Core
70e0ed9ec4
- Refactor: added names for powerups and updated some old.
...
- AI: there is printing error message in conosole added (instead of dassert)
- Updates for Player Control modern type
# Conflicts:
# source/blood/src/actor.cpp
# source/blood/src/actor.h
# source/blood/src/globals.cpp
# source/blood/src/globals.h
# source/blood/src/player.h
# source/blood/src/sound.cpp
# source/blood/src/triggers.cpp
# source/blood/src/triggers.h
# source/blood/src/view.cpp
# source/blood/src/weapon.cpp
# source/blood/src/weapon.h
2019-10-20 12:30:16 +02:00
terminx
a278a85b3b
Add const to dest parameter of MV_Reverb()
...
git-svn-id: https://svn.eduke32.com/eduke32@8184 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-20 11:53:25 +02:00
terminx
9756db95ca
Use templates for audiolib mixing functions
...
Patch from NY00123.
git-svn-id: https://svn.eduke32.com/eduke32@8183 1a8010ca-5511-0410-912e-c29ae57300e0
# Conflicts:
# source/audiolib/src/mix.cpp
# source/audiolib/src/mixst.cpp
2019-10-20 11:51:57 +02:00
Christoph Oelckers
75205ca69c
- do not throw exceptions to exit without proper handling.
2019-10-20 11:28:16 +02:00
Christoph Oelckers
c3d742dda0
- really delete the textures.
2019-10-20 10:52:56 +02:00
Christoph Oelckers
489170b12c
- fixed compilation again.
2019-10-20 10:52:38 +02:00
terminx
63d6e70e21
Apparently, a long while back when I limited snd_numvoices to 128 I forgot to change the menu to reflect it
...
git-svn-id: https://svn.eduke32.com/eduke32@8234 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-20 10:45:51 +02:00
Christoph Oelckers
76bceb81cd
- removed time consuming load indicator from Duke3D frontend as well.
2019-10-20 10:45:50 +02:00
terminx
c68c50ddca
Add snd_tryformats cvar to disable automatic loading of .ogg and .flac versions of sound and music
...
git-svn-id: https://svn.eduke32.com/eduke32@8212 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-20 10:45:50 +02:00
terminx
873440f06c
Fix tiny header issue
...
git-svn-id: https://svn.eduke32.com/eduke32@8208 1a8010ca-5511-0410-912e-c29ae57300e0
# Conflicts:
# source/duke3d/src/osdcmds.cpp
# source/duke3d/src/osdcmds.h
2019-10-20 10:45:50 +02:00
terminx
b8f4651ab4
Don't try videoSetGameMode() if there aren't any valid modes
...
git-svn-id: https://svn.eduke32.com/eduke32@8207 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-20 10:45:50 +02:00
Christoph Oelckers
215a7cdff3
- removed unused animlock variable.
2019-10-20 10:45:49 +02:00
terminx
ca789dc4d0
Wait to run G_MoveLoop() until a frame has just been rendered
...
This should give G_MoveLoop() a better chance to not run past the time when another frame is to be drawn.
git-svn-id: https://svn.eduke32.com/eduke32@8195 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-20 10:45:49 +02:00
terminx
9fadf6032d
Silence a warning
...
git-svn-id: https://svn.eduke32.com/eduke32@8194 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-20 10:45:49 +02:00
terminx
ba02bbaf67
Add #pragma once to debugbreak.h and remove it from separate inclusion in a couple of translation units as we're including it directly in compat.h now
...
git-svn-id: https://svn.eduke32.com/eduke32@8192 1a8010ca-5511-0410-912e-c29ae57300e0
# Conflicts:
# source/build/src/sdlayer.cpp
# source/duke3d/src/gamedef.cpp
2019-10-20 10:45:48 +02:00
terminx
d7f779eaec
Use EXIT_FAILURE and EXIT_SUCCESS from stdlib.h when calling exit()
...
git-svn-id: https://svn.eduke32.com/eduke32@8190 1a8010ca-5511-0410-912e-c29ae57300e0
# Conflicts:
# source/build/src/build.cpp
# source/build/src/polymost.cpp
# source/build/src/tiles.cpp
# source/duke3d/src/astub.cpp
2019-10-20 10:45:48 +02:00
terminx
a15c2abf46
Update LZ4 to e8baeca51ef2003d6c9ec21c32f1563fef1065b9
...
git-svn-id: https://svn.eduke32.com/eduke32@8186 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-20 10:45:48 +02:00
terminx
8d74b9562f
Update xxHash to 1ea98d6a38300f7224869de856a876a2050cdf78
...
git-svn-id: https://svn.eduke32.com/eduke32@8185 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-20 10:45:48 +02:00
Christoph Oelckers
462bd8d292
- cleaned out some commented out code.
2019-10-20 10:44:51 +02:00
Christoph Oelckers
2316957026
- made things compile again after updating enet. Also removed the redundant dumb and game_music_emu libraries which just got imported by accident when using other things from GZDoom.
...
Note: enet uses 'malloc' and 'free' as field names in a struct - this does not work with any compiler using some sort of heap instrumentation that #defines these names!
This had to be changed to allow MSVC debug builds to compile again.
2019-10-20 09:16:01 +02:00
terminx
63713002b3
Swap out our old deprecated version of ENet for a single-file header-based fork, including features like IPv6 support
...
git-svn-id: https://svn.eduke32.com/eduke32@8175 1a8010ca-5511-0410-912e-c29ae57300e0
# Conflicts:
# GNUmakefile
# libraries/enet/LICENSE
# libraries/enet/callbacks.c
# libraries/enet/compress.c
# libraries/enet/enet/callbacks.h
# libraries/enet/enet/enet.h
# libraries/enet/enet/list.h
# libraries/enet/enet/protocol.h
# libraries/enet/enet/time.h
# libraries/enet/enet/types.h
# libraries/enet/enet/unix.h
# libraries/enet/enet/utility.h
# libraries/enet/enet/win32.h
# libraries/enet/host.c
# libraries/enet/list.c
# libraries/enet/packet.c
# libraries/enet/peer.c
# libraries/enet/protocol.c
# libraries/enet/unix.c
# libraries/enet/win32.c
# platform/Windows/build.vcxproj
# platform/Windows/build.vcxproj.filters
# platform/Windows/eduke32.sln
# platform/Windows/eduke32.vcxproj
# source/duke3d/src/player.cpp
2019-10-20 08:43:36 +02:00
terminx
1667d4dd87
This is useless
...
git-svn-id: https://svn.eduke32.com/eduke32@8170 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-20 08:31:49 +02:00
terminx
8b43ed5777
Rename timerUpdate() and timerGetRate() to timerUpdateClock() and timerGetClockRate(), because they both only apply to totalclock
...
git-svn-id: https://svn.eduke32.com/eduke32@8169 1a8010ca-5511-0410-912e-c29ae57300e0
# Conflicts:
# source/build/src/timer.cpp
# source/build/src/winlayer.cpp
2019-10-20 08:31:26 +02:00
terminx
91fde580ce
Use nanosleep instead of usleep
...
git-svn-id: https://svn.eduke32.com/eduke32@8168 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-20 08:29:25 +02:00
terminx
ad6d94b0f5
Patch from Doom64hunter to address a couple of issues with per-map art
...
git-svn-id: https://svn.eduke32.com/eduke32@8167 1a8010ca-5511-0410-912e-c29ae57300e0
# Conflicts:
# source/build/src/tiles.cpp
2019-10-20 08:28:44 +02:00
terminx
8e088f6659
Equivalent to jfbuild commit b6a666745cea21c6f8193b046bcdd0636fb7c166
...
git-svn-id: https://svn.eduke32.com/eduke32@8158 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-20 08:17:35 +02:00
terminx
0270cc2df5
SDL_free() is not for pointers to SDL_RWops structures...
...
git-svn-id: https://svn.eduke32.com/eduke32@8151 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-20 08:16:02 +02:00
terminx
c86af959b9
Add optional duration parameter to idle()
...
git-svn-id: https://svn.eduke32.com/eduke32@8149 1a8010ca-5511-0410-912e-c29ae57300e0
# Conflicts:
# source/build/include/winlayer.h
2019-10-20 08:13:22 +02:00
terminx
a649130327
Clamp nextPageDelay in G_FPSLimit() to 0.0 - g_frameDelay
...
git-svn-id: https://svn.eduke32.com/eduke32@8148 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-20 08:12:26 +02:00
Christoph Oelckers
53248945e8
- added license headers.
2019-10-20 08:07:12 +02:00
Christoph Oelckers
e5ddb28a2b
- renamed texcache.cpp and moved it to its proper place.
...
The old content no longer exists, this is entirely backend code now.
2019-10-20 08:04:54 +02:00
Christoph Oelckers
f29dd6c495
- include cleanup
2019-10-20 08:02:45 +02:00
Christoph Oelckers
efcf447398
- moved newly added file to its proper place.
2019-10-20 07:51:35 +02:00
terminx
4dfae31900
Update xxHash to git commit cd0f5c22095c49c35104dca86620322801f14893
...
git-svn-id: https://svn.eduke32.com/eduke32@8142 1a8010ca-5511-0410-912e-c29ae57300e0
# Conflicts:
# platform/Windows/build.vcxproj
# platform/Windows/build.vcxproj.filters
2019-10-20 07:50:30 +02:00
terminx
70171ea341
Use timerGetHiTicks() instead of timerGetTicks() for timing in osdfunc_fileinfo()
...
git-svn-id: https://svn.eduke32.com/eduke32@8141 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-20 07:48:16 +02:00
terminx
85dd8e31a5
G_HandleAsync() -> gameHandleEvents()
...
git-svn-id: https://svn.eduke32.com/eduke32@8140 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-20 07:48:15 +02:00
terminx
802f69d324
Partial timer cleanup
...
After this revision, the only place timerUpdate() is called is from within handleevents(). S_Cleanup(), MUSIC_Update(), and G_HandleSpecialKeys() are now called from a timer callback set with timerSetCallback(). This more or less deprecates the usage of faketimerhandler() in EDuke32 and Mapster32, but other games still rely on the functionality.
git-svn-id: https://svn.eduke32.com/eduke32@8139 1a8010ca-5511-0410-912e-c29ae57300e0
# Conflicts:
# source/duke3d/src/astub.cpp
2019-10-20 07:48:13 +02:00
terminx
593b5740e3
Reword stupid error message that has probably never even been seen
...
git-svn-id: https://svn.eduke32.com/eduke32@8138 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-20 07:48:05 +02:00
terminx
4d3dedd4ab
ifdef DEBUGGINGAIDS for this quick exit crap
...
this is more like regular AIDS than DEBUGGINGAIDS though
git-svn-id: https://svn.eduke32.com/eduke32@8137 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-20 07:48:04 +02:00
terminx
4c4ffa80b4
Use tabledivide64() in timerUpdate()
...
git-svn-id: https://svn.eduke32.com/eduke32@8136 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-20 07:48:02 +02:00
terminx
b298ed19ff
Ugh, apparently we rely on this for FURY
...
git-svn-id: https://svn.eduke32.com/eduke32@8135 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-20 07:48:01 +02:00
Christoph Oelckers
85d377647a
- tweaked the fade ramp a bit.
...
For Duke Nukem and its direct offspring (Nam, WW2GI and Redneck Rampage) the ramp is not a linear fade from 0 to 1, it needs to be a little darker than that.
Unfortunately the proper factor needed here must be set manually, this cannot really be calculated from the lookup tables.
2019-10-20 01:14:48 +02:00
Christoph Oelckers
9437387b4a
- fixed handling of FogDisabled flag
2019-10-20 00:45:47 +02:00
Christoph Oelckers
abaa1d19ee
- fixed some bad setup in SetTextureInternal.
2019-10-20 00:31:27 +02:00
Christoph Oelckers
2162ce1f26
- disabled the Redneck Rampage load progress indicator because it only prolongs the precaching time by waiting for the screen to be refreshed.
2019-10-19 23:19:45 +02:00
Christoph Oelckers
bb4a19cf3a
- added a few more texture formats to FHardwareTexture.
...
For brightmaps we do not need full RGBA8 data with mipmaps - RGBA2 without mipmaps is fully sufficient here and will save a lot of video memory.
2019-10-19 23:14:36 +02:00
Christoph Oelckers
7d2f61db2e
- converted all boolean parameters of the shader into a single flag word.
...
- discarded the idea of transient palettes because the maintenance here stood in no relation to the savingd.
2019-10-19 22:46:37 +02:00
Christoph Oelckers
17816b0f63
- fixed compilation for NBlood update.
2019-10-19 20:48:59 +02:00
nukeykt
098740155b
Use screentext in DrawStatNumber
2019-10-19 20:33:52 +02:00