zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 11:40:44 +00:00
Code Issues Projects Releases Packages Wiki Activity
9760 commits 2 branches 1 tag 128 MiB
Commit graph

1606 commits

Author SHA1 Message Date
hendricks266
8e6a54a1e4 Mostly clean up the codebase in preparation for tspritetype != uspritetype 
Remaining exceptions:
SW - ConnectCopySprite
CON and M32Script - pSprite/pUSprite

git-svn-id: https://svn.eduke32.com/eduke32@8519 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/build/include/polymer.h
#	source/build/src/engine.cpp
#	source/build/src/engine_priv.h
#	source/build/src/polymer.cpp
#	source/build/src/polymost.cpp
#	source/duke3d/src/astub.cpp
#	source/duke3d/src/game.h
#	source/duke3d/src/m32common.cpp
#	source/duke3d/src/m32exec.cpp
#	source/duke3d/src/m32structures.cpp
#	source/kenbuild/src/bstub.cpp
#	source/kenbuild/src/game.cpp
#	source/sw/src/jnstub.cpp
#	source/sw/src/jsector.cpp
 2019-12-26 08:58:25 +01:00
hendricks266
33ad4b9860 Fix -Wfallthrough error in gamevars.h 
git-svn-id: https://svn.eduke32.com/eduke32@8495 1a8010ca-5511-0410-912e-c29ae57300e0
 2019-12-26 08:26:09 +01:00
Christoph Oelckers
dd984c94b0 - fixed extended quote management. 2019-12-25 17:13:36 +01:00
Christoph Oelckers
414201e741 - fixed palette translucency after aborting movie playback. 2019-12-25 17:13:10 +01:00
Christoph Oelckers
120a985b98 - disable palette transparency for color 255 when running an animation. 
There's several intro cutscenes using the full palette and for these the color must not be nulled as it should for in-game textures.
 2019-12-25 14:13:15 +01:00
Christoph Oelckers
b0cefdedce - plugged all memory leaks that were reported with Shadow Warrior when starting the first level. 2019-12-25 11:26:19 +01:00
Christoph Oelckers
5e821de481 - replaced the leaky hash table that was used to handle the animations. 
Just replaced with a linear array - for a hash table indexed with a string to be efficient, a much larger amount of data is needed than 20 or 30 entries.
This is also hardly the kind of data where losing a microsecond for performing the search matters.
 2019-12-25 09:51:44 +01:00
Christoph Oelckers
055b310d60 - rewrote all remaining places that used wm_msgbox to throw a fatal error instead so that the global error handler can deal with the messages. 
This eliminates another piece of hideous code.
This commit also moves the memory error handler to the common code, so that all games can call it if triggered.
 2019-12-24 19:59:14 +01:00
Christoph Oelckers
2820dc85a8 - plugged more memory leaks. 
I can now start the first Duke Nukem level, exit with Alt-F4 and no leaked memory blocks get reported.
 2019-12-24 18:53:29 +01:00
Christoph Oelckers
0d908960ed - started fixing memory leaks: Console and clip shapes done. 2019-12-24 16:09:43 +01:00
Christoph Oelckers
1b9a2f5932 - disabled the message entering code. 
This needs to be replaced with the game independent ZDoom version and hooked up properly, but it of low priority because it's a multiplayer only feature.
 2019-12-24 13:21:36 +01:00
Christoph Oelckers
a870df840e - hooked up the input system and did a major cleanup. 
Much of the old system is no longer needed with all buttons being handled as keys.
Mouse axis movement is not working yet.
 2019-12-24 12:59:26 +01:00
Christoph Oelckers
9ab8a8c737 - refactored the coordinate printout to a stat and removed printext256 and the associated font. 2019-12-23 20:55:12 +01:00
Christoph Oelckers
62ecedf1f8 - got it to the point where it can render to the GL surface from the native backend. 2019-12-23 19:37:40 +01:00
Christoph Oelckers
6b475417dc Merge branch 'master' into gzbackend 2019-12-23 14:31:31 +01:00
hendricks266
0a7f5f558a Rename colmatch functions 
git-svn-id: https://svn.eduke32.com/eduke32@8488 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/build/include/colmatch.h
#	source/build/src/build.cpp
#	source/build/src/defs.cpp
#	source/build/src/palette.cpp
#	source/duke3d/src/lunatic/dynsymlist_editor.lds
#	source/duke3d/src/lunatic/dynsymlist_game.lds
#	source/duke3d/src/lunatic/engine.lua
#	source/tools/src/transpal.cpp
 2019-12-23 10:59:14 +01:00
