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

160 commits

Author SHA1 Message Date
Christoph Oelckers
cacbd7d8b6 - reset YAX data before loading a game. 
This could cause random lockups when loading a savegame for a game not maintaining the feature. The entire engine state really needs to be handled globally instead of repeating this core 5 times...
 2020-01-21 19:14:53 +01:00
Rachael Alexanderson
a637ec60c4 - finally - we have a compile on linux! 2020-01-20 05:46:18 -05:00
Christoph Oelckers
a4d8e68b9f - added an engine credits menu page. 2020-01-15 20:39:41 +01:00
Christoph Oelckers
4aacd6d958 - display the savepics. 
- fixed level name list in Exhumed.
 2020-01-14 22:37:23 +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
238bbd26c1 - fixed: savegame insertion must not move the "New savegame" node at the top. 2020-01-11 23:05:37 +01:00
Christoph Oelckers
17eddda36c - added date and play time display to savegames. 2020-01-11 19:40:35 +01:00
Christoph Oelckers
b8ac5aea84 Merge branch 'master' of https://github.com/coelckers/Raze 2020-01-07 01:11:33 +01:00
Christoph Oelckers
fb985d2503 - more macOS compilation fixes 
Still not complete…
 2020-01-07 01:11:19 +01:00
Christoph Oelckers
2a0104092d - fixed uninitialized variable in savegame name entering menu. 2020-01-06 21:11:59 +01:00
Christoph Oelckers
9e7f91b5ac - fixed size of texture arrays. 
We need 6 slots, not 5.
 2020-01-05 12:56:32 +01:00
Christoph Oelckers
b6862cfd70 - fixed text input menu and y-positioning of option menus. 2020-01-05 12:12:14 +01:00
Christoph Oelckers
746aa4da82 - added a ClearScreen function to the 2D drawer to wrap the frequent occurence of this use case. 2020-01-05 10:48:44 +01:00
Christoph Oelckers
a3020ed867 - don't let joystick/controller axis events register as a keypress for screen advancing. 2020-01-05 10:36:52 +01:00
Christoph Oelckers
73950458d4 - fixed mouse selection for generated menus. 2020-01-03 21:28:01 +01:00
Christoph Oelckers
5cc165587e - added mouse control for image scroller menu. 2020-01-03 20:53:38 +01:00
Christoph Oelckers
4155d49e59 - fixed menu slider rendering. 2020-01-03 20:40:56 +01:00
Christoph Oelckers
39c55199f9 - added a few missing menu things. 2020-01-03 20:37:02 +01:00
Christoph Oelckers
c82d6de6c3 - fixed a few typos and uninitialized variables. 2020-01-03 17:08:41 +01:00
Christoph Oelckers
72036721d5 - made DN3D shareware operable. 
The GRP defines neither episodes nor skills, so they have to be provided internally.
This isn't 100% correct yet, but should do for now.
 2020-01-03 00:44:39 +01:00
Rachael Alexanderson
21ba23f36d - pull most recent video scale changes from gzdoom 2020-01-01 23:42:09 -05: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
51eaa5cd1f - let mouse control in the menu default to Touchscreen-like, like it is in GZDoom. 2019-12-31 02:48:16 +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
f6dee38d28 - route all 2D drawing through the 2D drawer unconditionally. 
This is needed so that the postprocessor receives a clean 3D view to process without messing up the 2D parts.
 2019-12-28 19:10:23 +01:00
Christoph Oelckers
1e16998cac - fixed memory leak in savegame menu. 2019-12-28 13:08:34 +01:00
Christoph Oelckers
68a3a60d0b - Exhumed menu tweaks - draw a background and caption for the option menus the game originally did not have. 
- fixed a crash in the 2D drawer when two consecutively allocated vertex buffers had the same address. Strangely this only occured with Exhumed but not the other games
- fixed Exhumed crashing with sound disabled.
 2019-12-26 17:42:45 +01:00
