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

2924 commits

Author SHA1 Message Date
hendricks266
1507e9fd15 SW: Left-pin the mini HUD in widescreen 
git-svn-id: https://svn.eduke32.com/eduke32@8352 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/sw/src/text.cpp
 2019-12-05 17:23:03 +01:00
Christoph Oelckers
6914408453 - fixed writeback of hud_size CVAR 
G_ChangeHudLayout must ensure that the written value is ok, otherwise the auto validation in the CVAR can screw things up.
 2019-12-05 00:54:55 +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
1b1fad6e13 - forgot to save this. 2019-12-05 01:17:28 +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
525cf28d29 - commented FBaseCVar::GetHumanString back in. 
This had to be deactivated when adding the code, but was forgotten when everything was ready.
 2019-12-04 23:09:09 +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
5b0033c08c - minor menu tweaks and fixes. 2019-12-04 18:52:39 +01:00
Christoph Oelckers
dca118881a - added graphics for the mouse back button and reactivated the code for it. 2019-12-04 17:55:43 +01:00
Christoph Oelckers
138326314e - text update. 2019-12-04 17:30:41 +01:00
Christoph Oelckers
4cefc1db83 Merge branch 'master' into menu_for_real 2019-12-04 17:25:40 +01:00
Christoph Oelckers
7d1eb74b5e - more menus implemented 2019-12-04 01:38:51 +01:00
Christoph Oelckers
6a6d6e3694 - fixed quote init. 2019-12-04 00:38:43 +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
fb5d944170 - made the mouse sensitivity CVARs floating point so that the menu can display them properly. 
- disabled the mouse movement sensitivity CVARs pending a refactoring of the code to handle them in the input backend instead of the individual input handlers.
 2019-12-03 20:49:56 +01:00
Christoph Oelckers
49e0e551d6 - fixed the sliders. 2019-12-03 20:32:35 +01:00
Christoph Oelckers
6f9494435a - adjustment for last commit. 2019-12-03 17:40:35 +01:00
hendricks266
53e2a8297d Fix STARTUP_WINDOW=0 on modern macOS 
git-svn-id: https://svn.eduke32.com/eduke32@8351 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/build/src/sdlayer.cpp
#	source/build/src/startosx.editor.mm
#	source/platform/macos/osxbits.h
#	source/platform/macos/startosx.game.mm
 2019-12-03 17:34:36 +01:00
hendricks266
c27616508e SW: Move HIT_PLAX_WALL out of the bit range used for limit raised struct IDs 
git-svn-id: https://svn.eduke32.com/eduke32@8350 1a8010ca-5511-0410-912e-c29ae57300e0
 2019-12-03 17:32:50 +01:00
hendricks266
863d35d7c2 SW: Activate ASSERT macro with RELEASE=0 builds 
git-svn-id: https://svn.eduke32.com/eduke32@8349 1a8010ca-5511-0410-912e-c29ae57300e0
 2019-12-03 17:32:49 +01:00
hendricks266
823e47f3e8 SW: Fix assertions and OOB so that the player can noclip OOB 
git-svn-id: https://svn.eduke32.com/eduke32@8348 1a8010ca-5511-0410-912e-c29ae57300e0
 2019-12-03 17:32:48 +01:00
hendricks266
f19848a1b3 SW: Address Sanitization commenceth 
git-svn-id: https://svn.eduke32.com/eduke32@8347 1a8010ca-5511-0410-912e-c29ae57300e0
 2019-12-03 17:32:46 +01:00
hendricks266
820bd2545c SW: Get widescreen aspect working 
git-svn-id: https://svn.eduke32.com/eduke32@8346 1a8010ca-5511-0410-912e-c29ae57300e0
 2019-12-03 17:32:45 +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
79ced02d36 - implemented the Shadow Warrior menu interface. 2019-12-03 00:01:04 +01:00
Christoph Oelckers
702f91b6b5 - disconnected Shadow Warrior's menu so it can be replaced. 
Unlike the other games this was a lot more invasive
 2019-12-02 21:05:19 +01:00
Christoph Oelckers
d55f55c04d - now, where this that 6 come from...? 2019-12-02 19:27:35 +01:00
Christoph Oelckers
bc3a921a72 - fixed newly added menu content. 2019-12-02 19:21:45 +01:00
Christoph Oelckers
026cc7153c - externalized the controller bindings and removed all code responsible for maintaining them separately. 
Bindings were changed a bit because what was there was a very poor default for my own controller.
 2019-12-02 18:33:11 +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