Christoph Oelckers
6e9631f2d8 - fixed all undefined symbols except OpenGLFrameBuffer. 2019-12-23 10:53:58 +01:00
Christoph Oelckers
773be7db26 - moved around a few bits of code to get rid of winbits.cpp/h. 2019-12-22 18:53:58 +01:00
Christoph Oelckers
3cb68b2bf0 - replaced the semi-broken screenshot name generator. 
Also took this file out of the 'build' folder, now that all code in here comes from elsewhere.
This also removes a few dead declarations.
 2019-12-19 19:47:51 +01:00
Christoph Oelckers
ef01c34346 - fixed status bar initialization for all games. 
Also deleted a few obsolete config variables for the old menu.
 2019-12-19 09:31:39 +01:00
Christoph Oelckers
2cf9a4a626 - removed leftpver music calls as well. 
The code should now be free of the old audio backend.
 2019-12-18 22:32:09 +01:00
Christoph Oelckers
75c76ccf66 - changed SW's PlaySound interface to take pointers to objects instead of pointers to coordinates. 
With pointers to coordinates the sound engine cannot work, so this had to be changed globally.
 2019-12-18 11:09:01 +01:00
Christoph Oelckers
a7075bc1b0 - SW sound WIP 
* removed old sound loading code, which was the last bit to use cacheAllocateBlock which is also gone now.
* cleanup of player sound code. All game side tracking of the sound resources has been removed.

does not compile yet.
 2019-12-17 23:25:07 +01:00
Christoph Oelckers
7916b16efc - fixed undefined behavior with iterating over null unique_ptrs. 
I have no idea why this works most of the time - it should crash right away.
 2019-12-17 20:08:59 +01:00
Christoph Oelckers
706157d623 - converted Blood's sound system to the OpenAL sound engine. 
Now, this code was one big mess of strange design, let's hope it sounds better with a real 3D mixer now.
 2019-12-17 19:37:05 +01:00
Christoph Oelckers
4d5755ca67 - update of the sound engine for unlimited channels per source. 
Blood needs this.
 2019-12-17 00:29:38 +01:00
Christoph Oelckers
fa7638c446 - removed the old sound system header from Duke and RR frontends and fixed every report this produced: 
* reverb/echo is not yet implemented, so there's two stub functions for now.
* RTS needs to be done differently, because the sound engine cannot play raw buffers without any control data.
 2019-12-16 19:18:03 +01:00
Christoph Oelckers
fbfb1972b8 - fixed a few places where the wrong sound ID was checked. 2019-12-16 17:41:44 +01:00
Christoph Oelckers
d24bd0fc14 - added refactored sound code to RR frontend. 
- removed most code using the low level sound interface directly from Duke and RR frontends.
 2019-12-16 16:18:47 +01:00
Christoph Oelckers
a66fc98d24 - a few more tweaks of the sound system. 
* removed the distance hack for explosions and replaced it with a lowered attenuation. The distance hack combined with the rolloff hack forced these sounds to always be unattenuated, even when at the far end of a level. Now they fade, but much less than other sounds.
* increased the default NearLimit to 6. For some sounds 4 is not enough and this needs a global limit that works for everything.
 2019-12-16 13:41:57 +01:00
Christoph Oelckers
84b6a89057 - fixed inconsistent coordinate system transformations 
- fixed bad sound ID being passed in S_CalcDistAndAng;
- cleaned up CalcPosVel.
- lowered the volume of unattenuated sounds a bit. They were disproportionately loud compared to the old sound system.
 2019-12-16 13:02:43 +01:00
Christoph Oelckers
b1b33ef231 - fixed hang with skill sound on game start. 
This waits inside code where S_Update wasn't called. To make things clearer the waiting loop was moved closer to where it gets played.
 2019-12-16 09:19:04 +01:00
Christoph Oelckers
938db6d35d - sounds in the menu are working now. 
Since the in-game sound is paused in the menu these sounds need the CHAN_UI flag to play.
 2019-12-16 08:19:57 +01:00
Christoph Oelckers
c9198729b0 - did some tweaks to the sound. 
The angle was wrong and the rolloff type apparently as well. It sounds a lot better now, especially after also altering the minimum distance for the rolloff. This one is interesting, it looks like a bug where the desired value was shifted two bits too much, quadrupling the distance where volume reduction starts.
 2019-12-15 20:55:15 +01:00
