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

435 commits

Author SHA1 Message Date
Christoph Oelckers
493525a58e - consolidation of engine save code. 
This had discrepancies between the game modules so now all use the same code to save the common engine state.
 2020-01-21 21:51:05 +01:00
Jonathan Gray
c7ffed4867 Blood: change fallthrough annotations to fix clang build 
Remove some fallthrough annotations so clang does not fatally error:

source/blood/src/aiunicult.cpp:1983:13: error: fallthrough annotation does not
      directly precede switch label

source/blood/src/triggers.cpp:1045:33: error: fallthrough annotation does not
      directly precede switch label

# Conflicts:
#	source/blood/src/aiunicult.cpp
#	source/blood/src/triggers.cpp
 2020-01-18 22:48:13 +01:00
Christoph Oelckers
2bc1708870 - removed the complete crosshair color hackery. 
The code needs to be refactored anyway to allow better crosshair control but this also seemed to affect global render state, considering how poorly it was all implemented.
 2020-01-18 16:14:31 +01:00
Christoph Oelckers
8db6a4331b - added savepic generation for Blood. 2020-01-14 21:20:46 +01:00
Evan Ramos
3e3477c414 Fix errors in PR 
# Conflicts:
#	source/blood/src/osdcmd.cpp
#	source/blood/src/view.cpp
#	source/build/src/mutex.cpp
 2020-01-13 18:00:25 +01:00
NoOneBlood
2b36e53706 - Removed event.causedBy for demo playback compatibility 
- Fixed kThingArmedRemote in triggers.cpp (OperateSprite())
- Fixed kTrapFlame in triggers.cpp (OperateSprite())

# Conflicts:
#	source/blood/src/actor.cpp
#	source/blood/src/player.h
 2020-01-13 17:58:27 +01:00
NoOneBlood
4123a9e14e - gModernMap guard instead of VanillaMode in dudeSpawn 
- No sound for player when jumping fix
 2020-01-13 17:57:13 +01:00
NoOneBlood
6f3ccdc651 - Combination switches fix (and basically all event commands) 
- No sound of jumping when player's jump velocity is too low
 2020-01-13 17:57:13 +01:00
Christoph Oelckers
dc5b8d27f8 - infrastructure for savegame pics. 
Savepic generation implemented for Duke 3D, but results in a black image.
 2020-01-12 23:16:21 +01:00
Christoph Oelckers
95f917a408 - added the main vertex buffer and some code to maintain it on systems where persistent mapping is not possible. 
All games combined there's 11(!!!) scene render blocks, not counting the sub-blocks for ROR and mirrors.
Does it surprise anyone that most of these sub-blocks do not feature all engine capabilities?
 2020-01-12 20:28:07 +01:00
CommonLoon102
95eb10d2a6 fix voxel positions when notmd is defined in maphack file 
# Conflicts:
#	source/blood/src/view.cpp
 2020-01-11 22:19:50 +01:00
Christoph Oelckers
55dab6d3d3 - hooked up the high color texture colorization code. 
Not tested and probably still not working correctly, the entire feature was a nearly impenetrable mess of convoluted code. This definitely needs verification with multiple mods using it.
 2020-01-11 22:18:06 +01:00
nukeykt
af80e64ecf Calculate map MD4 used for maphacks 
# Conflicts:
#	source/blood/src/db.cpp
 2020-01-11 14:58:12 +01:00
Christoph Oelckers
fb985d2503 - more macOS compilation fixes 
Still not complete…
 2020-01-07 01:11:19 +01:00
Christoph Oelckers
134122335b - first attempt to compile on a Mac 
This could have gone better, there's far too many warnings here
 2020-01-06 02:41:47 +01:00
Christoph Oelckers
9f0bb97e63 - disabled printing the version on Blood's status bar. 2020-01-05 10:22:20 +01:00
Christoph Oelckers
ed813562eb - fixed sound in Blood cutscenes. 2020-01-04 00:07:20 +01:00
Christoph Oelckers
c82d6de6c3 - fixed a few typos and uninitialized variables. 2020-01-03 17:08:41 +01:00
Evan Ramos
148c8770e9 Blood: Constify some {u,t,}spritetype templates 
This is important where tracked spritetype could be involved.
 2020-01-03 08:07:27 +01:00