71c2a8f33a - made the main option menu work. 2019-12-02 00:16:48 +01:00
Christoph Oelckers
e743268c4b - Blood load/save works. 2019-12-01 22:54:52 +01:00
Christoph Oelckers
eb668180c8 - implemented help and credits menu for Blood. 2019-12-01 21:44:50 +01:00
Christoph Oelckers
1cfe5be130 - fixed creation of true color textures. 
The palette check was not correct so they ended up empty and caused other problems down the line.
 2019-12-01 21:43:54 +01:00
Christoph Oelckers
e8c5939695 - more work on Blood menus. Game start works. 2019-12-01 20:17:30 +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
b0a6734915 - removed no longer needed parts from input.cpp. 2019-12-01 11:38:13 +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
Christoph Oelckers
55ba1116ec - fixing the last commit. 2019-12-01 09:03:51 +01:00
Christoph Oelckers
8a98f9b3ca - removed quitevent. 
This was some meticulously preserved relic of bad old DOS times used to block OS facilities to close an app.
Since this has been worked around at a lower level already the variable was essentially without function but some quite bad code depended on it.
 2019-12-01 09:02:17 +01:00
Christoph Oelckers
d8c74a8b00 - don't show the map name when the menu is active 
Since it uses the same font this causes ugly visual clashes.
 2019-12-01 08:25:24 +01:00
Christoph Oelckers
79fd4e830a - removed the code for Doom's help screens. 2019-12-01 08:23:35 +01:00
Christoph Oelckers
0fc439a969 - fixed Redneck Rampage ingame menu and added selection validation to the load menu. 2019-11-30 23:59:22 +01:00
Christoph Oelckers
06d5705ae6 - formatting fix and null check for aborted transition. 2019-11-30 23:45:43 +01:00
Christoph Oelckers
c36402eb5c - fixed savegame validation and recursive ticker calls. 2019-11-30 23:33:04 +01:00
Christoph Oelckers
41b116e2f2 - save menu in Duke Nukem is working. 2019-11-30 22:46:00 +01:00
Christoph Oelckers
2a9e4fca46 WIP safety commit 2019-11-30 19:23:54 +01:00
Christoph Oelckers
9cb6c65223 - fixed errors in SW merge. 2019-11-30 10:07:25 +01:00
Christoph Oelckers
d5c3991c2e - fixed compile errors in menu code. 2019-11-30 10:03:20 +01:00
Christoph Oelckers
3c4c8af20c Merge branch 'master' into menu_for_real 2019-11-30 09:33:35 +01:00
hendricks266
68668058c9 SW: Fix cheats only granting one Uzi instead of two 
git-svn-id: https://svn.eduke32.com/eduke32@8343 1a8010ca-5511-0410-912e-c29ae57300e0
 2019-11-30 09:28:11 +01:00
hendricks266
769b359928 SW: Add Alt Weapon Mode gamefunc and bind it to MOUSE3 by default 
git-svn-id: https://svn.eduke32.com/eduke32@8342 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/sw/src/_functio.h
#	source/sw/src/function.h
 2019-11-30 09:28:10 +01:00
hendricks266
361a964067 SW: Fix NUMGAMEFUNCTIONS and mouse button select menu 
git-svn-id: https://svn.eduke32.com/eduke32@8340 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/sw/src/function.h
#	source/sw/src/menus.cpp
 2019-11-30 09:26:50 +01:00
hendricks266
15b8bc959f SW: Add Equip Pickups weapon auto-switching toggle 
git-svn-id: https://svn.eduke32.com/eduke32@8339 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/sw/src/swconfig.cpp
 2019-11-30 09:26:02 +01:00
hendricks266
8d2159ab70 SW: Implement Darts option, including bloody frames 
git-svn-id: https://svn.eduke32.com/eduke32@8338 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/sw/src/menus.cpp
#	source/sw/src/panel.cpp
#	source/sw/src/sprite.cpp
#	source/sw/src/swconfig.cpp
 2019-11-30 09:24:32 +01:00
hendricks266
69c01587c7 SW: Make quick save and load actually quick 
git-svn-id: https://svn.eduke32.com/eduke32@8337 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/sw/src/game.cpp
#	source/sw/src/game.h
#	source/sw/src/menus.cpp
 2019-11-30 09:23:47 +01:00
hendricks266
8b78440f76 SW: Upgrade SoundAngle() from the original 5-bit precision to EDuke32's 7-bit 
git-svn-id: https://svn.eduke32.com/eduke32@8336 1a8010ca-5511-0410-912e-c29ae57300e0
 2019-11-30 09:21:40 +01:00