Christoph Oelckers
22ef66209d - sound is finally playing, but the volume needs balancing and positioning doesn't seem to be 100% correct. 2019-12-15 20:16:36 +01:00
Christoph Oelckers
4f9eda189a - a few sounds play, but it's still very buggy. 2019-12-15 19:00:41 +01:00
Christoph Oelckers
38dc39b8cd - got it to start, cannot hear anything... 2019-12-15 17:16:11 +01:00
Christoph Oelckers
d7ddd620e4 - added some final missing pieces to the sound code. 2019-12-15 16:32:39 +01:00
Christoph Oelckers
a28cd17454 - refactoring of DN3D sound code complete but not tested yet. 2019-12-15 13:34:00 +01:00
Christoph Oelckers
62660e76f3 - sound system rework. Not complete. 2019-12-15 10:00:25 +01:00
Christoph Oelckers
dba1a348d5 Merge branch 'master' into sound 2019-12-15 07:57:48 +01:00
Christoph Oelckers
d23b4a7e33 - hooked up ZDoom' joystick code and removed the remaining parts of the old MACT input library. 2019-12-14 20:15:15 +01:00
Christoph Oelckers
773c480940 - this sound system is too insane to be ported. 2019-12-12 21:42:58 +01:00
Christoph Oelckers
c5c2873223 - added GZDoom's sound engine. 
This is not connected with the games yet.
 2019-12-12 19:21:36 +01:00
Christoph Oelckers
b5cc3ef883 - moved a few bits of code around in Duke's sounds.cpp. 
- refactored the only place in the entire code that used the return of S_PlaySound.
 2019-12-12 18:43:27 +01:00
Christoph Oelckers
86dc909559 - added detection logic for zipped versions of the Cryptic Passage add-on for Blood and the Route66 add-on for Redneck Rampage. 
- added command line options to load the original file dump of both mods in the game directory.
- both also require loading additional non-standard-named .art files
 2019-12-11 23:41:05 +01:00
Christoph Oelckers
95625567e0 - fixed compile errors. 2019-12-11 18:40:42 +01:00
Christoph Oelckers
875678f20b - transitioned Shadow Warrior to the global mapinfo 2019-12-11 02:01:11 +01:00
Christoph Oelckers
250dd36289 - this better uses currentLevel for consistency 2019-12-11 01:19:32 +01:00
Christoph Oelckers
ec96ae8992 - cleanup of -map setup. 2019-12-11 01:11:35 +01:00
Christoph Oelckers
cb051b44ea - removed unused compression records from savegame header 2019-12-11 01:10:59 +01:00
Christoph Oelckers
69fd6cf69d - removed currentBoardFilename 
This was only used for displaying the name for user maps, everything else was using other means of getting the data already, and even here currentLevel is better suited.
 2019-12-11 01:01:03 +01:00
Christoph Oelckers
5c0cd5114d - transitioned Blood to the common mapinfo system. 2019-12-11 00:57:53 +01:00
Christoph Oelckers
ebb43f9129 - use the currentLevel record for the status screens. What was there could be broken by scripts thanks to the non-existent access control to critical variables. 
- give the final map in RR a proper mapinfo record. Without this the map is not really stable with the current savegame system.
 2019-12-10 23:04:06 +01:00
Christoph Oelckers
0e19d4262e - savegame and mapinfo cleanup in DN3D and RR frontends. 
Also added an "end game" flag to the mapinfo. For those who like to assemble single levels into custom episodes. More features for that to come. ;)
 2019-12-10 22:22:59 +01:00
Christoph Oelckers
4cc22e155f - better handling for maps without names. 
Use the file's base part as name if that happens.
 2019-12-10 17:35:28 +01:00
Christoph Oelckers
db29fc1a01 - removed the mostly useless changelevel CCMDs. 
It makes more sense to do a real 'map' CCMD instead once the level management is working properly.
 2019-12-10 17:25:45 +01:00
Christoph Oelckers
4f04fe66de - transitioned RR to the new mapinfo 2019-12-10 00:31:55 +01:00
Christoph Oelckers
3b57f38e55 - started transitioning to a global mapinfo list. 
This will make it a lot easier for cross-game parts of the engine to query game state.
So far the EDuke frontend has been ported over.
 2019-12-10 00:01:45 +01:00