Evan Ramos
e363cd53a5 tspritetype cleanup 
# Conflicts:
#	source/blood/src/m32common.cpp
#	source/blood/src/m32exec.cpp
#	source/blood/src/m32structures.cpp
#	source/blood/src/mapedit.cpp
#	source/rr/src/astub.cpp
#	source/rr/src/m32common.cpp
#	source/rr/src/m32exec.cpp
#	source/rr/src/m32structures.cpp
 2020-01-03 08:07:10 +01:00
Evan Ramos
8fce9c5be8 Blood: Restore original tspritetype member synonyms 
# Conflicts:
#	source/blood/src/view.cpp
 2020-01-03 08:06:07 +01:00
Christoph Oelckers
b549228d4d - commented out the time wasting level loading screen in Blood. 
Now seriously, doing frequent screen updates here only make things worse!
 2020-01-02 23:35:29 +01:00
nukeykt
cc4f801b1e Blood: fix candles 2020-01-02 20:21:20 +01:00
nukeykt
57e925a1bb Blood: Explosion polymer light 2020-01-02 20:21:19 +01:00
nukeykt
8fbd6674d2 Blood: polymer lights wip 
# Conflicts:
#	source/blood/src/actor.cpp
#	source/blood/src/blood.cpp
#	source/blood/src/osdcmd.cpp
 2020-01-02 20:21:19 +01:00
nukeykt
9208c1249d Blood: fix uninitialized palette usage 
# Conflicts:
#	source/blood/src/view.cpp
 2020-01-02 20:19:01 +01:00
Christoph Oelckers
4571ba74c2 - merge fixes. 
Why does that freaking merger always delete the namespace markers...?
 2020-01-02 19:20:11 +01:00
nukeykt
2e085b559f Precache more tiles on level start 
# Conflicts:
#	source/blood/src/fx.cpp
#	source/blood/src/gib.cpp
#	source/blood/src/gib.h
#	source/blood/src/qav.cpp
#	source/blood/src/weapon.h
 2020-01-02 19:20:11 +01:00
nukeykt
7af92bb327 blood: Precache fonts 2020-01-02 19:20:11 +01:00
NoOneBlood
afb8c11683 - It's possible now to change posture settings for each player 
- Touch trigger for walls fix
- It's possible to set custom clipdist for things (gModernMap only)
- Few tweaks for Custom Dude
- Player Control type fixes and updates

# Conflicts:
#	platform/Windows/nblood.vcxproj
#	source/blood/src/player.h
 2020-01-02 19:20:11 +01:00
NoOneBlood
5bcfcc1b55 - Player Control type fixes 
- Custom Dude type fixes
 2020-01-02 19:20:11 +01:00
Grind Core
ec782a28de - Rewrite true random once again 
- Fix Custom Dude genIdle aistate
- Fix grown and shrink races
- Fix qav scene was not able to stop if sprite is locked
- Fix stupid error in gDefaultJump array

# Conflicts:
#	source/blood/src/actor.cpp
#	source/blood/src/view.cpp
 2020-01-02 19:20:11 +01:00
Grind Core
1eb50414ab -Fix xspriData2Array function 
-Fix kModernSpriteDamager type

# Conflicts:
#	source/blood/src/actor.cpp
#	source/blood/src/gameutil.cpp
#	source/blood/src/gameutil.h
#	source/blood/src/triggers.h
 2020-01-02 19:20:10 +01:00
Grind Core
da47ebbd2c - Rewrite true random, so it should work just fine now 
- Way better AI for Custom Dude when attacking the target
- Minor warning fixes and other updates

# Conflicts:
#	source/blood/src/actor.cpp
#	source/blood/src/aiunicult.cpp
#	source/blood/src/aiunicult.h
#	source/blood/src/asound.cpp
#	source/blood/src/gameutil.cpp
#	source/blood/src/gameutil.h
#	source/blood/src/player.h
#	source/blood/src/triggers.h
 2020-01-02 19:20:10 +01:00
Christoph Oelckers
e01c161258 - removed some dead variables. 2020-01-01 13:11:44 +01:00
Christoph Oelckers
18099e9179 - removed the pure software render surface and deleted a few unused variables. 
With all the 2D refactorings thhe softsurface won't work anymore.
This also revealed a bug with the fullscreen variable, a few places were still using the old one from the SDL backend.
 2020-01-01 12:36:48 +01:00