hendricks266
1cac2c76c6 SW: Add debug_break() to _Assert() 
git-svn-id: https://svn.eduke32.com/eduke32@8335 1a8010ca-5511-0410-912e-c29ae57300e0
 2019-11-30 09:21:39 +01:00
Christoph Oelckers
07ac12110f - removed some piece of obsolete code merged from upstream. 2019-11-30 01:07:46 +01:00
Christoph Oelckers
b3c335cd1d Merge branch 'menu_for_real' of https://github.com/coelckers/demolition into menu_for_real 
# Conflicts:
#	source/common/menu/loadsavemenu.cpp
#	source/duke3d/src/d_menu.cpp
#	source/rr/src/d_menu.cpp
 2019-11-30 01:06:37 +01:00
Christoph Oelckers
79ce4563eb - fixed game resuming when closing the load and save menus. 2019-11-30 01:03:14 +01:00
Christoph Oelckers
e266044391 - update of load/save menu to latest GZDoom code. 
Input in save menu working.
 2019-11-30 00:49:50 +01:00
Christoph Oelckers
6d110da209 - removed some piece of obsolete code merged from upstream. 2019-11-29 20:14:45 +01:00
Christoph Oelckers
a7bbd7324e Merge branch 'master' into menu_for_real 2019-11-29 19:55:16 +01:00
hendricks266
f19c9eb840 SW: Clean up startup messages 
git-svn-id: https://svn.eduke32.com/eduke32@8328 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/sw/src/game.cpp
#	source/sw/src/grpscan.cpp
 2019-11-29 17:29:11 +01:00
Christoph Oelckers
ebcc25f36d - prototyping the Blood fullscreen menu entries 
These are a bit more sophisticated than what the other games have. ;)
 2019-11-29 02:12:38 +01:00
Christoph Oelckers
90c5ea6acc - updated option menu code to latest scripted version 
This mainly means being able to use the generic font.
This also adds more generalization to the menu sound handling, plus an option to turn menu sound off. This is motivated by the pig sounds which RR uses in the menu.
 2019-11-29 01:28:13 +01:00
Christoph Oelckers
5590abd471 Merge branch 'master' into menu_for_real 2019-11-29 00:49:33 +01:00
hendricks266
0dbf0a36a1 SW: Rename the poorly named "Cool Stuff" menu entry to "Credits" and clean it up 
git-svn-id: https://svn.eduke32.com/eduke32@8326 1a8010ca-5511-0410-912e-c29ae57300e0
 2019-11-29 00:48:17 +01:00
hendricks266
d4eb10d10d SW: Fix saves 
Dynamically-allocated structs strike again.

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

# Conflicts:
#	source/sw/src/saveable.h
 2019-11-29 00:48:16 +01:00
Christoph Oelckers
0cedad6390 - started work on load/save menus. 2019-11-29 00:37:19 +01:00
Christoph Oelckers
943cb64eda - image scroller menus working. 2019-11-28 23:27:10 +01:00
Christoph Oelckers
48f62ef1ed - cleaned out most of menus.cpp for RR. 2019-11-28 20:59:34 +01:00
Christoph Oelckers
299314b8a5 - Redneck Rampage menu looks correct. 2019-11-28 20:48:58 +01:00
Christoph Oelckers
1f1b927b6b - fixed a few issues. 2019-11-28 20:11:27 +01:00
Christoph Oelckers
59ebb10512 - fixed compilation and unhooked the Redneck Rampage menu so that it can be replaced. 2019-11-28 19:35:35 +01:00
Christoph Oelckers
cd4ff92266 - handle Blood. 2019-11-28 03:32:02 +01:00
Christoph Oelckers
324056ad88 - more cleanup on music code 
* removed some redundant functionality (e.g. Shift-F5 to change - use the console for that!)
* removed a few more leftover parts of the old music system
* savegames should not do more than resuming the music at the point of saving. (DN3D and RR only so far. Blood to be done.)
* handle music enabling/disabling in the backend, which simply knows better what to do. This was only working in the menu, so changing the CVAR had no effect.
 2019-11-28 03:18:58 +01:00
Christoph Oelckers
a59917b35d - more cleanup of sound code 
removed the remaining parts of the old music system in EDuke32 and RedNukem frontends.
 2019-11-28 03:02:33 +01:00
Christoph Oelckers
d569cd76c1 - cleanup of sound code - removal of the cache lock 
This has been inoperable for a long time and by now the cache is entirely gone.
 2019-11-28 02:36:34 +01:00
