zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-29 23:42:08 +00:00
Code Issues Projects Releases Packages Wiki Activity
20487 commits 34 branches 63 tags 172 MiB
Commit graph

1134 commits

Author SHA1 Message Date
Christoph Oelckers
052ed5fff7 Merge branch 'master' into powerslave 2019-12-13 20:43:23 +01:00
Christoph Oelckers
264a450bbe - corrected labels for Blood's weapon pickup strings. 2019-12-11 23:52:34 +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
7942bc9490 - completed work on Shadow Warrior main menu. 
This one will definitely be a problem for localization because the font is extremely large.
 2019-12-11 20:35:25 +01:00
Christoph Oelckers
ae0687a300 - exported level strings from Blood and Shadow Warrior to the string table. 2019-12-11 19:36:38 +01:00
Christoph Oelckers
16818d2d71 - exported Shadow Warrior strings to stringtable. 
The MP obituaries are not handled yet, they were only copied but there's no code using them.
 2019-12-09 21:19:05 +01:00
Christoph Oelckers
e62f6cbc20 - weapon and ammo names are now also localizable. 2019-12-09 19:49:36 +01:00
Christoph Oelckers
da1900dc8a - same for inventory pickup messages. 2019-12-09 19:00:30 +01:00
Christoph Oelckers
670c8b1408 - use the quote array to store the key, door and fortune cookie messages in Shadow Warrior. 
This is infinitely better than leaking char pointers.
 2019-12-09 18:40:07 +01:00
Christoph Oelckers
9134bebc46 - use base SWCustom.txt as the default way to define stuff, instead of relying on the hard coded texts. 2019-12-09 17:22:38 +01:00
Christoph Oelckers
ba978ab0d9 - text update and missing includes. 2019-12-09 17:17:15 +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
f2d0665557 - connected the screen size CVAR and slider with Shadow Warrior's internal setting. 2019-12-07 21:39:17 +01:00
Christoph Oelckers
8f90cc8324 - more Shadow Warrior cleanup. 2019-12-07 20:48:16 +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
2ed03214b1 - disable the save option in SW's main menu if no game is running. 2019-12-07 15:07:43 +01:00
Christoph Oelckers
9960b505e8 - added captions to SW's game menus. 
- made Duke Nukem's quote strings localizable.
 2019-12-07 12:42:25 +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
1b9d1943c9 - initialize all dynamic music related menus. 2019-12-05 20:50:19 +01:00
Christoph Oelckers
54177cd27d - added the animated player display. 2019-12-05 19:52:46 +01:00
Christoph Oelckers
98d3cb19c9 - added the miscellaneous options menu. 
This should be the last one, except for the message confirmation screen.
Not all options are implementation backed yet, there's still work to do
 2019-12-05 19:17:44 +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
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
7d1eb74b5e - more menus implemented 2019-12-04 01:38:51 +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
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
d40cdd0af4 - added map definition file for Wanton Destruction add-on. 2019-12-02 21:48:04 +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
3cf6e6eb78 - Ion Fury inventory actions 2019-12-02 12:11:42 +01:00
Christoph Oelckers
2c218349d4 - added control menu contents 2019-12-02 00:43:33 +01:00
Christoph Oelckers
71c2a8f33a - made the main option menu work. 2019-12-02 00:16:48 +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
0fc439a969 - fixed Redneck Rampage ingame menu and added selection validation to the load menu. 2019-11-30 23:59:22 +01:00
Christoph Oelckers
41b116e2f2 - save menu in Duke Nukem is working. 2019-11-30 22:46:00 +01:00
Christoph Oelckers
9d71416a55 - key binding verification. 
Should be correct now, except for a few places which were unified.
 2019-11-30 20:18:42 +01:00
Christoph Oelckers
d474478800 Merge branch 'master' into powerslave 
# Conflicts:
#	wadsrc/static/demolition/demolition.grpinfo
 2019-11-30 01:12:20 +01:00
Christoph Oelckers
8df8fc436a - fixed GRPINFO. 2019-11-30 01:07:47 +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
94b4044d95 - text file update. 2019-11-29 21:06:38 +01:00
Christoph Oelckers
eded45cf98 - fixed GRPINFO. 2019-11-29 20:44:36 +01:00
Christoph Oelckers
a7bbd7324e Merge branch 'master' into menu_for_real 2019-11-29 19:55:16 +01:00
hendricks266
1616ee0c6a - added more SW GRP detection data (from latest VoidSW) 
- added SWCustom.txt from SWP, mainly as reference. What's really needed is one for Wanton Destruction, though.
 2019-11-29 19:51:28 +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
