hendricks266
22a778a22c
SW: Don't show the status bar during the end of level screen
...
git-svn-id: https://svn.eduke32.com/eduke32@8353 1a8010ca-5511-0410-912e-c29ae57300e0
2019-12-05 17:23:04 +01:00
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
sirlemonhead
e1dc15d165
Added switch case break and returns for Rex
2019-12-03 17:30:40 +01:00
nukeykt
099a995495
minor branching fix in FuncPlayer
2019-12-03 17:30:39 +01:00
nukeykt
426570729e
Use engine's MAXSECTORS value in MoveRaToEnemy
2019-12-03 17:30:37 +01:00
nukeykt
865ca92b33
Another fish ai fix
2019-12-03 17:30:36 +01:00
nukeykt
0a4129ff56
RandomWord should be unsigned
2019-12-03 17:30:35 +01:00
nukeykt
a0dac5e035
Fix bubbles
2019-12-03 17:30:34 +01:00
nukeykt
d5fd9ba8b4
Fix fish velocity calculation
2019-12-03 17:30:32 +01:00
nukeykt
c783ecbf22
Fix explode trigger seq counter randomization
2019-12-03 17:30:31 +01:00
nukeykt
51a24b3413
Fix demo playback speed
2019-12-03 17:30:30 +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
nukeykt
75789eee50
Fix reading demo file
...
# Conflicts:
# source/exhumed/src/exhumed.cpp
2019-12-02 21:19:25 +01:00
sirlemonhead
7a7a0e16e8
Fix /playback command line argument handling
2019-12-02 21:18:42 +01:00
sirlemonhead
a55a5ef038
Fix laptop static when using OpenGL
2019-12-02 21:18:40 +01:00
sirlemonhead
fae001df77
Even more silencing of compiler warnings
...
# Conflicts:
# source/exhumed/src/aistuff.cpp
# source/exhumed/src/config.cpp
# source/exhumed/src/exhumed.cpp
# source/exhumed/src/status.cpp
2019-12-02 21:18:39 +01:00
sirlemonhead
2e28647e31
Silence some more compiler warnings
2019-12-02 21:17:05 +01:00
sirlemonhead
c4b9137ee1
Silence compiler warnings about intentional switch fallthrough
2019-12-02 21:17:03 +01:00
sirlemonhead
5b82f519ff
Add some timing code to the Laptop scene to control the playback speed. This speed isn't likely exact to the original - might need to verify this on one of my old machines.
...
# Conflicts:
# source/exhumed/src/menu.cpp
2019-12-02 21:17:02 +01:00
sirlemonhead
33eeb3956f
Amend previous spider and lion code slightly.
2019-12-02 21:16:13 +01:00
sirlemonhead
9e44478467
Add another invalid target sprite index check for Spider (and made the lion check more consistent to other code)
...
# Conflicts:
# source/exhumed/src/lion.cpp
# source/exhumed/src/spider.cpp
2019-12-02 21:16:03 +01:00
Christoph Oelckers
51083f6d51
Merge branch 'master' into powerslave
2019-12-02 21:14:08 +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
sirlemonhead
81dce2d2fe
Amend previous spider and lion code slightly.
2019-12-01 00:02:56 +01:00
sirlemonhead
eecb503207
Tidy anims.cpp somewhat
2019-12-01 00:02:53 +01:00
sirlemonhead
a7e09febe4
Add another invalid target sprite index check for Spider (and made the lion check more consistent to other code)
2019-12-01 00:02:51 +01:00
sirlemonhead
66e3a53991
Fix another potential index of sprite array by -1
2019-12-01 00:02:49 +01:00
sirlemonhead
ceccc0c2ee
Fix an issue where the game attempts to index sprite array with -1. This occurs when runlist_DamageEnemy() is called when no source sprite for the damage is specified (an enemy burning in lava??). The game passes -1 for the 2nd parameter to this function call, and then attempts to index sprite array. Added check. Hopefully fixes crashing on the final level?
2019-12-01 00:02:46 +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
d474478800
Merge branch 'master' into powerslave
...
# Conflicts:
# wadsrc/static/demolition/demolition.grpinfo
2019-11-30 01:12:20 +01:00
sirlemonhead
7b60bfdb95
Fix infinite loop in DimLights(). Should fix game locking up when finishing the final level.
2019-11-30 01:09:58 +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
sirlemonhead
cdf44030d7
Silence nPlayerSprite check in DoKenTest() as this can fail in valid situations, such as in RestartPlayer() while the player is still being set up.
2019-11-29 00:39:24 +01:00
sirlemonhead
de5aa31674
Fix issue causing voodoo doll of player appearing when selecting No to starting Training when already in a level. Fixes issue #20
2019-11-29 00:39:23 +01:00
sirlemonhead
1928f3fbc1
Change cheat screen messages to not display player number - are cheats usable outside of single player?!. Also removed a redundant message in FillWeapons() which got overwritten immediately anyway
2019-11-29 00:39:22 +01:00
sirlemonhead
e115058cd3
Rewrote music playback to be more sensible. Hopefully this will get rid of the crashes that the handful of people reported. Needs to be fully tested.
...
Also, not sure what to do re: map screen. OG seems to keep playing the currently playing track, which seems slightly janky? should we just play track 19?
# Conflicts:
# source/exhumed/src/cd.cpp
# source/exhumed/src/cd.h
2019-11-29 00:39:20 +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
115675417a
Merge branch 'master' into powerslave
2019-11-28 17:07:11 +01:00
nukeykt
acc8f01269
Shifting is not needed here
2019-11-28 17:06:55 +01:00
nukeykt
6f4a6daaa2
Scale status text
2019-11-28 17:06:54 +01:00
sirlemonhead
ca80125aba
Set bShowTowers back to it's default value
...
# Conflicts:
# source/exhumed/src/map.cpp
2019-11-28 17:06:53 +01:00
sirlemonhead
c7e3aa4b46
Changed the order of some variable assignment in ThrowGrenade() to match disassembly. Don't think it really makes a difference?
2019-11-28 17:06:20 +01:00
sirlemonhead
2dddf19ce7
Add shade flash highlight for currently selected Load Game name
2019-11-28 17:06:18 +01:00
sirlemonhead
f56dd9a3e1
Fix incorrect bitwise OR operation in CheckSectorSprites()
2019-11-28 17:06:17 +01:00
sirlemonhead
8b9f15d5ea
Fix DoAfterCinemaScene() not calling GoToTheCinema()
2019-11-28 17:06:16 +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
7cbe9615ea
- fixed merge error.
2019-11-26 19:15:44 +01:00
nukeykt
1b0a036995
Add fov cvar
...
# Conflicts:
# source/exhumed/src/config.cpp
# source/exhumed/src/osdcmds.cpp
2019-11-26 19:13:48 +01:00
sirlemonhead
82767751a7
Fix credits screen
...
# Conflicts:
# source/exhumed/src/exhumed.cpp
2019-11-26 19:12:52 +01:00
sirlemonhead
f34507813f
Add some error handling for music playback
2019-11-26 19:12:22 +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
sirlemonhead
aba3e85c8e
Fix player taunt frequency (and there was much rejoicing)
2019-11-25 23:24:20 +01:00
sirlemonhead
979f40f900
Fix missing angle mask for Anubis AI
2019-11-25 23:24:18 +01:00
sirlemonhead
803f22904b
Fix Ramses head being all tiny
...
# Conflicts:
# source/exhumed/src/exhumed.cpp
2019-11-25 23:24:17 +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
sirlemonhead
326947d976
Initial music playback support code
...
# Conflicts:
# source/exhumed/src/cd.cpp
# source/exhumed/src/cd.h
2019-11-24 22:39:25 +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
28294c8a96
- use symbolic constants.
2019-11-24 16:37:31 +01:00
Christoph Oelckers
11b8017752
- Exhumed compiles without errors.
2019-11-24 16:34:23 +01:00
Christoph Oelckers
8d11990494
- more work on making Exhumed compile.
...
Almost done, down to 20 compile errors.
2019-11-24 13:59:36 +01:00
Christoph Oelckers
40772d9f0c
- making more things compile.
2019-11-24 10:03:19 +01:00
Christoph Oelckers
6280b0b516
- started fixing things.
2019-11-24 00:04:15 +01:00
sirlemonhead
9ce8d5156c
Fix missing text under laughing skull.
2019-11-23 23:37:33 +01:00
nukeykt
524d0dd496
Fix buffer overflow in getclosestcol_lim
2019-11-23 23:37:32 +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
0ad7f25a8a
- added project and namespace wrappers to all Exhumed files.
2019-11-23 00:11:37 +01:00
Christoph Oelckers
762ade3fd8
- we do not need this.
2019-11-22 23:06:22 +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
nukeykt
af5f5aad77
Fix compiling errors
...
# Conflicts:
# platform/Windows/pcexhumed.vcxproj
# source/platform/win32/startwin.game.cpp
2019-11-22 17:41:30 +01:00
nukeykt
a55ea9a55c
Fix black screen issue after training level
2019-11-22 17:39:31 +01:00
sirlemonhead
3977c3e3bd
Check for a valid return value from BuildBullet() in FuncTrap() before trying to use it. Will need to check all instances of BuildBullet() return value uses as original game doesn't seem to check if they're valid before using them to index arrays.
2019-11-22 17:39:30 +01:00
Christoph Oelckers
ff3dec2f08
- looks like I missed one commit...
2019-11-22 00:17:59 +01:00
nukeykt
c1ad44bcc9
Remap screenshot key to F12
2019-11-22 00:14:59 +01:00
nukeykt
cd74f50e8c
Fix silly error with gamefunctions data
2019-11-22 00:14:58 +01:00
nukeykt
47b8dd509b
Properly read settings from cfg
2019-11-22 00:14:56 +01:00
nukeykt
2fe0a6c496
Properly save cfg files on exit
2019-11-22 00:14:55 +01:00
nukeykt
e626db8ce5
Parse exhumed.def if available
2019-11-22 00:14:54 +01:00
nukeykt
f3069bbe4f
Fix movie in opengl
2019-11-22 00:14:53 +01:00
NY00123
2da94d33e8
Bring startgtk fixes from EDuke32 rev. 8134 into exhumed
2019-11-22 00:14:52 +01:00
sirlemonhead
3073f1780d
Show BMG or PIE publisher logos and Exhumed or PowerSlave graphics depending on which DAT/GRP file is used.
2019-11-22 00:14:50 +01:00
nukeykt
0f874f6979
Disable intro fade effects for opengl mode
2019-11-22 00:14:49 +01:00
NY00123
27a3945583
Forgotten this comment in preceding demo-related commit
2019-11-22 00:14:48 +01:00
NY00123
e38dcc7c5f
Exhumed: Disable demo playback for now
2019-11-22 00:14:47 +01:00
nukeykt
7660d74713
Unifdef HandleAsync in input.cpp
2019-11-22 00:14:45 +01:00
nukeykt
fc3ba66cb1
Rename app name to pcexhumed
...
# Conflicts:
# GNUmakefile
# platform/Windows/eduke32.sln
# platform/Windows/pcexhumed.vcxproj
# platform/Windows/pcexhumed.vcxproj.filters
2019-11-22 00:14:43 +01:00
sirlemonhead
be65a9863b
Add License header to .h and .cpp files
2019-11-22 00:13:44 +01:00
sirlemonhead
6cb4456c91
Slow down the cinema text scroll speed a bit
2019-11-22 00:13:42 +01:00
sirlemonhead
f22d6b275b
Working towards fixing Energy Towers. Tower texture should now animate but explosion effect still doesn't render when the tower is destroyed.
2019-11-22 00:13:41 +01:00
nukeykt
c261f76e5f
Automap improvements using code from eduke32
2019-11-22 00:13:40 +01:00
nukeykt
73a3be9aa1
Clean up and fix snake code
2019-11-22 00:13:39 +01:00
nukeykt
7e7f74206d
Fix flamethrower light rotation
2019-11-22 00:13:38 +01:00
nukeykt
f445dd45d7
Fix erroneous condition in FuncQueenHead
2019-11-22 00:13:36 +01:00
nukeykt
cf389bf3ef
Clean up and some fixes for Queen ai code
2019-11-22 00:13:35 +01:00
sirlemonhead
4ca74ee06a
Queen AI fixes. Still need to check Head and Egg code.
2019-11-22 00:13:34 +01:00
nukeykt
6da91a4c1f
Fix rex animation speed
2019-11-22 00:13:33 +01:00
nukeykt
e65d2ef4f4
Fix cobra venom bowl damage
2019-11-22 00:13:31 +01:00
nukeykt
cabf25bc8b
Detabulate gun.cpp
2019-11-22 00:13:30 +01:00
nukeykt
9048c0a75c
Fix CheckCloseRange return value
2019-11-22 00:13:29 +01:00
sirlemonhead
eded50e873
Fix Set angle miscalculation
2019-11-22 00:13:28 +01:00
sirlemonhead
21459b4ba8
Fix Fish AI. Was miscalculating yvel (too many shifts)
2019-11-22 00:13:27 +01:00
sirlemonhead
69a6715997
Added Wall effect tag 20
2019-11-22 00:13:25 +01:00
sirlemonhead
87ef1331d9
Fix the Roach/Kilmaat sentry being unkillable. I was missing the line in BuildRoach() to set it's sprite's cstat value
2019-11-22 00:13:24 +01:00
sirlemonhead
fe24913d63
Hopefully finally fixed Lion AI. Should now attempt to go underground when shot
2019-11-22 00:13:23 +01:00
nukeykt
eb456e0dda
Fix flow texture panning
2019-11-22 00:13:22 +01:00
nukeykt
c970aebb54
Fix invalid sector sound
2019-11-22 00:13:20 +01:00
nukeykt
337dea13e6
Add FPS counter
2019-11-22 00:12:57 +01:00
sirlemonhead
19dfc45321
Fix set AI. Shouldn't die so quickly now.
2019-11-22 00:12:56 +01:00
sirlemonhead
c365a79f81
Fix asserts firing for some sector tags. This code now handles cases where the effects aren't set up correctly in the .map file - a floor/ceiling is not in the expected starting position. The nextsectorneighborz() function would end up returning -1 but the game would use this value to index the sector array. It seems the developers were lucky and this resulted in the correct value being returned regardless.
2019-11-22 00:12:55 +01:00
nukeykt
6fef06453c
Fix shadows in polymost
2019-11-22 00:12:54 +01:00
nukeykt
c2594ec4ea
Fix background box drawing in Query
2019-11-22 00:12:52 +01:00
nukeykt
99a7195f5f
Fix water splash sound
2019-11-22 00:12:51 +01:00
nukeykt
92dc6be003
Fix training level start from ingame menu
2019-11-22 00:12:50 +01:00
nukeykt
74e5b77982
Fix loadgame menu closing causing training level start
2019-11-22 00:12:49 +01:00
nukeykt
62ccf7712a
Fix game pause
2019-11-22 00:12:47 +01:00
sirlemonhead
7049070721
Misc warning fixes (removed unused variables)
2019-11-22 00:12:46 +01:00
nukeykt
2f1a53e5c4
Fix weapon pickup sound
2019-11-22 00:12:45 +01:00
nukeykt
cd6bbd96a7
Fix push sector sound
2019-11-22 00:12:44 +01:00
nukeykt
f7fbcd09b4
Fix player taunts playing at full volume
2019-11-22 00:11:31 +01:00
nukeykt
7173ca9db9
Play correct sound on opening menu
2019-11-22 00:11:30 +01:00
sirlemonhead
2e6459d2f6
Fix Mummy's special red fireball attack - it wasn't turning the player into a Mummy
2019-11-22 00:11:29 +01:00
sirlemonhead
03f6b4c9ec
Remove test assert
2019-11-22 00:11:28 +01:00
nukeykt
53c6e40d6d
Fix some gcc related issues
2019-11-22 00:11:26 +01:00
NY00123
cab17d9ff7
CONFIG_ReadSetup should return some value
2019-11-22 00:11:25 +01:00
NY00123
3d82a745b3
exhumed.cpp: Comment out the "socket" variable and code that uses it.
...
This variable conflicts with library function named "socket".
2019-11-22 00:11:24 +01:00
sirlemonhead
7182190464
Fix multiplayer items instantly regenerating. Fixes issue #15
2019-11-22 00:11:17 +01:00
nukeykt
708a6ecba6
Fix linux compiling
2019-11-22 00:11:16 +01:00
nukeykt
e4c1d0e7c8
Add checks for invalid sound that can cause crash
2019-11-22 00:11:14 +01:00
nukeykt
7095abf5c1
Add startgtk.game.cpp and fix minor compiling error
2019-11-22 00:11:13 +01:00
nukeykt
0eee7776e7
GNU makefile, for some reason mingw build crashed upon start
...
# Conflicts:
# GNUmakefile
2019-11-22 00:11:12 +01:00
nukeykt
291d7fd888
Fix procedural fire effect seed
2019-11-22 00:10:46 +01:00
nukeykt
1dbc06bfa0
Reset timer after closing menu
2019-11-22 00:10:44 +01:00
nukeykt
5a19f5cd4d
Do not hide player sprite and temporarily disable interpolation in 3rd person mode
2019-11-22 00:10:43 +01:00
sirlemonhead
f0441860df
Fix Kilmaat Sentry AI processing. Fixes issue #14
2019-11-22 00:10:42 +01:00
sirlemonhead
a216d8745e
Fix incorrect Wasp type being set. Will fix incorrectly sized Wasps (and behaviour?)
2019-11-22 00:10:41 +01:00
nukeykt
12fd1318d9
Fix player sprite appearing on water surface
2019-11-22 00:10:39 +01:00
nukeykt
688fa2e778
Interpolate bob angle
2019-11-22 00:10:38 +01:00
nukeykt
aff6ef67c0
Interpolate eye level
2019-11-22 00:10:37 +01:00
nukeykt
590a165e16
Enable old collision
2019-11-22 00:10:36 +01:00
nukeykt
5b50236d18
Fix movement issues when emulating old engine code
2019-11-22 00:10:35 +01:00
nukeykt
d7b9af8b89
Fix player bouncing on sprite bridges
2019-11-22 00:10:33 +01:00
nukeykt
ed81a1c3fe
Temporarily disable old collision code
2019-11-22 00:10:32 +01:00
nukeykt
bef08f4442
Fix getflor/ceilingofslope_old
2019-11-22 00:10:31 +01:00
nukeykt
6b6ecaf0fa
Fix silly typo in cansee
2019-11-22 00:10:30 +01:00
nukeykt
525400d36c
Fix Ramses head in polymost
2019-11-22 00:10:28 +01:00
nukeykt
cb0e728722
Disable interpolation for ramses head scene
2019-11-22 00:10:27 +01:00
nukeykt
6f9cdaccfc
Fix annoying bug with ambient creature sound timer
2019-11-22 00:03:13 +01:00
nukeykt
4e21cf5cbf
Start adding view interpolation using code from duke3d
2019-11-22 00:03:11 +01:00
nukeykt
6378082339
Fix palette issues with cinema code
2019-11-22 00:03:10 +01:00
sirlemonhead
f04de71065
Fix moving sector trail point bug. Sectors should now move on the correct path.
2019-11-22 00:03:09 +01:00
nukeykt
e7ee9cf722
Add exhumed grp detection
2019-11-22 00:03:08 +01:00
nukeykt
0e52ea85cc
Add missing grpscan.*
2019-11-22 00:03:06 +01:00
sirlemonhead
f0b1a37615
Fix Cinema screens not showing correct cinemas on the correct levels
2019-11-22 00:03:05 +01:00
sirlemonhead
85dec18ee7
Fix branching in Lion AI code
2019-11-22 00:03:04 +01:00
sirlemonhead
102076dc5f
Fix arrow trap - arrows were appearing to shoot out side-on
2019-11-22 00:03:03 +01:00
sirlemonhead
697948fdf0
Fix keys not opening locked doors
2019-11-22 00:03:02 +01:00
nukeykt
5298e97fc5
Add GRP/DEF code from eduke32
...
# Conflicts:
# platform/Windows/exhumed.vcxproj
# platform/Windows/exhumed.vcxproj.filters
# source/platform/win32/startwin.game.cpp
2019-11-22 00:03:00 +01:00
nukeykt
1dd696df18
Initial work on input code improving
2019-11-22 00:00:08 +01:00
sirlemonhead
825b643370
Fixed code in LavaDude AI that would cause a switch break to be missed
2019-11-22 00:00:07 +01:00
sirlemonhead
911330ed37
Tidied up door handling key. Removed some repeated code and commented-out code
2019-11-22 00:00:06 +01:00
sirlemonhead
bff4d2b65d
Fix branching in Queen Egg AI
2019-11-22 00:00:04 +01:00
sirlemonhead
bb821cf759
Fixed code in Set AI that would cause a switch break to be missed
2019-11-22 00:00:03 +01:00
sirlemonhead
223d83e7be
Fixed incorrect SEQ index, causing the Cobra staff to appear briefly when changing from grenade to M-60. Fixes issue #6 .Also renamed a player field from field_34 to field_3FOUR to better visually differentiate it from field_3A
2019-11-22 00:00:02 +01:00
sirlemonhead
0dbb073b0a
Fix typo in savegame file name in menu_GameLoad(). Have made this a macro now.
2019-11-22 00:00:01 +01:00
sirlemonhead
ec2f8715fc
Fix branching bug that prevented the main menu from appearing. Also removed early return from DoTitle() so this function now runs. Have temporarily disabled the title screens for now by setting 'doTitle' to false. This has now made a new bug appear that causes the plasma effect to not display correctly - this is due to totalclock being 0 when menu_DoPlasma() is first called, resulting in nRandom being set to 0.
2019-11-21 23:59:59 +01:00
nukeykt
941e47cc61
Start rewriting input code
2019-11-21 23:59:58 +01:00
nukeykt
4dcde5dde7
Fix air meter in status bar
2019-11-21 23:59:57 +01:00
nukeykt
308885d92c
Fix and improve background drawing code
2019-11-21 23:59:56 +01:00
nukeykt
308f36d0e8
Make screensize independent on screen resolution
2019-11-21 23:59:55 +01:00
nukeykt
eea4fa80f1
Rough approximation of PLUs using gl fog
...
This includes GLOBAL_NO_GL_TILESHADES fix from Fox
# Conflicts:
# source/build/include/polymost.h
# source/build/src/palette.cpp
# source/build/src/polymer.cpp
# source/build/src/polymost.cpp
# source/build/src/polymost1Frag.glsl
2019-11-21 23:59:53 +01:00
nukeykt
200cfa45f5
Fix torch palette remapping
2019-11-21 23:52:33 +01:00
sirlemonhead
1a01ee6130
Fix (most) issues with status bar. Health markers and animations should now work. Air gauge still needs to be fixed.
2019-11-21 23:52:32 +01:00
sirlemonhead
5acd37d3ee
Fix crash when pressing enter in Holly mode without typing anything (empty string buffer)
2019-11-21 23:52:31 +01:00
nukeykt
c2f30de350
Use correct formula for bullet hitscan
2019-11-21 23:52:29 +01:00
nukeykt
d85c5d8dd8
This should be unsigned
2019-11-21 23:52:28 +01:00
nukeykt
e948d78fd0
Backport horiz correction code for polymost
...
# Conflicts:
# source/build/include/polymost.h
# source/build/src/polymost.cpp
2019-11-21 23:27:12 +01:00
nukeykt
ff6820aa92
Rework green palette and torch effects to not modify palookup array
...
In other words make these effects polymost friendly
2019-11-21 23:22:41 +01:00
sirlemonhead
e0255789da
Set Queen health to correct values. Had been lowered for testing purposes.
2019-11-21 23:22:39 +01:00
sirlemonhead
c06526f24b
Fix typo in RefreshBackground(), for viewable area resizing
2019-11-21 23:22:38 +01:00
nukeykt
aa4bf2bb26
Fix palette corruption
2019-11-21 23:22:37 +01:00
sirlemonhead
11845bb247
World map code fixes and tidying. Should now work correctly. Fixes issue #4
2019-11-21 23:21:38 +01:00
nukeykt
57ae890140
More gl related palette fixes
2019-11-21 23:21:37 +01:00
nukeykt
aa922dcd25
Implement tint in gl modes
...
# Conflicts:
# source/build/include/palette.h
# source/build/src/palette.cpp
# source/build/src/sdlayer.cpp
# source/build/src/sdlayer12.cpp
# source/build/src/winlayer.cpp
2019-11-21 23:21:35 +01:00
nukeykt
2ef835fcb8
Rework palette related code. This fixes black screen issue with polymost
2019-11-21 23:19:38 +01:00
nukeykt
89552466d3
Fix sprite shading, cleanup analyzesprites
2019-11-21 23:19:37 +01:00
nukeykt
54621d20d2
Add widescreen aspect correction
2019-11-21 23:19:36 +01:00
sirlemonhead
1dda8027ab
Fix Sector effect Lotag 24 not working. Fixes issue #5
2019-11-21 23:19:35 +01:00
sirlemonhead
0f383cbe5c
Revert "Fix Issue #5 "
...
This reverts commit 800a900958ce66c7f16c2381e0612f4aaa0ff9af.
2019-11-21 23:19:34 +01:00
sirlemonhead
14fc2a76cf
Fix Issue #5
...
Was incorrectly passing floorz instead of ceilingz to BuildElevC()
2019-11-21 23:19:32 +01:00
nukeykt
d4bdf01958
Fix bullets
2019-11-21 23:19:31 +01:00
nukeykt
83a4485140
Clean up bullet code a bit
2019-11-21 23:19:30 +01:00
nukeykt
a1ce0830db
Clipmask fix
2019-11-21 23:18:14 +01:00
nukeykt
e9d2a25f7f
Add exhumed collision emulation
2019-11-21 23:14:42 +01:00
nukeykt
721ab04da1
Fix sound pitch shifting
2019-11-21 23:10:19 +01:00
nukeykt
bda7eb58f2
Uncomment sound calls
2019-11-21 23:10:18 +01:00
nukeykt
fe7cbf87b7
Sound code fixes
2019-11-21 23:10:17 +01:00
sirlemonhead
213437deea
Fixed incorrect code flow in menu_NewGameMenu() function.
2019-11-21 23:10:16 +01:00
sirlemonhead
b97c9d119c
Revert "Fixed incorrect code flow in menu_NewGameMenu() function."
...
This reverts commit e3926772d1f80ea64450d6bda0bd281345a21b2f.
2019-11-21 23:10:14 +01:00
sirlemonhead
df4d4cc009
Fixed incorrect code flow in menu_NewGameMenu() function.
2019-11-21 23:10:13 +01:00
sirlemonhead
9d5a6ac807
Fix lava floor and crushing ceilings not damaging the player. Fixes issues #2 and #3
2019-11-21 23:10:12 +01:00
nukeykt
bf07930b8c
wip
2019-11-21 23:10:11 +01:00
nukeykt
6c9e6a3bfc
Sound wip
...
# Conflicts:
# source/audiolib/include/fx_man.h
# source/audiolib/include/multivoc.h
2019-11-21 23:09:04 +01:00
nukeykt
6f0163af45
Add reverse engineered sound code
2019-11-21 23:06:53 +01:00
nukeykt
67f370f17c
Fix compile error
2019-11-21 23:05:08 +01:00
nukeykt
48d95eee00
Fix skies
2019-11-21 23:01:38 +01:00
nukeykt
3b40420b84
Hopefully fix overwritesprite issues
2019-11-21 23:01:37 +01:00
nukeykt
664596e369
clean up GetLocalInput
2019-11-21 23:01:35 +01:00
nukeykt
a00d0f5986
Fix level restart
2019-11-21 23:01:34 +01:00
nukeykt
0023ae625d
Make status bar code polymost friendly
2019-11-21 23:01:33 +01:00
nukeykt
48b9ca7f7f
Minor fixes
2019-11-21 23:01:32 +01:00
nukeykt
b13e57efa4
Clean up game loop function
2019-11-21 23:01:31 +01:00
nukeykt
6b2ebdd444
Fix input, fix menu crash
2019-11-21 23:01:29 +01:00
nukeykt
c458223f9d
Fix level loading
2019-11-21 23:01:28 +01:00
nukeykt
708483ca78
wip
2019-11-21 22:59:46 +01:00
nukeykt
e0858d501c
Game compiles now
...
# Conflicts:
# platform/Windows/exhumed.vcxproj
# platform/Windows/exhumed.vcxproj.filters
2019-11-21 22:59:45 +01:00
nukeykt
50349a6b3d
wip
...
# Conflicts:
# platform/Windows/exhumed.vcxproj
# platform/Windows/exhumed.vcxproj.filters
# source/build/include/build.h
# source/build/src/palette.cpp
2019-11-21 22:59:33 +01:00
nukeykt
738aca5fe9
wip
2019-11-21 22:54:42 +01:00
nukeykt
936ce5a866
wip
...
# Conflicts:
# platform/Windows/exhumed.vcxproj
# platform/Windows/exhumed.vcxproj.filters
2019-11-21 22:52:46 +01:00