Christoph Oelckers
6ad9c1c0e3 - set up d_menu.cpp for Redneck Rampage 2019-11-28 02:14:30 +01:00
Christoph Oelckers
f62611e90d - cleaned out a large chunk of menus.cpp 
… leaving only the parts still needed for reference.
 2019-11-28 01:49:50 +01:00
Christoph Oelckers
b12377962a - moved the game interface function to d_menu 2019-11-28 01:30:24 +01:00
Christoph Oelckers
4e5f59a373 - Menu WIP 
* implemented single image screens
* implemented skeleton of the image scroller
* added RR-specific definitions to the menus (need to copy and adjust d_menu.cpp)
* added definitions for credits screens.
 2019-11-28 01:02:45 +01:00
Christoph Oelckers
ef3ad690da - initial work on credits screens. 2019-11-28 00:02:36 +01:00
Christoph Oelckers
5f5fe271f7 - fixed handling of the custom game mode menus in Ion Fury. 
Sadly the scripting which necessitates this all is such a hack that it's probably necessary to fix again if the next project comes along that uses the same kind of "creativity" instead of providing a robust implementation.
 2019-11-27 23:35:12 +01:00
Christoph Oelckers
2c36e986b9 - fixed most issues with Ion Fury's game startup menus. 2019-11-27 22:41:15 +01:00
Christoph Oelckers
8492e3c67a - migrated SW's savegame code to the same containers as the other front ends. 
Fortunately everything here was wrapped in macros so that it was relatively simple to change.
 2019-11-27 19:31:58 +01:00
Christoph Oelckers
3bb46a4d8d Merge branch 'master' into menu_for_real 2019-11-27 18:04:44 +01:00
hendricks266
0a70c5e55f SW: Sanitize all uses of wall.nextwall to prevent OOBs 
git-svn-id: https://svn.eduke32.com/eduke32@8322 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/sw/src/jnstub.cpp
#	source/sw/src/sector.cpp
 2019-11-27 18:04:01 +01:00
hendricks266
ece20928a0 Fix buffer overflow in getclosestcol_lim 
Patch from Nuke.YKT.

git-svn-id: https://svn.eduke32.com/eduke32@8315 1a8010ca-5511-0410-912e-c29ae57300e0
 2019-11-27 18:01:58 +01:00
hendricks266
7698f73b55 Fix tautological comparison in savegame.cpp 
git-svn-id: https://svn.eduke32.com/eduke32@8314 1a8010ca-5511-0410-912e-c29ae57300e0
 2019-11-27 18:01:57 +01:00
Christoph Oelckers
a4a4b230fd - deleted a large batch of code from the menu that is no longer needed. 2019-11-27 17:58:14 +01:00
Christoph Oelckers
723b210c95 - major work on savegame code 
Not tested yet!

* Added a JSON-based header to the savegames so that the unified menu can read from a common data source.
* moved loading and saving of frontend independent data to the wrapper so that support is automatic.
 2019-11-27 00:41:26 +01:00
Christoph Oelckers
3b7aa74c27 - connecting the dots in the menu. Duke Nukem can now start a level. 2019-11-26 23:20:54 +01:00
Christoph Oelckers
46d1f8517a - animated transitions are working. 2019-11-26 22:05:52 +01:00
Christoph Oelckers
a5a0c38474 - removed DObject. 
Just for the menu this can be done much simpler - the entire setup here doesn't work well with the game frontends being compiled as separate modules anyway.
 2019-11-26 21:25:45 +01:00
Christoph Oelckers
1adceb82ef - consolidation of defbinds definitions. 
Putting all the generic definitions in files used by all games greatly reduces the clutter and chance for errors.
 2019-11-26 21:06:43 +01:00
Christoph Oelckers
0f4d80b5d3 Merge branch 'master' into menu_for_real 2019-11-26 19:19:21 +01:00
Christoph Oelckers
abdd807e7f - fixed merge errors. 2019-11-26 19:10:24 +01:00
hendricks266
348ccdfd5b Templatize the branchless negation method used for GV_FLAG_NEGATIVE 
git-svn-id: https://svn.eduke32.com/eduke32@8312 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/build/include/compat.h
 2019-11-26 18:09:00 +01:00
hendricks266
510e737360 SW: Fix "MV_GetVoice(): bad handle" log spam 
git-svn-id: https://svn.eduke32.com/eduke32@8311 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/sw/src/draw.cpp
#	source/sw/src/menus.cpp
 2019-11-26 18:08:43 +01:00