Christoph Oelckers
6373b75d22 Merge branch 'master' into powerslave 
# Conflicts:
#	source/common/gamecontrol.cpp
#	source/common/version.h
#	wadsrc/static/engine/grpinfo.txt
 2019-12-26 14:46:14 +01:00
Christoph Oelckers
62e9112133 - renamed the internal resource directory to "engine" and routed most literal mentions of the engine name through version.h 
All this comes from a time when I didn't use version.h so it's better to do it the same way as GZDoom to allow easy renaming of the engine.
 2019-12-26 14:04:53 +01:00
Christoph Oelckers
c8edef4e0c - disabled the "User Maps" option pending implementation of a working selection menu for exposing this. 2019-12-26 10:55:43 +01:00
Christoph Oelckers
1a8f11e01d Merge branch 'master' into powerslave 
# Conflicts:
#	source/build/src/sdlayer.cpp
#	source/common/menu/menu.cpp
#	source/sw/src/config.cpp
#	source/sw/src/game.cpp
 2019-12-26 00:21:04 +01:00
Christoph Oelckers
e180d9afd3 Merge commit '40a533402e443a0de1673543642c892ab9c731fd' into powerslave 
# Conflicts:
#	source/audiolib/include/fx_man.h
#	source/audiolib/include/multivoc.h
#	source/audiolib/src/_multivc.h
#	source/audiolib/src/fx_man.cpp
#	source/audiolib/src/multivoc.cpp
 2019-12-25 19:24:55 +01:00
Christoph Oelckers
23bc599468 - fixed recursion issues caused by the plasma generator function performing a busy wait. 2019-12-25 18:57:08 +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
49c49b2672 - read the global settings before presenting the game selection dialog 
- deinit the menu in GameMain instead of using atexit.
- gi == null check must include the call to FreeGameData.
 2019-12-24 20:06:55 +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
6e9631f2d8 - fixed all undefined symbols except OpenGLFrameBuffer. 2019-12-23 10:53:58 +01:00
Christoph Oelckers
3f9657b96a - removed all leftover dependencies on the old sound backend. 2019-12-18 22:24:50 +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
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
957d997353 - made joystick configuration menu operational. 2019-12-14 19:21:49 +01:00
Christoph Oelckers
28cbecea67 - fixed some menu issues. 
The submenus still do not work. Something's off here.
 2019-12-14 13:40:58 +01:00
Christoph Oelckers
cc81b95570 - main menu works in the common framework. 
The rest is messed up, though. This menu is really on an entirely different level of crappiness, even for a 1995 game.
 2019-12-14 12:39:18 +01:00
Christoph Oelckers
7e73073103 - Exhumed menu definition. 2019-12-13 21:44:51 +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
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
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
a05dab66f7 - color tweaking for the options menu. 2019-12-07 15:45:29 +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
ef87d2d4f9 - always pause the game when the console is open. 2019-12-07 10:01:03 +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
a0fe7f4048 - more mouse fixes. Most of the menu is now mouse controllable again. 
The exceptions are the text screens which do not react to the mouse and the confirmation screen which treats a mouse click as a cancel event.
 2019-12-06 00:06:41 +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
db425a1228 - fixed keybinding and mouse cursor display. 
- fixed some merge issues in Shadow Warrior.
 2019-12-05 21:39:02 +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
169d68f583 - fixed stuff and cleaned out most of the old menu code. 2019-12-05 19:00:40 +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
49e0e551d6 - fixed the sliders. 2019-12-03 20:32:35 +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
bc3a921a72 - fixed newly added menu content. 2019-12-02 19:21:45 +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
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
5d0d37df25 - disconnected Blood's menu. 
This is due for replacement next.
 2019-12-01 10:18:38 +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
d5c3991c2e - fixed compile errors in menu code. 2019-11-30 10:03:20 +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
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
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
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
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
6ad9c1c0e3 - set up d_menu.cpp for Redneck Rampage 2019-11-28 02:14:30 +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
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
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
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
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
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