zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,869 Commits 2 Branches 1 Tag 128 MiB
Commit Graph

288 Commits

Author SHA1 Message Date
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
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
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
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
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 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
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
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
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
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
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 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 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