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

246 Commits

Author SHA1 Message Date
nukeykt 61b4fae6e0 Simplify voxel rotation handling 
# Conflicts:
#	source/build/include/mdsprite.h
 2019-09-30 20:31:09 +02:00
nukeykt c00ff59579 Fix enemy respawning. Verified in disassembly 2019-09-30 20:30:57 +02:00
nukeykt 0d2567a808 Backport "bind showkeys" osdcmd crash fix from eduke32 2019-09-30 20:30:56 +02:00
CommonLoon102 ce61c38660 Fixing annoying item use after save game (#192) 2019-09-30 20:30:54 +02:00
nukeykt 402d9b8f02 long -> int 2019-09-25 23:15:43 +02:00
CommonLoon102 216ce4da9b Reverb effect deactivate bugfix (#190) 2019-09-25 23:15:41 +02:00
nukeykt b1713d7e67 Add quickload/save osdcmd 2019-09-25 23:15:40 +02:00
Christoph Oelckers cd920299d0 - moved winbits.cpp to the platform folder and cleaned out unused parts. 2019-09-25 22:38:47 +02:00
Christoph Oelckers 330c80246e - added ZDoom's FArgs class for easier command line checking. 2019-09-23 19:29:25 +02:00
nukeykt 895fb719d9 blooddemohack -> enginecompatibility_mode 2019-09-23 01:30:07 +02:00
CommonLoon102 c2e8cc6607 Do not target teammates (#187) 2019-09-23 01:30:06 +02:00
nukeykt a9fcee742d RFS parser wip 2019-09-23 01:30:05 +02:00
CommonLoon102 3aa0ce5c3a Maphack support (#186) 
# Conflicts:
#	.gitignore
 2019-09-23 01:30:04 +02:00
CommonLoon102 67472623fe Friendly fire related fixes (#184) 2019-09-23 01:29:43 +02:00
CommonLoon102 d19e74b31a Added V1.0x WEAPONS BALANCE multiplayer setting (#185) 2019-09-23 01:29:42 +02:00
Christoph Oelckers 527d99008b - fixed the setup. 
Renamed all elements still referring to zdoom.
removed the frontend specific resource data.
fixed startup dialog to accept ANSI date despite building as Unicode. This needed a bit of hackery because the macros in windowsx.h are not character set sensitive.
 2019-09-23 01:28:18 +02:00
Christoph Oelckers f49284d47c - made Blood start again by commenting out the fade functions which somehow broke during the CMake transition. 2019-09-22 23:55:45 +02:00
Christoph Oelckers 2cbe211e7c - transitioned project to CMake and deleted most of the old build system. 
The EDuke32 and RedNukem frontends are working, Blood isn't yet.

Notes:

many of the CMake variables and its output still refer to zdoom. Before changing that I wanted to make sure to be able to commit something that works.
support code for Windows XP has been entirely removed. On Windows this will only target Vista and up.
the crc32.h header had to be renamed to deconflict from zlib.
several Windows API calls were changed to call the A-versions directly. Weirdly enough there were places that defined their parameters as T types but in a non-working way.
removed some remaining editor files and support for the native software rendering only Windows backend.
in a few simple cases, replaced 'char' with 'uint8_t'. The code as-is depends on chars being unsigned which is non-portable. This needs to be carefully reviewed.
 2019-09-22 23:15:46 +02:00
Christoph Oelckers 0d98e7f256 - put all Blood game code into a namespace. 2019-09-22 08:39:22 +02:00
Christoph Oelckers 55a879fcc0 - put EDuke frontend source into a namespace. 
This commit does not work yet!
 2019-09-21 22:53:00 +02:00
Christoph Oelckers 30c47a8511 - include namespace file in all sources as the very first include. 2019-09-21 20:59:54 +02:00
Christoph Oelckers 92fa2cc030 - removed Mapster launcher images. 2019-09-21 20:28:55 +02:00
Christoph Oelckers 5855886a5f - removed extern "C" from rr and blood folders. 2019-09-21 19:57:41 +02:00
Christoph Oelckers 71b332459b - removed Android and Mapster headers plus raw EDuke assets in Blood folder. 2019-09-21 19:30:20 +02:00
Alexey Khokholov ac8d31e39f Oof, really silly typo 2019-09-21 13:17:01 +02:00
CommonLoon102 93fde9ba43 Fix coop frag count (#183) 2019-09-21 13:17:01 +02:00
Christoph Oelckers 998ac01157 - manual merge of all NBlood changes that couldn't get cherry picked. 2019-09-21 13:02:17 +02:00
CommonLoon102 bc3d2e9aec Fix MSVC compilation (#181) 2019-09-21 11:48:35 +02:00
CommonLoon102 247655a3d7 Don't send or display chat messages which are whitespace only (#180) 2019-09-21 11:48:14 +02:00
CommonLoon102 c0b3e6f99f Don't allow the mouse to steal the focus when typing a save game name (#178) 2019-09-21 11:47:54 +02:00
CommonLoon102 edc6e2c0f7 Friendly fire and keep keys settings for multiplayer (#177) 
# Conflicts:
#	source/blood/src/levels.h
#	source/blood/src/network.h
 2019-09-21 11:47:54 +02:00
CommonLoon102 56365d65ce Don't show team flags and scores when no HUD is displayed (#176) 
# Conflicts:
#	.gitignore
 2019-09-21 11:47:40 +02:00
Jan200101 a28119ae30 Fix Linux compilation 
- replaced stricmp with strcasecmp and strncasecmp
https://linux.die.net/man/3/strcasecmp

- replaced all Microsoft specific types with standard ones

- replaced all instances of MAX_PATH with BMAX_PATH
 2019-09-21 11:47:14 +02:00
CommonLoon102 13a1861c8d Show messages by priority (#175) 
# Conflicts:
#	source/blood/src/triggers.cpp
 2019-09-21 11:46:54 +02:00
nukeykt b13bdf50be RFS parser wip 
# Conflicts:
#	.gitignore
#	platform/Windows/nblood.vcxproj.filters
 2019-09-21 11:46:37 +02:00
CommonLoon102 9be59caef8 Colorful view messages (#173) 2019-09-21 11:45:13 +02:00
CommonLoon102 16e1b39fb3 CTF HUD fixes (#172) 2019-09-21 11:45:12 +02:00
CommonLoon102 61e40bad66 Fix the goonies cheat code and the kGDXItemMapLevel powerup (#171) 2019-09-21 11:44:59 +02:00
CommonLoon102 160c93f0ab Multiplayer suicide message was empty string (#170) 
# Conflicts:
#	.gitignore
 2019-09-21 11:44:59 +02:00
nukeykt 433fd62de5 Purge resource manager cache on level load 2019-09-21 11:41:26 +02:00
nukeykt 3f42df45fd Fix memory issues in resource manager 2019-09-21 11:41:26 +02:00
nukeykt c91a85a353 Use C++ heap for resource manager 
# Conflicts:
#	source/blood/src/actor.cpp
#	source/blood/src/mapedit.cpp
 2019-09-21 11:41:25 +02:00
CommonLoon102 55de5230ca New HUD for CTF (#167) 
# Conflicts:
#	source/blood/src/blood.cpp
 2019-09-21 11:40:59 +02:00
nukeykt 4527da61a2 Ignore dosbox specific command line options 2019-09-21 11:40:44 +02:00
nukeykt 90b005a44a Fix mouse centering in menu 2019-09-21 11:40:44 +02:00
CommonLoon102 3fbb171990 Powerup counter color (#166) 2019-09-21 11:40:43 +02:00
CommonLoon102 4423164ca5 More smooth fadeout for the map title. (#165) 2019-09-21 11:40:43 +02:00
nukeykt 996dfde6d0 Fix compile errors, backport input code for RR 
# Conflicts:
#	platform/Windows/voidsw.vcxproj
#	source/blood/src/controls.cpp
#	source/blood/src/m32common.cpp
#	source/rr/src/actors.cpp
#	source/rr/src/anim.cpp
#	source/rr/src/demo.cpp
#	source/rr/src/game.cpp
#	source/rr/src/gameexec.cpp
#	source/rr/src/global.h
#	source/rr/src/menus.cpp
#	source/rr/src/menus.h
#	source/rr/src/net.cpp
#	source/rr/src/player.cpp
#	source/rr/src/premap.cpp
#	source/rr/src/savegame.cpp
#	source/rr/src/sbar.cpp
#	source/rr/src/screens.cpp
#	source/rr/src/sector.cpp
 2019-09-21 11:39:19 +02:00
nukeykt f6cd86d77e Simplify map title rendering code and enable alpha for classic renderer 2019-09-21 10:54:54 +02:00
Alexey Khokholov 2b443c2eac Account for 16384 sprites for sprite owner value 2019-09-21 10:54:13 +02:00
nukeykt 8b0fb8dfe2 Fix invisible player on mirror 2019-09-21 10:53:27 +02:00
CommonLoon102 e8337c783e Don't change item selection with mouse while scanning for new key bind (#159) 
# Conflicts:
#	.gitignore
 2019-09-21 10:53:17 +02:00
nukeykt d6d8762400 Seamless ROR transition 2019-09-21 10:51:48 +02:00
nukeykt ddf02bda17 Fix GetZRange regression 2019-09-21 10:51:47 +02:00
nukeykt 7a9209d857 Fix compile error 
# Conflicts:
#	source/blood/src/ai.cpp
#	source/blood/src/aiunicult.cpp
#	source/blood/src/blood.cpp
#	source/blood/src/choke.cpp
#	source/blood/src/credits.cpp
#	source/blood/src/gamemenu.cpp
#	source/blood/src/gamemenu.h
#	source/blood/src/gui.cpp
#	source/blood/src/mapedit.cpp
#	source/blood/src/replace.cpp
 2019-09-21 10:51:29 +02:00
CommonLoon102 9715b2281a extra can be -1 then pointer will point to random (#145) 2019-09-21 10:46:24 +02:00
CommonLoon102 44bcd26fab fix endgame credits listing (#140) 
# Conflicts:
#	.gitignore
 2019-09-21 10:46:12 +02:00
nukeykt 38f2fd209f Use fixed point number for XSPRITE scaling 2019-09-21 10:44:14 +02:00
nukeykt 0dcca3583f Backport frame limiter (again) 
# Conflicts:
#	source/rr/src/game.cpp
 2019-09-21 10:43:45 +02:00
nukeykt 99775a8fe0 Add surface type enum 2019-09-21 10:43:26 +02:00
nukeykt 316ddb1fb5 Mouse quick fix 
# Conflicts:
#	source/blood/src/controls.cpp
 2019-09-21 10:43:26 +02:00
nukeykt fbd3bdb665 Backport new FPS limiter 
# Conflicts:
#	source/rr/src/game.cpp
 2019-09-21 10:40:54 +02:00
nukeykt f87f38b8f0 Always load widescreen def file 2019-09-21 10:40:19 +02:00
nukeykt 0a74187512 Add blood specific parameters to tilefromtexture 2019-09-21 10:40:18 +02:00
nukeykt f6ce571075 Fix improper callback id in FlareBurst. 
Thanks to NoOne for report
 2019-09-21 10:38:47 +02:00
nukeykt e999e2058c Do not mess up random seed in seq/qav 2019-09-21 10:31:34 +02:00
nukeykt 3458a88f8e Backport framelimitter fix 
# Conflicts:
#	source/rr/src/demo.cpp
#	source/rr/src/game.cpp
#	source/rr/src/net.cpp
#	source/rr/src/screens.cpp
 2019-09-21 10:26:47 +02:00
nukeykt 6fea4bf527 Fix compilation on linux 2019-09-21 10:24:13 +02:00
nukeykt 2762044313 Fix interpolation bitmap OOB issue 2019-09-21 10:21:26 +02:00
nukeykt 065cf13945 Fix in CanMove 2019-09-21 10:20:54 +02:00
nukeykt ce43103ae9 Use engine's cstat defines 
# Conflicts:
#	source/blood/src/mapedit.cpp
 2019-09-21 10:18:24 +02:00
nukeykt 9c5cbd6308 Delete pqueue.cpp 2019-09-21 10:18:20 +02:00
nukeykt 1561ffae9e make PriorityQueue template class, and extend index field in EVENT struct 2019-09-21 10:17:04 +02:00
nukeykt e4174d4f2d Extend xobject reference field size to fit 16384 sprites/walls 2019-09-21 10:16:53 +02:00
Grind Core dd79c66f20 Changes in adjustSprites 
# Conflicts:
#	source/blood/src/mapedit.cpp
#	source/build/src/2d.cpp
 2019-09-21 10:15:58 +02:00
nukeykt 599f086fd9 Xobjects editor wip 
# Conflicts:
#	source/blood/src/mapedit.cpp
 2019-09-21 10:13:02 +02:00
nukeykt 2f49b549df Oops 2019-09-21 10:11:02 +02:00
nukeykt 107a630883 Add TROR rendering 
# Conflicts:
#	source/blood/src/mapedit.cpp
#	source/build/include/editor.h
#	source/build/include/polymer.h
#	source/build/src/build.cpp
#	source/build/src/polymer.cpp
 2019-09-21 10:11:02 +02:00
nukeykt 1fe344d273 Free cstat bit 14 
# Conflicts:
#	source/blood/src/mapedit.cpp
#	source/build/src/build.cpp
#	source/build/src/engine.cpp
#	source/duke3d/src/astub.cpp
 2019-09-21 10:10:15 +02:00
nukeykt 858da4351c Semi-working map save 2019-09-21 10:08:04 +02:00
nukeykt 140174d1ee Minor tweaks 
# Conflicts:
#	source/blood/src/m32common.cpp
#	source/blood/src/mapedit.cpp
 2019-09-21 10:08:04 +02:00
nukeykt db5c628b34 Fix silly error with yax stuff 2019-09-21 10:07:11 +02:00
nukeykt 2867131c86 Add ability to load blood maps 
# Conflicts:
#	platform/Windows/nmapedit.vcxproj
#	platform/Windows/nmapedit.vcxproj.filters
#	source/blood/src/mapedit.cpp
#	source/build/src/build.cpp
#	source/build/src/engine.cpp
 2019-09-21 10:06:57 +02:00
nukeykt 57e9ff2fbc Move stuff around 
# Conflicts:
#	platform/Windows/nmapedit.vcxproj
#	platform/Windows/nmapedit.vcxproj.filters
#	source/blood/src/config.cpp
#	source/blood/src/config.h
#	source/blood/src/mapedit.cpp
#	source/blood/src/screen.cpp
#	source/blood/src/screen.h
 2019-09-21 10:05:26 +02:00
nukeykt 381f5dcac2 Increase build objects count max size 
# Conflicts:
#	source/blood/src/mapedit.cpp
 2019-09-21 10:04:03 +02:00
nukeykt 4e0a563cfe Add macros.h 2019-09-21 10:03:34 +02:00
nukeykt afff9ce61f wip 
# Conflicts:
#	platform/Windows/nmapedit.vcxproj
#	platform/Windows/nmapedit.vcxproj.filters
#	source/blood/src/blood.cpp
#	source/blood/src/blood.h
#	source/blood/src/gui.cpp
#	source/blood/src/m32def.cpp
#	source/blood/src/m32def.h
#	source/blood/src/m32exec.cpp
#	source/blood/src/mapedit.cpp
 2019-09-21 10:02:46 +02:00
nukeykt 8fd6e0e183 TROR related tweaks 
# Conflicts:
#	source/blood/src/mirrors.cpp
 2019-09-21 09:59:58 +02:00
nukeykt 388bf2665f Enable TROR code and rotated wall cstat bit for blood 2019-09-21 09:59:16 +02:00
nukeykt fb59a49342 Fix mirrors in polymost 2019-09-21 09:50:34 +02:00
nukeykt 75d2e81e98 Move midi stuff to audiolib 
# Conflicts:
#	platform/Windows/eduke32.vcxproj
#	platform/Windows/nblood.vcxproj.filters
#	source/audiolib/include/al_midi.h
#	source/audiolib/include/opl3.h
#	source/audiolib/include/oplmidi.h
#	source/audiolib/src/_al_midi.h
#	source/audiolib/src/_oplmidi.h
#	source/audiolib/src/al_midi.cpp
#	source/audiolib/src/opl3.cpp
#	source/audiolib/src/oplmidi.cpp
#	source/duke3d/Dependencies.mak
#	source/duke3d/src/sdlmusic.cpp
 2019-09-21 09:37:07 +02:00
Christoph Oelckers 6942d4c50b - added missing #define 2019-09-21 09:33:39 +02:00
Christoph Oelckers afe5128c70 - Blood fixes for changes in timer and mouse input interface- 2019-09-20 22:08:06 +02:00
Christoph Oelckers 20f5972b9b - fixed everything to compile again. 2019-09-20 19:37:29 +02:00
Christoph Oelckers 4189e9d287 - Function renaming 2019-09-20 16:00:14 +02:00
Christoph Oelckers 0254bf82d3 - added NBlood source. 2019-09-20 00:42:45 +02:00