hendricks266
f411b72783 SW: Fix widescreen flickering in end of level screen 
git-svn-id: https://svn.eduke32.com/eduke32@8310 1a8010ca-5511-0410-912e-c29ae57300e0
 2019-11-26 18:06:41 +01:00
hendricks266
1a0b363ded SW: Allow the Run key to Walk when AutoRun is enabled 
git-svn-id: https://svn.eduke32.com/eduke32@8309 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/sw/src/game.cpp
#	source/sw/src/player.cpp
 2019-11-26 18:06:40 +01:00
hendricks266
7fb425aebb SW: Fix non-debug builds on Windows 
git-svn-id: https://svn.eduke32.com/eduke32@8308 1a8010ca-5511-0410-912e-c29ae57300e0
 2019-11-26 18:04:51 +01:00
hendricks266
83cfcb65a8 SW: Update the port credits 
Still far from perfect.

git-svn-id: https://svn.eduke32.com/eduke32@8307 1a8010ca-5511-0410-912e-c29ae57300e0
 2019-11-26 18:04:50 +01:00
hendricks266
9dde07ced9 SW: Copy the sln==1 GetUpperLowerSector case from the editor to the game 
This avoids upper and lower remaining unmodified.

Sector 469 in Seppuku Station causes it!

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

# Conflicts:
#	source/sw/src/brooms.cpp
 2019-11-26 18:04:48 +01:00
hendricks266
a51e91d4e9 SW: Fix keyboard input 
git-svn-id: https://svn.eduke32.com/eduke32@8303 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/duke3d/src/config.cpp
#	source/duke3d/src/menus.cpp
#	source/mact/include/control.h
#	source/mact/src/control.cpp
#	source/sw/src/config.cpp
#	source/sw/src/menus.cpp
 2019-11-26 18:03:13 +01:00
hendricks266
383ecda2b2 SW: Avoid an OOB in GetUpperLowerSector 
git-svn-id: https://svn.eduke32.com/eduke32@8302 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/sw/src/brooms.cpp
 2019-11-26 17:59:30 +01:00
hendricks266
31f8cb4def SW: Fix an assertion failure in palette changing code 
git-svn-id: https://svn.eduke32.com/eduke32@8300 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/build/src/palette.cpp
 2019-11-26 17:59:01 +01:00
hendricks266
fd3ec56827 SW: Fix OOB access when viewing a mirror 
git-svn-id: https://svn.eduke32.com/eduke32@8299 1a8010ca-5511-0410-912e-c29ae57300e0
 2019-11-26 17:58:20 +01:00
hendricks266
2fc49b3489 SW: Fix mouse aiming 
git-svn-id: https://svn.eduke32.com/eduke32@8298 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/sw/src/config.cpp
#	source/sw/src/game.cpp
 2019-11-26 17:58:19 +01:00
hendricks266
46d4855901 Fix the ifcrc token: 0 is a valid CRC32 result! 
git-svn-id: https://svn.eduke32.com/eduke32@8296 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/build/src/defs.cpp
 2019-11-26 17:51:33 +01:00
hendricks266
92a699b7eb SW: Fix enough OOBs to get in-game 
git-svn-id: https://svn.eduke32.com/eduke32@8295 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/sw/src/_functio.h
#	source/sw/src/config.cpp
#	source/sw/src/sector.cpp
 2019-11-26 17:50:55 +01:00
hendricks266
41194f99f9 SW: Fix playing track 0 when entering the sound settings 
git-svn-id: https://svn.eduke32.com/eduke32@8294 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/sw/src/menus.cpp
 2019-11-26 17:49:49 +01:00
Christoph Oelckers
6782d817b7 - reformatting and deletion of unused code. 2019-11-26 17:43:31 +01:00
Christoph Oelckers
0597b4cf12 - enabled the menu transitions. 2019-11-26 00:43:20 +01:00
Christoph Oelckers
2ed598bb6c - menu transition animation added. 2019-11-26 00:29:51 +01:00
Christoph Oelckers
dce633de8b - use a floating point origin in the menu's implementation 
Using fixed point here makes no sense, let's keep that to the code that still lives in the 90's.
 2019-11-26 00:20:21 +01:00