Christoph Oelckers
ba978ab0d9 - text update and missing includes. 2019-12-09 17:17:15 +01:00
Christoph Oelckers
66218dd074 - connect SW with statistics code and added missing function for Blood 
# Conflicts:
#	source/blood/src/blood.h
#	source/common/menu/messagebox.cpp
#	source/sw/src/game.cpp
#	source/sw/src/game.h
 2019-12-09 01:03:18 +01:00
Christoph Oelckers
4ef9ec6708 - call STAT_StartNewGame globally from the menu 2019-12-09 01:00:46 +01:00
Christoph Oelckers
9f25c9c117 - some string rework 
* removed temporary placeholder content from string init function. All this gets properly read from definition files now.
* preinitialize a few quotes that are used for status display purposes and are needed in all games
* only use the global episode name table in Blood to avoid redundancy
* let SW's swcustom parser write to the global tables instead of local ones.
 2019-12-09 01:00:46 +01:00
Christoph Oelckers
a74797b97c - fix merge errors. 2019-12-08 08:51:54 +01:00
terminx
0456d8f36d These shouldn't be references 
git-svn-id: https://svn.eduke32.com/eduke32@8408 1a8010ca-5511-0410-912e-c29ae57300e0
 2019-12-08 08:39:20 +01:00
terminx
694863a8a1 Fix cacheAllSounds() being called before .def parsing... oops! 
git-svn-id: https://svn.eduke32.com/eduke32@8404 1a8010ca-5511-0410-912e-c29ae57300e0
 2019-12-08 08:37:51 +01:00
terminx
f5e3b4bb5a Fix osdcmd_changelevel 
git-svn-id: https://svn.eduke32.com/eduke32@8397 1a8010ca-5511-0410-912e-c29ae57300e0
 2019-12-08 08:30:57 +01:00
terminx
0b2f550f09 This change to Gv_DivVar() is faster when benchmarked 
git-svn-id: https://svn.eduke32.com/eduke32@8396 1a8010ca-5511-0410-912e-c29ae57300e0
 2019-12-08 08:30:35 +01:00
terminx
a2fd43da2f Clean up CON_FOR a little 
git-svn-id: https://svn.eduke32.com/eduke32@8395 1a8010ca-5511-0410-912e-c29ae57300e0
 2019-12-08 08:29:24 +01:00
terminx
9146dc9a89 Remove duplicate call to cacheAllSounds() from S_SoundStartup() 
git-svn-id: https://svn.eduke32.com/eduke32@8375 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/duke3d/src/sounds.cpp
 2019-12-08 08:13:15 +01:00
terminx
c851da92a6 Improve interaction between cheat entry and player input 
git-svn-id: https://svn.eduke32.com/eduke32@8369 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/duke3d/src/cheats.cpp
#	source/duke3d/src/player.cpp
 2019-12-08 08:05:14 +01:00
terminx
cf0a74a888 Fix noclip in Duke3d 
git-svn-id: https://svn.eduke32.com/eduke32@8368 1a8010ca-5511-0410-912e-c29ae57300e0
 2019-12-08 07:59:31 +01:00
terminx
cbfb675577 Shitcan the few uses of the bool type in the VM after reading some things and dicking around on godbolt.org 
git-svn-id: https://svn.eduke32.com/eduke32@8366 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/duke3d/src/gameexec.cpp
#	source/duke3d/src/gameexec.h
 2019-12-08 07:56:50 +01:00
Christoph Oelckers
0157446ad1 - thorough cleanup of the Shadow Warrior music code. 
This was one huge mess where nothing fit together.
Also added an enhancement that the CD Audio boss theme tracks are also played when CD music is generally off, because these have no equivalent in MIDI. This needs to be checked if it's stylistically ok, though.
 2019-12-07 19:57:19 +01:00
Christoph Oelckers
ff50a1681f - simplified the music playing interface a bit. 
#
 2019-12-07 18:28:30 +01:00
Christoph Oelckers
13c7dcecf6 - exported all game relevant texts from Duke Nukem and Redneck Rampage. 2019-12-07 14:53:13 +01:00
Christoph Oelckers
0342b96335 - cleaned out the remaining wrappers from cache1d.h and use the file system directly instead. 2019-12-07 10:49:23 +01:00
Christoph Oelckers
30cbcb54b1 - renamed the remaining file system access wrappers in cache1d.h 2019-12-07 10:31:27 +01:00
Christoph Oelckers
749eda32c5 - moved kopenfilereader into the FileSystem class. 2019-12-07 10:14:51 +01:00
Christoph Oelckers
66756bfa13 - final fixes for Blood's and Duke Nukem's menus. 2019-12-06 18:36:49 +01:00
Christoph Oelckers
7a9138cde0 - made the confirmation screen functional. 
This works but still needs a bit of visual work.
 2019-12-05 23:17:55 +01:00