Christoph Oelckers
d464017363 - cleaned up the input code a bit. 2020-01-01 11:35:47 +01:00
Christoph Oelckers
bcb48d8441 - added handling for changing the screen size (dragging the window borders / change scale factor) 2020-01-01 09:49:06 +01:00
Christoph Oelckers
05e381ff6d - fixed screen clearing for the automap. 
This should only affect the active window, not the entire screen.
 2019-12-31 19:50:27 +01:00
Christoph Oelckers
ad24a1ce31 - place weapon sprites in a separate render list. 
They need to be drawn in a different pass than the 2D overlay HUD so the backend must have them separately.
 2019-12-30 20:16:51 +01:00
Christoph Oelckers
f1891c7750 - fixed compilation. 2019-12-29 22:47:40 +01:00
nukeykt
a5351620db Fix blood compiling 
# Conflicts:
#	source/blood/src/config.cpp
#	source/blood/src/osdcmd.cpp
#	source/blood/src/screen.cpp
#	source/blood/src/sound.cpp
#	source/blood/src/sound.h
#	source/blood/src/view.cpp
#	source/blood/src/view.h
 2019-12-29 22:29:50 +01:00
Christoph Oelckers
3a6d0b8f84 - more cleanup. 2019-12-29 17:04:38 +01:00
Christoph Oelckers
2e261a7468 - cleanup and removal of unused code. 
compat.h probably needs a bit more attention, it's a horrendous mess of the wrong type of "compatibility" concerns.
 2019-12-29 16:35:51 +01:00
Christoph Oelckers
a021b96119 - added the needed parts of GZDoom's render backend to have the postprocessor working. 
Not hooked up yet.
 2019-12-28 18:20:47 +01:00
Christoph Oelckers
d473f9c590 - replaced all uses of Bfree with Xfree so they are subjected to debug instrumentation, uses FStrings in a few cases where it made sense. 
- fixed: Sound channels weren't freed.
 2019-12-26 14:43:44 +01:00
Christoph Oelckers
d8dfe752b5 - fixed handling of music in Redneck Rampage and Shadow Warrior. 
After merging the CD enabling CVAR they had the same default (off) as Blood which is wrong.
This also addresses other music related issues, like not properly cycling through the RR music.
 2019-12-26 13:04:29 +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
efe4261932 - fixed Blood music and movie playback. 
I have no idea why the movie code was completely disabled in NBlood, it all works fine...
 2019-12-25 01:10:13 +01:00
Christoph Oelckers
43033e830a - Blood now also starts the first level without leaks. 
I had to refactor the LoadSave data to allow automatic takedown, the linked list was not the most convenient thing - an array is better.
 2019-12-24 19:47:34 +01:00
Christoph Oelckers
e8d7777f4a - mouse input works again after cleaning out the remaining cruft of the old input code. 2019-12-24 13:54:50 +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
3b98635170 - removed all remaining references to SDL. The Windows version is now fully native. 2019-12-23 20:03:03 +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
Christoph Oelckers
5c62e9776f - fix for cherry picks. 2019-12-23 14:30:10 +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
CommonLoon102
b7479b567d Revert tiny Caleb flameguy fix (#254) 2019-12-21 10:43:11 +01:00
Christoph Oelckers
fffe1753ec - removed a few unused bits of code. 2019-12-19 20:04:17 +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
a6395c0ed9 - be gone, MultiVoc. 2019-12-18 22:50:37 +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
3f9657b96a - removed all leftover dependencies on the old sound backend. 2019-12-18 22:24:50 +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
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
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
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
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
5c0cd5114d - transitioned Blood to the common mapinfo system. 2019-12-11 00:57:53 +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
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
5e9b874610 - exported most of Blood's text to the string table 
MP messages with %s yet to do.
 2019-12-09 02:01:30 +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
ff50a1681f - simplified the music playing interface a bit. 
#
 2019-12-07 18:28:30 +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
7d7507d453 - always add movie and music subdirectories. 2019-12-07 00:57:45 +01:00
Christoph Oelckers
5c7b05a791 - made THINGINFO const. 2019-12-07 00:07:02 +01:00
Christoph Oelckers
7a8208eb2f - fixed out of bounds memory access. 2019-12-06 23:20:18 +01:00
Christoph Oelckers
06d2f9fcf1 - fixed music names in Blood 2019-12-06 20:31:17 +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
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
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
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