Christoph Oelckers
f2cfad8d9b Merge branch 'master' into menu_for_real 2019-11-25 23:52:39 +01:00
Christoph Oelckers
a74a670c99 -- more work on the menu - episode and skill menus are working in DN3D. 2019-11-25 23:21:51 +01:00
Christoph Oelckers
d73f915c66 - episode menu setup. 2019-11-25 18:41:39 +01:00
Christoph Oelckers
556c61b60b - fixed compile errors. 
(Include dependencies suck, it's time for modules to become an option.)
 2019-11-25 17:19:48 +01:00
Christoph Oelckers
a9ee5940fc - localization wrappers 
Currently a no-op, but if it's in it won't be forgotten later.
 2019-11-25 00:28:59 +01:00
Christoph Oelckers
1f1e39fac0 - consolidation of texts for episode and skill menus 
So far without localization capability - the engine cannot handle it yet.
 2019-11-25 00:02:00 +01:00
Grind Core
0dbf3bbb1e - Custom Dude updates and refactor 
- Player Control updates
- Minor modern types updates
- There was removed GDX prefix for all modern stuff

# Conflicts:
#	source/blood/src/aiunicult.cpp
#	source/blood/src/aiunicult.h
#	source/blood/src/mapedit.cpp
#	source/blood/src/player.h
#	source/blood/src/sfx.h
 2019-11-24 22:38:21 +01:00
Christoph Oelckers
28a05422fc Merge branch 'master' into menu_for_real 2019-11-24 22:31:53 +01:00
Christoph Oelckers
42b3d12630 - Ion Fury's main menu now looks correct. 2019-11-24 22:31:27 +01:00
Christoph Oelckers
6e3bd75b1a - fixed Blood fullscreen tinting. 
The lookup table for blend equations was missing one entry at the start. No idea why this became apparent only now.
 2019-11-24 21:21:31 +01:00
Christoph Oelckers
a4fcf9ee2b - fixed savegame writing for Ion Fury. 
The composite's writers may not be deleted, they are needed for creating the final savegame file.
 2019-11-24 21:21:15 +01:00
Christoph Oelckers
57b542671c - Ion Fury main menu fixes. 2019-11-24 20:40:53 +01:00
Christoph Oelckers
b3b5ac440a - fixed Blood fullscreen tinting. 
The lookup table for blend equations was missing one entry at the start. No idea why this became apparent only now.
 2019-11-24 19:07:23 +01:00
Christoph Oelckers
a96f1b25f7 - fixed recursion issue with menu and CON scripting. 
Curse all those busy loops in the engine.
 2019-11-24 17:52:54 +01:00
Christoph Oelckers
52cfb7fb92 - completely disconnected the old menu from the rest of the game to allow rebuilding the new one. 
Sadly this uncovered a few more places where script events are allowed too broad access to the game state.
 2019-11-23 23:05:24 +01:00
Christoph Oelckers
326d0f5f76 - the new menu displays something. 2019-11-23 17:50:36 +01:00
Christoph Oelckers
9529adb3e1 - font tables moved. 2019-11-23 12:41:13 +01:00
Christoph Oelckers
f2fc3fc2cb - WIP commit. 2019-11-23 12:38:38 +01:00
Christoph Oelckers
ceb07280cf - more work on the menu. 
Duke Nukem's menu title is getting rendered.
 2019-11-22 22:52:11 +01:00
Christoph Oelckers
5f9b57519a - hooked up the menu code so that it can receive events. 
Nothing pretty yet but a start is made.
 2019-11-21 22:31:46 +01:00
Christoph Oelckers
2740913c60 - added a redirection hack for rotatesprite so that it can be transitionally used in the 2D drawer. 2019-11-21 19:30:27 +01:00
Christoph Oelckers
81ddf22d5d - added ZDoom's menu system as a base to build a new menu on. 
# Conflicts:
#	source/CMakeLists.txt
#	source/build/src/engine.cpp
 2019-11-21 18:03:09 +01:00
Christoph Oelckers
4be63d55d3 - added a stripped down version of ZDoom's DObject. 
This only retains the objecct factory feature, but removes the garbage collector which I have no use for.

# Conflicts:
#	source/CMakeLists.txt
 2019-11-21 18:02:22 +01:00
Christoph Oelckers
728635c1c0 - correct application of in_mouseflip flag. 2019-11-20 23:29:13 +01:00
Christoph Oelckers
200f54ad47 - mouse turning works. 2019-11-20 22:50:37 +01:00
Christoph Oelckers
2da4294ba5 - hooked up the event processing for Shadow Warrior, so keyboard input is working now. Mouse movement is not being processed yet. 
Also removed some leftover code from the old input system.
 2019-11-20 22:01:44 +01:00
Christoph Oelckers
caa450dcb9 - debugprintf 2019-11-20 20:07:33 +01:00
Christoph Oelckers
6d40c9202c - deleted a batch of code from engine.cpp which is only needed for the assembly drawers. 2019-11-20 19:33:36 +01:00
Christoph Oelckers
234283ca8a - SW: added validation checks to WallSetup. 
This code wrote to array index -1.
With this change the level finally gets rendered, although it still doesn't work.
 2019-11-19 23:04:22 +01:00
Christoph Oelckers
fd31d4fa6a - replaced 32 bit SDL library - the preincluded one appeared to be broken. 
- fixed main group autochoice.
- fixed uninitialized player links for Shadow Warrior.
 2019-11-19 22:35:52 +01:00
Christoph Oelckers
f24de03501 - fixed auto-picking of game GRPS from the command line. 2019-11-19 21:35:35 +01:00
Christoph Oelckers
557bd201fb - removed unused code. (MDA screen hack - huh???) 
- Shadow Warrior updates from SWP.
 2019-11-19 20:43:11 +01:00
Christoph Oelckers
dc60c7f72e - fixed use of brightmaps. 
Due to the blending they are essentially inactive on translucent content and Duke Nukem heavily abuses this.
 2019-11-15 20:51:02 +01:00
Christoph Oelckers
3e0075a34d - disabled the broken savegame pic code for the GL renderer. 
I have no idea how this is supposed to work, but all it does is create corrupt images, so for now it reverts to the software renderer which generates working 320x200 images.
 2019-11-15 19:07:24 +01:00
Christoph Oelckers
ab9c532d89 - save custom data as JSON. 
This makes it a lot easier to debug and test than binary blobs.
 2019-11-15 18:57:26 +01:00
Christoph Oelckers
619a7541f1 - "fixed" keybinding not responding for all keys. 
This looks like an ImGui bug - it doesn't like two identically labelled buttons on the same page, it seems. I now work around this by using strings with different numbers of spaces. Stupid but effective.
 2019-11-14 22:48:23 +01:00
Christoph Oelckers
def63209be - fixed savegame loading in Blood. 2019-11-14 21:22:42 +01:00
Christoph Oelckers
ba117554b0 - fixed savegame issues. 
Since the code is extremely volatile I changed the setup so that the save is a zip file with the regular snapshot plus all added data as separate entries.
This allows compressing everything properly without savegame breaking interference.

Blood does not yet load its savegames, need to check.
 2019-11-14 21:07:43 +01:00
Rachael Alexanderson
5002dd866c - fix compile on vs2017, change pow2char to static 
- include nullptr check for mapname in music.cpp
 2019-11-13 16:40:08 -05:00
Christoph Oelckers
7f3d00446d - removed the unused File* functions which were the last remaining places to use stdio FILE for reading. 
For writing FILE is mostly fine, but reading should exclusively use FileReader to ensure interoperability with the virtual file system.
 2019-11-13 18:34:05 +01:00
Christoph Oelckers
c6a38faf39 - add savegame support for the statistics and secret hint feature. 2019-11-13 18:23:45 +01:00
Christoph Oelckers
8055d10362 - hooked up the secret hint system 2019-11-13 00:44:33 +01:00
Christoph Oelckers
35bc7f56fc - added secret hint code. 
Not hooked up yet.
 2019-11-12 23:23:22 +01:00
Christoph Oelckers
dee1cba849 - hooked up Blood with the statistics code. 2019-11-12 22:59:51 +01:00
Christoph Oelckers
6ccef7201e - hooked up the statistics code with EDuke and RedNukem frontends. 
Not sure about the end of game conditions, I wasn't able to test that part yet.
 2019-11-12 22:45:11 +01:00
Christoph Oelckers
74ed8fd1d9 - added GZDoom's statistics code 
Not hooked up yet.
 2019-11-12 22:00:33 +01:00
Christoph Oelckers
0bdec4ea2e - fixed: Events were processed as key events without checking their type. 2019-11-12 20:17:17 +01:00
Christoph Oelckers
22ccea8677 - reworked music interface a bit. 
Conmsidering how hard it is in Duke Nukem based games to modify the level music, there is now a setting for this in mussetting.txt to make the job easier and even allow setting level music in Redneck Rampage without replacing game data.
 2019-11-12 00:43:07 +01:00
Christoph Oelckers
022c074ece - fixed brightmaps again - hopefully for real this time. 
The lighting model being used here is not really good for implementing render effect.
 2019-11-11 23:54:09 +01:00
Christoph Oelckers
3be9deb070 - removed the different shadeDiv for Ion Fury. 
This isn't necessary and was apparently caused by a bug that got fixed in the mean time.
 2019-11-11 23:24:31 +01:00
Grind Core
0d82280b87 - Added event initiator for sectors and walls 
- Added dynamic dispersion for custom dude
- Added dynamic attack distance for custom dude
- Added dynamic damage resistance scale for custom dude
- There was some refactor actions performed
- Added player RX channels for triggering the players
- Updates for modern types
- There was added player control modern type which can do a lot things. It's
still WIP
- Other updates and fixes mainly related to gModernMap

Note that your save games will be no longer compatible

# Conflicts:
#	source/blood/src/actor.h
#	source/blood/src/aiunicult.h
#	source/blood/src/db.h
#	source/blood/src/player.h
#	source/blood/src/triggers.h
#	source/blood/src/weapon.cpp
 2019-11-11 22:59:05 +01:00
Grind Core
d79c45584a - No weapon fix 
I just forget to set default values
 2019-11-11 22:54:03 +01:00
Christoph Oelckers
0f2c4f7760 - added stripped down SNDINFO parser so that the music related settings can be specified. 2019-11-11 22:52:07 +01:00
Christoph Oelckers
cee5891409 - so music is finally working but I don't know - adding a second sound backend because the existing one is such a piece of shit is certainly not the best solution. 
I'll probably replace the SDL and DirectSound outputs with OpenAL later - let's hope that the mixer is at least flexible enough to handle that...
 2019-11-11 21:50:20 +01:00
Christoph Oelckers
16a6cd909a - this should work but doesn't... 2019-11-11 20:37:57 +01:00
Christoph Oelckers
51a5fecc02 - something can be heard, but it's crap. 
This sound code is really strange.
 2019-11-11 19:53:06 +01:00
Christoph Oelckers
9782b8180a - removed libxmp. 2019-11-11 19:12:04 +01:00
Christoph Oelckers
ec6ce8b1ec - hooked up ZMusic. 2019-11-11 19:10:46 +01:00
Christoph Oelckers
29d16868c9 - fixed compile errors. 2019-11-11 17:51:30 +01:00
Christoph Oelckers
f6a9bb770d - fixed most issues with newly added music files 2019-11-11 01:01:18 +01:00
Christoph Oelckers
ae06d19008 - added remaining music files to project 2019-11-11 00:31:36 +01:00
Christoph Oelckers
5e95ef5322 - added the rest of GZDoom's music interface. 
This still needs to be integrated.
 2019-11-11 00:23:52 +01:00
Christoph Oelckers
9f9748ede6 - initial ZMusic hookup. 2019-11-10 23:58:51 +01:00
Christoph Oelckers
79561ace09 - use the precalculated or script-specified fade colors, if present. 2019-11-10 21:11:17 +01:00
Christoph Oelckers
5fc81d1bd4 - made brightmaps operational. 
The logic is not yet optimal but at least it works.
 2019-11-10 19:42:26 +01:00
Christoph Oelckers
21ac5e87b5 - added blend table translucency estimation instead of using a lame default. 
- draw fullscreen blends below the console.
- moved all mouse event processing out of the SDL backend to D_PostEvent.
- removed all remaining code for dealing with mouse buttons directly.
 2019-11-10 15:15:14 +01:00
Christoph Oelckers
87acd7fef6 - fixed blend mode for the 2D drawer. 2019-11-10 12:12:15 +01:00
Christoph Oelckers
55018aae7e - fixed mouse scaling 2019-11-10 11:59:22 +01:00
Christoph Oelckers
a1a9770b44 - reworked the FPS display to use ZDoom's fstat class to get rid of the microscopic font it used. 
- changed time display for rendering to exclude VSync and playsim times to get more meaningful information.
 2019-11-10 11:42:25 +01:00
Christoph Oelckers
cae710bd59 - fixed alpha threshold. 
Not only is this a deprecated feature - it also does not work right when complex lighting is at play, it must be done in the shader to get proper results.
 2019-11-10 10:01:31 +01:00
Christoph Oelckers
7e70c217fe - fixed console event processing and added a texture memory calculator. 2019-11-09 23:58:26 +01:00
Christoph Oelckers
672498be1d - hooked up the keybind menu for Blood as well and disabled some obsolete mouse settings. 2019-11-09 22:58:34 +01:00
Christoph Oelckers
39df3d0560 - added 'logfile' CCMD. 2019-11-09 22:27:33 +01:00
Christoph Oelckers
2997bb6292 - the keybinding menu is finally working. 
Obviously the existing menu implementation from Duke Nukem needs to be tossed out at some point, but at least the functionality is there again.
 2019-11-09 22:22:51 +01:00