Christoph Oelckers
54177cd27d - added the animated player display. 2019-12-05 19:52:46 +01:00
Christoph Oelckers
169d68f583 - fixed stuff and cleaned out most of the old menu code. 2019-12-05 19:00:40 +01:00
Christoph Oelckers
628bd9efc6 Filled in the rest of the menus 
Sound is only partially functional, video mode completely nonfunctional, but it makes no sense adjusting them to the current backend code when it's due for replacement.
 2019-12-05 00:47:05 +01:00
Christoph Oelckers
cb0538d0f2 - mouse aiming cleanup. 
Reverted this to a sane setting, as it was in the original games and in all other games I have ever seen, i.e. there is a global setting to enable mouse view, and a button to manually trigger it. The toggle can be easily handled by flipping the CVAR directly.
The main problem here was that it triggered a few cases for mouse-less gameplay in the default case with a mouse present, because the mouseaim CVAR was no longer what the game expected.
This misguided change seems to have originated in JFDuke but by now had propagated to all the other games as well, the code was in all 4 frontends.
 2019-12-05 01:08:35 +01:00
Christoph Oelckers
3ea526055f - added a generic message display, using ZDoom's code. 
This is mainly meant for Nam and WW2GI which have an ugly-as-hell font for these texts.
 2019-12-04 23:07:02 +01:00
Christoph Oelckers
6d04f0f159 - added option to print custom messages with Duke Nukem's quote system. 
- hooked up all front ends with a generic message printing function so that common code can access the native message displays. This is needed for consolidation of some input actions which are mostly identical but print messages.
- preparations for a generic message system.
 2019-12-04 21:35:35 +01:00
Christoph Oelckers
138326314e - text update. 2019-12-04 17:30:41 +01:00
Christoph Oelckers
7d1eb74b5e - more menus implemented 2019-12-04 01:38:51 +01:00
Christoph Oelckers
72857db17b - refactor of the quote storage. 
This was consolidated for both EDuke and RedNukem frontends, put into a class with strict access control and the length limit was lifted.
The new class will eventually allow better localization control.
 2019-12-04 00:28:28 +01:00
Christoph Oelckers
c561255018 - moved the application of in_mousebias and in_mousedeadzone into the backend code. 
This piece was repeated 6x for each call to CONTROL_GetInput, creating quite a bit of redundancy.
 2019-12-03 20:58:43 +01:00
Christoph Oelckers
6245a0e2e2 - added mouse and controller menus 
The controller menu obviously does not work yet, it needs quite a bit of backing code fron GZDoom first.
 2019-12-03 01:21:27 +01:00
Christoph Oelckers
65ae00fb74 - completion of controls menu 
- some message printing cleanup in SW frontend. This still has its native console that needs to be removed.
 2019-12-03 00:57:03 +01:00
Christoph Oelckers
26daff79db - fixed compile errors and updated string table. 2019-12-02 18:11:10 +01:00
Christoph Oelckers
00b2467eea - WIP keybinding cleanup 2019-12-02 02:07:32 +01:00
Christoph Oelckers
36cf2583e4 - removed some dead code. 2019-12-02 00:19:35 +01:00
Christoph Oelckers
e2be025433 - fixed the Ion Fury credit screens. 
The entire 'fix' here consisted of hacks to give the CON script exactly what it needs to show them as intended.
 2019-12-01 17:48:56 +01:00
Christoph Oelckers
b372cb5f35 - the primary Blood menus are working. 
Now this was magnitudes easier than the EDuke menu - NBlood's menu is actually clean and usable code but still nothing compared to a unified menu system.
 2019-12-01 15:31:08 +01:00
Christoph Oelckers
aed05840ae - removed the mouseInactiveConditional interface function. 
This was only a crutch to let the input interface work with the original menus.

Now that the one in Blood is gone, all the conditions are no longer relevant. (Shadow Warrior never got far enough to implement this)
 2019-12-01 10:31:44 +01:00
Christoph Oelckers
5d0d37df25 - disconnected Blood's menu. 
This is due for replacement next.
 2019-12-01 10:18:38 +01:00