af81141f82 - defined credits and "help" menu for Shadow Warrior 
Credits follows the recent VoidSW change, so the help menu will now take care of the ad screens - provided that someone goes to the console and tries to open it.
 2019-11-29 01:52:21 +01:00
Christoph Oelckers
f1f5d432d0 - adjustment for pulled changes. 2019-11-29 00:51:40 +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
1f1b927b6b - fixed a few issues. 2019-11-28 20:11:27 +01:00
Christoph Oelckers
115675417a Merge branch 'master' into powerslave 2019-11-28 17:07:11 +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
2c36e986b9 - fixed most issues with Ion Fury's game startup menus. 2019-11-27 22:41:15 +01:00
Christoph Oelckers
46d1f8517a - animated transitions are working. 2019-11-26 22:05:52 +01:00
Christoph Oelckers
248c2feba2 - missed one binding definition file. 2019-11-26 21:26:01 +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
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
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
Christoph Oelckers
d7bc013eee - empty templates for the programmatically generated menus 2019-11-24 23:12:58 +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
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
40772d9f0c - making more things compile. 2019-11-24 10:03:19 +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
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
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
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
9f9748ede6 - initial ZMusic hookup. 2019-11-10 23:58:51 +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
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
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
Christoph Oelckers
2d46827ecc font 
- Dear ImGUI test.
 2019-11-07 20:32:49 +01:00
Christoph Oelckers
b6a3a60251 - console output is functional. 2019-11-06 23:40:10 +01:00
Christoph Oelckers
5d31119a49 - fixed the Shadow Warrior menu, but it doesn't do much good. The game appears to be thoroughly broken. 2019-11-06 19:22:14 +01:00
Christoph Oelckers
f252eaffbc - fixed font translation setup. 2019-11-06 00:00:33 +01:00
Christoph Oelckers
d943fe036d - added the ZDoom console and made all needed changes to get it compiled. 2019-11-05 19:57:48 +01:00
Christoph Oelckers
bbf0a73471 - input works again. 2019-11-04 20:29:07 +01:00
Christoph Oelckers
25341c7221 - hook up the buttons. 
This is still just glue code, the Build implementation suffers from poor support for multiple keys bound to a single button so they are due for replacement as soon as input is working again.
 2019-11-04 18:17:14 +01:00
Christoph Oelckers
1b65510bc2 - kaybinds updated, including mouse buttons. 
Joysticks not yet done.
 2019-11-04 00:05:11 +01:00
Christoph Oelckers
dc9d75685e - fixed keybind setup. 2019-11-02 20:13:00 +01:00
Christoph Oelckers
4cf62fca77 - do not load subdirectories of the game directory. They cannot contain anything useful because the original assets never used subdirectories. 
- fixed RRRA game flags.
 2019-11-02 19:12:01 +01:00
Christoph Oelckers
cfca8060ba - gutted cache1d. The old file system is gone, excepr for klistpath, which still gets used in a few places. 
- consolidated the 3 identical S_OpenAudio implementations. The replacement code is disabled for the time being because it needs a rewrite. The replacement logic is uses is a bit too volatile.
- removed the old GRP scan code.
 2019-11-01 22:17:15 +01:00
Christoph Oelckers
7aa9f53a6b - added DEF names to internal grpinfo. 2019-11-01 07:38:56 +01:00
Christoph Oelckers
c6753a3fec - tested and fixed game list loader. 2019-10-31 00:41:56 +01:00
Christoph Oelckers
7f250fc3e8 - WIP on game data search. 2019-10-30 18:09:00 +01:00
Christoph Oelckers
82c844e405 - added GZDoom's resource management classes. 2019-10-28 23:46:15 +01:00
Christoph Oelckers
ef9f50aa12 - extracted all original combat macro texts from the original games. 
Unlike EDuke32 the new config system can handle them per game. Usefulness is another matter, though.
 2019-10-27 00:48:07 +02:00
Christoph Oelckers
db1a9a9363 - the config finally get saved. 
Still with a few errors, though.
 2019-10-26 20:47:37 +02:00
Christoph Oelckers
1e0d49f947 - game starts again. 2019-10-26 13:16:32 +02:00
Christoph Oelckers
f1cdaf6054 - changed mismatching names in the binding files. 2019-10-26 11:32:39 +02:00
Christoph Oelckers
5abc034540 - added a set of left handed key bindings because neither of the offerings is really good for that. 2019-10-26 09:22:49 +02:00
Christoph Oelckers
47acdae8e6 - moved binding files to subdirectory 
- fixed search/replace error.
 2019-10-26 09:05:17 +02:00
Christoph Oelckers
cfaafcede7 - everything compiles again (not tested yet.) 2019-10-26 00:32:49 +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
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
2152780806 - added some hackery to render voxels properly again. 
Something about their data preparation is not right, their depth looks totally off and causes fog to become to dense.
One more reason to reconstruct the renderer in a sane fashion.
 2019-10-19 18:14:13 +02:00
