d5c3991c2e
- fixed compile errors in menu code.
2019-11-30 10:03:20 +01:00
3c4c8af20c
Merge branch 'master' into menu_for_real
2019-11-30 09:33:35 +01:00
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
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
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
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
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
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
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
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
8df8fc436a
- fixed GRPINFO.
2019-11-30 01:07:47 +01:00
07ac12110f
- removed some piece of obsolete code merged from upstream.
2019-11-30 01:07:46 +01:00
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
79ce4563eb
- fixed game resuming when closing the load and save menus.
2019-11-30 01:03:14 +01:00
e266044391
- update of load/save menu to latest GZDoom code.
...
Input in save menu working.
2019-11-30 00:49:50 +01:00
94b4044d95
- text file update.
2019-11-29 21:06:38 +01:00
eded45cf98
- fixed GRPINFO.
2019-11-29 20:44:36 +01:00
6d110da209
- removed some piece of obsolete code merged from upstream.
2019-11-29 20:14:45 +01:00
a7bbd7324e
Merge branch 'master' into menu_for_real
2019-11-29 19:55:16 +01:00
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
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
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
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
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
f1f5d432d0
- adjustment for pulled changes.
2019-11-29 00:51:40 +01:00
5590abd471
Merge branch 'master' into menu_for_real
2019-11-29 00:49:33 +01:00
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
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
0cedad6390
- started work on load/save menus.
2019-11-29 00:37:19 +01:00
943cb64eda
- image scroller menus working.
2019-11-28 23:27:10 +01:00
48f62ef1ed
- cleaned out most of menus.cpp for RR.
2019-11-28 20:59:34 +01:00
299314b8a5
- Redneck Rampage menu looks correct.
2019-11-28 20:48:58 +01:00
1f1b927b6b
- fixed a few issues.
2019-11-28 20:11:27 +01:00
59ebb10512
- fixed compilation and unhooked the Redneck Rampage menu so that it can be replaced.
2019-11-28 19:35:35 +01:00
cd4ff92266
- handle Blood.
2019-11-28 03:32:02 +01:00
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
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
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
6ad9c1c0e3
- set up d_menu.cpp for Redneck Rampage
2019-11-28 02:14:30 +01:00
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
b12377962a
- moved the game interface function to d_menu
2019-11-28 01:30:24 +01:00
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
ef3ad690da
- initial work on credits screens.
2019-11-28 00:02:36 +01:00
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
2c36e986b9
- fixed most issues with Ion Fury's game startup menus.
2019-11-27 22:41:15 +01:00
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
3bb46a4d8d
Merge branch 'master' into menu_for_real
2019-11-27 18:04:44 +01:00
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
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
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
hendricks266