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

892 commits

Author SHA1 Message Date
Christoph Oelckers
cdc5044f07 - converted noautoload and forcesetup flags to CVARs. 2019-10-27 09:38:55 +01:00
Christoph Oelckers
4b5ec2aabb - transitioned the combat macros to the new config and made them independent for all games, so that everything can use the original text. (But considering that they are a multiplayer feature I'm not sure how much that is worth.) 
- sort the config output alphabetically.
- do not use [=] as key names for the bindings.
 2019-10-27 08:14:58 +01:00
Christoph Oelckers
249f6e9d62 - consolidated the joystick and mouse setup code. 2019-10-26 23:45:55 +02:00
Christoph Oelckers
b2d7179dbe - consolidated the 4 sets of mouse and joystick configuration variables. 2019-10-26 21:50:49 +02:00
Christoph Oelckers
db1a9a9363 - the config finally get saved. 
Still with a few errors, though.
 2019-10-26 20:47:37 +02:00
Christoph Oelckers
cd47582632 - disabled the settings.cfg console script so that the newly added config code can take over its duties. 
- write the console log to the folder returned by M_GetDocumentsPath and not to the root game directory.
- removed G_ExtPreInit because it has become redundant. The search path setup will have to be redone anyway.
 2019-10-26 13:41:42 +02:00
Christoph Oelckers
1e0d49f947 - game starts again. 2019-10-26 13:16:32 +02:00
CommonLoon102
bcf3385ddf randomize ejecting brass and shell angle on the ground (#230) 2019-10-26 10:35:15 +02:00
Grind Core
3cd44c89f5 Commented system message in OperateSprite() 2019-10-26 10:35:14 +02:00
Grind Core
b6ad64ee54 Refactor: xsector, xwall and xsprite structs 
- Added QAV scene player (playing user animation instead of weapon)
- Added trigger event intiator for sprites (WIP and experimental)

# Conflicts:
#	source/blood/src/actor.h
#	source/blood/src/player.h
 2019-10-26 10:35:13 +02:00
Christoph Oelckers
1c29169492 -perform a proper exit, i.e. make sure that the deinit code can run, by throwing a special exception and actually catching it in the main function. 2019-10-26 10:30:08 +02:00
Christoph Oelckers
0d878a8604 - some needed cleanup on the control code before testing can start. 2019-10-26 10:16:39 +02:00
Christoph Oelckers
47acdae8e6 - moved binding files to subdirectory 
- fixed search/replace error.
 2019-10-26 09:05:17 +02:00
Christoph Oelckers
cfaafcede7 - everything compiles again (not tested yet.) 2019-10-26 00:32:49 +02:00
Christoph Oelckers
9648c026a9 - small adjustments 2019-10-24 20:36:18 +02:00
Christoph Oelckers
8730ce552b - make things compile again. 
Let's hope it still works...
 2019-10-24 20:28:46 +02:00
nukeykt
df415605ae Use gameHandleEvents for time updating 
# Conflicts:
#	source/blood/src/gui.cpp
 2019-10-24 19:49:57 +02:00
nukeykt
01d63d19e9 Fix crash with WinMM driver 2019-10-24 19:49:51 +02:00
nukeykt
7f094d3a73 Fix music init code 
# Conflicts:
#	source/blood/src/config.cpp
#	source/blood/src/menu.cpp
#	source/blood/src/osdcmd.cpp
 2019-10-24 19:49:50 +02:00
nukeykt
e6f53f7c30 Resolve merge issues 
# Conflicts:
#	GNUmakefile
#	platform/Windows/eduke32.sln
#	platform/Windows/props/build_common.props
#	source/audiolib/include/music.h
#	source/blood/src/blood.cpp
#	source/blood/src/gui.cpp
#	source/blood/src/mapedit.cpp
#	source/blood/src/sound.cpp
#	source/build/include/vfs.h
#	source/build/src/vfs.cpp
 2019-10-24 19:48:11 +02:00
Christoph Oelckers
3ed87f449e - and the last 2 hud CVARS for Blood… 2019-10-24 01:41:55 +02:00
Christoph Oelckers
3efb54e167 - ported most of the remaining HUD CVars 2019-10-24 01:30:33 +02:00
Christoph Oelckers
20df360778 - converted the Polymost CVARs. 2019-10-23 21:11:37 +02:00
Christoph Oelckers
c1041a9c37 - removed the unused DN3D menu code from the Blood subproject. 2019-10-23 19:08:41 +02:00
Christoph Oelckers
ee5f0a7cf6 - cleaned out the remains of the frontends' CVAR definitions. 2019-10-23 18:58:34 +02:00
CommonLoon102
20a393871b fix compiler error: storage size of weaponQAV isn't known (#226) 2019-10-23 18:38:00 +02:00
Szilárd Biró
0f67b74a53 SEQFRAME big endian fix 2019-10-23 18:37:55 +02:00
Christoph Oelckers
21d90fd08b - fixed compilation. 2019-10-23 18:36:48 +02:00
Christoph Oelckers
02fff2df06 - refactored wchoice and sensitivity CVARS 
This is all that's needed for now, the remaining ones can wait.
 2019-10-23 17:21:14 +02:00
Christoph Oelckers
18430c6c9f - refactored r_fpslimit 
Also removed the entire cruft related to this - the pointless offsetting value and the precalculation of the timer value (as if we could not afford a single division for something that WAITS!

Unfortunately this required removal of the menu option for the time being.
 2019-10-23 17:07:29 +02:00
Christoph Oelckers
43413e4dff - r_useprecache 2019-10-23 14:39:33 +02:00
Christoph Oelckers
63f020996e - a few more CVARs 2019-10-23 01:30:43 +02:00
Christoph Oelckers
5dec4736ce - r_drawweapon, r_showfps, r_showfpsperiod 2019-10-23 01:04:07 +02:00
Christoph Oelckers
e5d38b2d30 - in_mouseflip and in_mousesmoothing 
in_mousemode removed from persistent state because of how it is used.
Saving it makes no sense.
 2019-10-23 00:59:01 +02:00
Christoph Oelckers
b73cf76f05 - in_mousebias and in_mousedeadzone 
Actually, two totally useless options being preserved for historical significance.

Urgh.
 2019-10-23 00:55:48 +02:00
Christoph Oelckers
c0c62fe367 - in_mouseaiming 2019-10-23 00:51:49 +02:00
Christoph Oelckers
7501120dc8 - in_mouse and in_joystick 2019-10-23 00:41:28 +02:00
Christoph Oelckers
8f06f0748d - minor CVAR cleanup and refactoring of one more 2019-10-23 00:30:51 +02:00
Christoph Oelckers
713250cc64 - refactored a few more CVARs. 2019-10-23 00:20:27 +02:00
Christoph Oelckers
d476037f45 - hooked up hud_custom. 2019-10-22 23:43:16 +02:00
Christoph Oelckers
e5aa6c5df0 - refactored the HUD scaling into something manageable. 
Blood was fine, albeit with an inverted scale, but the EDuke implementation was something very special - and not in a good way, using 4 CVARs to store the scaling state instead of one.
 2019-10-22 23:31:46 +02:00
Grind Core
b6c16abf6f Refactor: 
- PLAYER.H structs
- ACTOR.H  structs

# Conflicts:
#	source/blood/src/db.h
#	source/blood/src/player.h
 2019-10-22 17:49:59 +02:00
Christoph Oelckers
a829f1cb52 - fixed all compile errors. 2019-10-22 17:47:24 +02:00
Christoph Oelckers
edce0d33e3 - refactored crosshairscale CVAR 2019-10-22 17:00:22 +02:00
Christoph Oelckers
bdf2d24b21 - refactored cl_weaponswitch 2019-10-22 02:31:14 +02:00
Christoph Oelckers
3f48ecd479 - 5 more Blood exclusive CVARs. 2019-10-22 02:15:24 +02:00
Christoph Oelckers
8431266d27 - refactoring of music CVARs 
This is a lot of changes in a lot of code because nothing here was abstracted into the sound system. :(

Hopefully most of the affected code here can be tossed out soon, it's not pretty.
 2019-10-22 02:01:05 +02:00
Christoph Oelckers
c5cb86bf2b - sevral simple CVARs ported 2019-10-22 01:00:22 +02:00
Christoph Oelckers
279c0caea4 - autosave variables 2019-10-22 00:58:51 +02:00
Christoph Oelckers
dbe3cadd0f - refactored autorunning CVARs 2019-10-22 00:52:07 +02:00
Christoph Oelckers
30e9eed1b3 - the next CVAR, cl_autoaim 2019-10-22 00:05:21 +02:00
Christoph Oelckers
79d02a405e - started transitioning the CVARs. 
This is going to be a lot of work consolidating the 3 frontends' settings but a necessary evil for eventually getting Shadow Warrior to work as it is quite lacking here.
 2019-10-21 23:29:48 +02:00
Christoph Oelckers
0d737ee130 - removed all code related to the -usecwd command line switch. 
While feature-wise ok this was far too scattered throughout the frontends and needs to be done in a more concise way.
 2019-10-21 19:51:12 +02:00
CommonLoon102
c342d25879 disable respawn for spawned dudes (#223) 
makes sense
# Conflicts:
#	source/blood/src/view.cpp
 2019-10-21 19:37:39 +02:00
Christoph Oelckers
72b87e5bd7 - fixed compilation. 2019-10-21 19:36:54 +02:00
Christoph Oelckers
8c7590e161 - refactored most of the remaining calls to kopen4load 2019-10-21 17:16:08 +02:00
Christoph Oelckers
5333f6adc1 - refactored a few more - simple stuff but lots of lines. 2019-10-21 00:13:17 +02:00
Christoph Oelckers
5022c58a63 - refactored the file access in the rest of the DN3D frontend and in some duplicated code in the Blood frontend. 2019-10-20 23:37:07 +02:00
Christoph Oelckers
06f4138202 - merge fixes in Blood frontend code. 2019-10-20 17:09:01 +02:00
Christoph Oelckers
d83b3f34a3 - restored original whitespacing in blood/actor.cpp. 
This ensures that future cherry picks won't conflict as badly.
 2019-10-20 16:50:47 +02:00
Grind Core
70e0ed9ec4 - Refactor: added names for powerups and updated some old. 
- AI: there is printing error message in conosole added (instead of dassert)
- Updates for Player Control modern type

# Conflicts:
#	source/blood/src/actor.cpp
#	source/blood/src/actor.h
#	source/blood/src/globals.cpp
#	source/blood/src/globals.h
#	source/blood/src/player.h
#	source/blood/src/sound.cpp
#	source/blood/src/triggers.cpp
#	source/blood/src/triggers.h
#	source/blood/src/view.cpp
#	source/blood/src/weapon.cpp
#	source/blood/src/weapon.h
 2019-10-20 12:30:16 +02:00
Christoph Oelckers
2316957026 - made things compile again after updating enet. Also removed the redundant dumb and game_music_emu libraries which just got imported by accident when using other things from GZDoom. 
Note: enet uses 'malloc' and 'free' as field names in a struct - this does not work with any compiler using some sort of heap instrumentation that #defines these names!
This had to be changed to allow MSVC debug builds to compile again.
 2019-10-20 09:16:01 +02:00
Christoph Oelckers
17816b0f63 - fixed compilation for NBlood update. 2019-10-19 20:48:59 +02:00
nukeykt
098740155b Use screentext in DrawStatNumber 2019-10-19 20:33:52 +02:00
nukeykt
182d5d2eb5 Use screentext in viewDrawText 2019-10-19 20:33:50 +02:00
nukeykt
90dc59749d Import screentext from eduke32 
# Conflicts:
#	platform/Windows/nblood.vcxproj
#	platform/Windows/nblood.vcxproj.filters
 2019-10-19 20:33:49 +02:00
Christoph Oelckers
6f4ca480b5 - sky clamping may only be done in Blood for now. 
This needs a better solution.
 2019-10-19 20:25:58 +02:00
Christoph Oelckers
6d7458fe42 - fixed bad endif() placing in CMake projects 2019-10-17 08:44:01 +02:00
Christoph Oelckers
0aa5db7969 - project rework to shorten compile times. 
* subprojects fpr game frontends added and unsigned char option put into global flags.
 2019-10-16 23:09:02 +02:00
nukeykt
37322d001d Do not apply zero floorpal on color sectors 2019-10-16 20:40:54 +02:00
nukeykt
a94404232b Default target value to -1 
# Conflicts:
#	source/blood/src/trig.cpp
 2019-10-16 20:40:53 +02:00
nukeykt
97feb8d59c Fix mapedit compiling 
# Conflicts:
#	source/blood/src/mapedit.cpp
 2019-10-16 20:40:41 +02:00
CommonLoon102
70b5e67e6f fix cultist respawn time (#220) 
# Conflicts:
#	source/blood/src/actor.cpp
 2019-10-16 20:40:34 +02:00
Christoph Oelckers
9a52e8039c - rerouted tileCreate and tileSetExternal calls. 2019-10-15 23:18:52 +02:00
Christoph Oelckers
c3bc690e98 - more updating and bug in UpdatePicSize fixed. 2019-10-15 20:02:37 +02:00
Christoph Oelckers
0e165e40a3 - first batch of adjustments to the new tile management. 
- consolidated Polymost precaching and removed precaching for static tiles because they now are always loaded.
- removed cache configurability. On modern systems this is relatively pointless - allocating 50 or 100 MB is a non-issue - and the cache is due for replacement anyway.
 2019-10-15 00:54:14 +02:00
Grind Core
9dd46c1c7c - Fixes for refactor (wrong kills count) 
- Fixes for refactor (proximity flag for dudes)
- Fixes for refactor (wrong kills count)

# Conflicts:
#	source/blood/src/actor.cpp
 2019-10-14 22:42:43 +02:00
Grind Core
16d4aebbb4 - Fixes for refactor 
- Some ThrowError() calls was replaced my viewSetSystemMessage()
- New modern type playQAV (WIP)

# Conflicts:
#	source/blood/src/actor.cpp
#	source/blood/src/weapon.h
 2019-10-14 22:42:43 +02:00
Grind Core
08dfee073c - Added names for callbacks 
- Added names for sprite, wall and sector types
- Added gModernMap protection for using new features only on different version of map

# Conflicts:
#	source/blood/src/actor.cpp
#	source/blood/src/callback.cpp
#	source/blood/src/callback.h
#	source/blood/src/triggers.h
 2019-10-14 22:42:42 +02:00
Christoph Oelckers
9a4c07db27 - make it compile again. 2019-10-14 22:42:29 +02:00
Christoph Oelckers
17a4ddd51e - adjusted bit array helpers for the change of type for gotpic from (undefined) char to (defined) uint8_t. 2019-10-13 08:55:52 +02:00
Christoph Oelckers
fbc22e0125 - sanitized walock. 
Sorry, but having a globally writable pointer to every texture is just insane and makes any functional management impossible.
This is merely a preparation for adding a real texture manager. That cannot be done if any code can write over the data at will. For that, it now has to make the texture writable first or create a writable empty texture.
 2019-10-11 23:31:59 +02:00
Christoph Oelckers
3621aae3f0 - rerouted all write accesses to tilesiz and picsiz through a function interface. 
These will have to do some texture management bookkeeping so directly changing the values is problematic.
This required changing the parameter interface in polymost.cpp because a few places hacked around with the global state to pass parameters to subfunctions.
 2019-10-11 21:04:31 +02:00
Christoph Oelckers
14b21bab7a - merged playing_blood and bloodhack variables because they did the same thing. 
The only difference was that bloodhack came from NBlood and playing_blood was added for unhandled differences between the backends of EDuke32 and NBlood.
 2019-10-11 00:34:27 +02:00
Christoph Oelckers
9dc0ff08f5 - hotfixed compile error. 2019-10-09 00:26:54 +02:00
Grind Core
f5f012ccb9 - Added names for statnums 
- Added names for system RX/TX channels
- Detect if map requires new features to work properly via special TX and command
- Effect Gen update

# Conflicts:
#	source/blood/src/actor.cpp
#	source/blood/src/eventq.h
#	source/blood/src/triggers.cpp
#	source/blood/src/triggers.h
 2019-10-08 22:27:45 +02:00
Christoph Oelckers
48a5dfe9a6 - skip -game in Blood menu 2019-10-08 01:38:01 +02:00
CommonLoon102
3b463bc38e fix disappearing bodies in coop with respawning monsters (#211) 2019-10-07 17:41:16 +02:00
CommonLoon102
70c4865ba4 Delete keybinding with delete or backspace (#208) 2019-10-07 00:10:04 +02:00
CommonLoon102
320eaae790 Fix F8 (#207) 2019-10-07 00:10:03 +02:00
Grind Core
05a1c94df4 - Changes for Enemy Target Changer 
- Debris physics update

# Conflicts:
#	source/blood/src/actor.cpp
 2019-10-07 00:09:32 +02:00
Christoph Oelckers
ef2de97077 - the harmless changes of the failed refactoring of the shader. 2019-10-06 19:32:35 +02:00
Christoph Oelckers
93ad83b380 - use GZDoom's texture backend to read hightile textures. (Hightile tinting code moved to the shader but isn't active yet. 
- remove all code for faking gamma correction through palette manipulated images.
 2019-10-05 21:59:03 +02:00
Christoph Oelckers
ae1e090716 - all non-shader related GL calls are gone from the main code base. 2019-10-04 21:13:04 +02:00
nukeykt
61f8b8c2d6 Hopefully fix map reloading 2019-09-30 20:31:12 +02:00
nukeykt
528e7f8320 More meaningful names for build object struct members 2019-09-30 20:31:11 +02:00
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