Christoph Oelckers
e2f9e12efb - implemented shade level based depth fading for the true color renderer. 2019-10-19 16:35:06 +02:00
Christoph Oelckers
cd7bbe35a8 - removed all legacy fog code. 2019-10-19 15:52:46 +02:00
Christoph Oelckers
bc986b8054 - make the engine consistently use BGRA data - the internal palettes were still RGBA, which caused problems down the line. 
- increased cache size to 200 MB (Note: The cache really needs to be replaced with something better that can adapt better to a system's RAM size.)
 2019-10-19 10:22:02 +02:00
Christoph Oelckers
00d59459a1 - fixed creation of true color textures and disabled fog in palette mode. 
The fog should go away entirely but in palette mode it made everything too dark.
 2019-10-18 22:09:19 +02:00
Christoph Oelckers
23265ad213 - rework of texture management for models 
Voxels yet to do.
This also removes the redundant texture matrix for the glow texture.
 2019-10-18 14:04:32 +02:00
Christoph Oelckers
179076c4b1 - set up the texture matrix. 2019-10-10 19:46:46 +02:00
Christoph Oelckers
7131fe6c6e - use separate textures for the palswap shade tables. 
This creates a lot less mess than one big texture and also allows easier use of texelFetch in the server which is preferable for data textures.
 2019-10-08 01:08:08 +02:00
Christoph Oelckers
06e9a60190 - nothing 2019-10-08 00:02:37 +02:00
Christoph Oelckers
971d8c7b8d - fixed shade interpolation. 2019-10-07 23:32:58 +02:00
Christoph Oelckers
ddc6f70aee - fixed palette application in shader. 2019-10-07 23:11:59 +02:00
Christoph Oelckers
623511021f - cleaned up the fragment shader and gave it some workable structure. 
Important note here: branches are not the root of all evil - but mangled unreadable code actually is!
 2019-10-06 22:30:27 +02:00
Christoph Oelckers
7185bbad81 - fraqment shader cleanup part one. 2019-10-06 21:23:51 +02:00
Christoph Oelckers
cf30f5560b - upgraded the polymost fragment shader to GLSL 3.3 as well, removing all legacy features from it. 
The only compatibility mode feature left is the main drawer function using glBegin/glEnd but changing that is not as urgent as the rest.
This also cleans up the fog application and adds the exponential fog mode again that somehow got lost over time.
 2019-10-06 12:42:35 +02:00
Christoph Oelckers
3d538b4c8f - use explicit vertex attributes for everything. 
No more glVertex, glTexCoord or glColor calls anywhere.
 2019-10-06 10:46:23 +02:00
Christoph Oelckers
0720ad5fd5 - make all varyings in the polymost shader explicit and declare the surface shader as v3.30 as it already used modern syntax. 2019-10-06 10:29:17 +02:00
Christoph Oelckers
71d132b470 - use explicitly declared matrix uniforms. 
The builtin matrices are no longer available in modern GLSL, preventing an upgrade of the shader.
Also perform better reporting of shader compilation errors.
 2019-10-06 10:19:51 +02:00
Christoph Oelckers
8fd8d0858c - started modernizing the shader. 
This is one unbelievable piece of weird coding based on the 15 year old concept to avoid conditionals at all costs.
As a result the code is totally unreadable and no longer really portable to modern OpenGL.
This has to be done in small pieces.
 2019-10-06 10:07:09 +02:00
Christoph Oelckers
93ad83b380 - use GZDoom's texture backend to read hightile textures. (Hightile tinting code moved to the shader but isn't active yet. 
- remove all code for faking gamma correction through palette manipulated images.
 2019-10-05 21:59:03 +02:00
Christoph Oelckers
3fb5154dc9 - make it work again. 2019-10-05 14:17:59 +02:00
Christoph Oelckers
3c193bb243 - moved the animvpx shader to the backend code. 
This removes the final access to OpenGL from the rest of the source, with the exception of the glFinish call in the swap code.
 2019-10-05 13:38:02 +02:00
Christoph Oelckers
0ee80628a2 - moved documentation out of the Source folder and added surface shader sources. 2019-10-05 13:17:26 +02:00
Christoph Oelckers
644b07b718 - minor fixes. 2019-10-05 12:39:50 +02:00
Christoph Oelckers
d058084c10 - added an engine resource file. 
Currently this only contains the main Polymost shaders and the resources from nblood.pk3.
The latter cannot be used yet because the Build resource management system is too stubborn to add the newly added file without some changes.
It's better to refactor the entire system instead.
 2019-10-04 23:29:00 +02:00