zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-08 14:00:43 +00:00
Code Issues Projects Releases Packages Wiki Activity
5523 commits 131 branches 149 tags 198 MiB
Commit graph

4992 commits

Author SHA1 Message Date
Christoph Oelckers
45526c2769 - basics for using hardware clip planes to split translucent stuff by 3D floor planes. 2015-04-05 18:55:21 +02:00
Christoph Oelckers
0ae74b844d Merge branch 'osx_text_paste' of https://github.com/alexey-lysiuk/gzdoom 2015-04-05 12:18:23 +02:00
alexey.lysiuk
7b89312923 Fixed potential issue with read beyond buffer boundaries 2015-04-05 11:52:57 +03:00
alexey.lysiuk
ebd8f24103 Fixed compilation with OS X SDK 10.4 2015-04-05 11:39:49 +03:00
alexey.lysiuk
82f7b439c8 Improved text pasting on OS X 
Support for UTF-8 and UTF-16 encodings should cover all cases of text pasting from clipboard
 2015-04-05 10:59:07 +03:00
Christoph Oelckers
8762ab48d3 Merge branch 'master' of https://github.com/rheit/zdoom 2015-04-05 09:47:27 +02:00
Randy Heit
89054f5d60 Use filtering and LOADACS to autoload strfhelp.o 
- No more special case for STRFHELP in the executable!
 2015-04-04 18:40:48 -05:00
Randy Heit
e451faa1cc Fixed: FString::ReallocBuffer could write to unallocated memory 
- Previously, calling ReallocBuffer with a smaller buffer size than the
  current one could overwrite unallocated memory. This required that the
  string it was called on had more than one reference and therefore
  required creating a new copy. The entire original string would be
  copied, whether it fit in the new buffer or not.
 2015-04-04 18:20:05 -05:00
Randy Heit
6da887c34f Use Truncate to chop off extension in LumpNameSetup. 
- Left() always creates a new string. Truncate() can reuse the old one if
  it only has one reference.
 2015-04-04 18:20:05 -05:00
Randy Heit
4315423200 Rename ns_invalid to ns_hidden 
- Also use ns_hidden by name in LumpNameSetup().
 2015-04-04 18:20:04 -05:00
Randy Heit
2103fe2a14 Make FResourceLump::LumpNameSetup's argument an FString 2015-04-04 18:20:03 -05:00
Randy Heit
bbbbb7ac9d Reorder FMapThing to remove padding 2015-04-04 18:20:03 -05:00
Christoph Oelckers
1fddd1859e - fixed: FResourceFile::FilterLumps must use a proper copy of the filename to pass to LumpNameSetup instead of a pointer to the file name's stringbuffer, because that function will overwrite the variable it is taken from. 2015-04-05 00:38:29 +02:00
Christoph Oelckers
25e19ab471 Merge branch 'master' of https://github.com/rheit/zdoom 2015-04-05 00:31:55 +02:00
Christoph Oelckers
b6a4511dd1 - move conversation ID definition to MAPINFO as well. Uses the newly added filter feature to handle the teaser differences. 2015-04-05 00:31:15 +02:00
rheit
60a0966f0f Merge pull request #306 from alexey-lysiuk/osx_vid_autoswitch 
Added control of automatic graphics switching on OS X
 2015-04-04 15:41:18 -05:00
Christoph Oelckers
6e45c565a0 - fixed: FResourceLump::LumpNameSetup's iname parameter can point to the FullName variable's stringbuffer so any assignment to that variable must be done indirectly. 2015-04-04 20:52:55 +02:00
Christoph Oelckers
bead3e046b - fixed weapon positioning again, after finding out that the first fix just worked around the actual problem: The entire coordinate calculation must be done in floating point with no integer math at all. Due to roundoff errors the stored int values needed for wall and flat placement significantly lack precision and with the high scaling factor that needs to be used for weapon HUD sprites these can easily become several pixels. After fixing this the border around sprite textures could be reverted to one pixel again. 
- fixed: The 'may not be expanded' state should be stored in the texture and reused later. This also needs to revalidate the material if it decides that expansion should be disallowed.
 2015-04-04 17:50:22 +02:00
alexey.lysiuk
193b491b63 Added control of automatic graphics switching on OS X 
Automatic graphics switching is enabled by default
Set vid_autoswitch CVAR to false to disable it
 2015-04-04 17:36:55 +03:00
Christoph Oelckers
85ef1a11e9 Merge branch 'master' of https://github.com/rheit/zdoom 2015-04-04 14:13:37 +02:00
Christoph Oelckers
87229f4787 Merge branch 'fix_filter_crash' of https://github.com/alexey-lysiuk/gzdoom 2015-04-04 14:12:13 +02:00
Christoph Oelckers
bd96adafda - cleanup 2015-04-04 14:12:04 +02:00
Christoph Oelckers
91eafed5d3 - fixed coordinate calculations for trimmed sprites which were quite a bit broken. 2015-04-04 13:37:55 +02:00
Christoph Oelckers
67334bfa2b - calculate weapon positions fully in floating point to avoid roundoff errors. 
- In order to get reliable results the empty border around scaled sprites must be the same scale as the sprite (i.e. 2 pixels for 2x scale and 4 pixels for 4x scale.)
 2015-04-04 12:35:10 +02:00
alexey.lysiuk
8b92c45f84 Fixed crash in lump filtering caused by uninitialized variables 2015-04-04 12:38:37 +03:00
Christoph Oelckers
39b5bcc4f0 Merge branch 'master' of https://github.com/rheit/zdoom 2015-04-04 10:38:28 +02:00
Christoph Oelckers
5f2f11a43b Merge branch 'master' of https://github.com/rheit/zdoom 2015-04-04 10:32:23 +02:00
Christoph Oelckers
747e160c96 Merge branch 'master' of https://github.com/rheit/zdoom 2015-04-04 10:30:37 +02:00
Christoph Oelckers
51591d10b0 - handle slope things through new definition tables as well. Since these get processed outside P_SpawnMapThing it required some restructuring so that the actual spawn data is present when slope things get processed. 
- removed FMapThing::Serialize because it isn't used anywhere - it was rather broken anyway.
 2015-04-04 10:25:01 +02:00
Randy Heit
7b4d6e2f87 Add lump filtering for archive resources 
- Multi-directory archives (e.g. zips) now support filtering lumps
  depending on the loaded IWAD. The search rules are the same as for the
  Autoload entries in the user's ini. For instance, if you are playing
  Doom 2, the following filters will be applied:
  * "filter/doom2/*"
  * "filter/doom/*"
  They will be renamed to strip out the "filter/doom2/" and "filter/doom/"
  parts and will be ordered so they take precedence over any files not
  inside a filter/ directory. Any files inside another filter/ directory
  (e.g. "filter/hexen/*") will be ignored.
 2015-04-03 22:42:22 -05:00
Randy Heit
fc6f983c13 Fix memory leak when passing directories to -file 2015-04-03 21:50:08 -05:00
Randy Heit
efa82cf38b Consolidate archive sorting into FResourceFile base class 2015-04-03 20:22:18 -05:00
Randy Heit
966d0b7034 Use FString for FResourceLump::FullName 2015-04-03 20:00:58 -05:00
Christoph Oelckers
2ec8e2c2ac - moved spawn ID definitions to MAPINFO as well and removed all 'Game' directives from DECORATE because editor and spawn numbers are the only thing that required them. 2015-04-04 00:39:09 +02:00
Christoph Oelckers
4f7ec3ad89 - print proper information about non-actor mapthings. 2015-04-03 22:23:42 +02:00
Christoph Oelckers
9e5bf38123 - handle all special mapthing items (player starts, polyobj spots) via the new MAPINFO method instead of hard coding them in the spawn function. 
(Note: The buildmap loading code should be adjusted to the new functionality as well eventually.)
 2015-04-03 21:17:10 +02:00
Christoph Oelckers
15dbbc9137 - set editor numbers through MAPINFO. The DECORATE way still works ans will override any definition made in MAPINFO. 
- use a standard TMap for finding editor numbers
 2015-04-03 16:51:45 +02:00
Christoph Oelckers
ccd9fb9c23 - moved FDoomEdMap to its own file to make the upcoming changes a bit nicer to handle. 2015-04-03 10:54:55 +02:00
Christoph Oelckers
f0886ce1f1 Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	src/version.h
 2015-04-03 09:45:04 +02:00
Christoph Oelckers
6c603b3c78 Merge branch 'misc_code_improvements' of https://github.com/edward-san/zdoom 2015-04-03 09:33:33 +02:00
Christoph Oelckers
4c06e71536 Merge branch 'dmgforcedfix' of https://github.com/MajorCooke/zdoom 2015-04-03 09:32:46 +02:00
MajorCooke
27c1434585 - Fixed: Buddha never took forced damage into account. 2015-04-02 20:52:51 -05:00
Randy Heit
d37f9cbcae Add flies (doomed #112) from the Hexen retail beta 
...because it brought back memories of adding Strife support.
- The search function is radically different, but the flying mechanics are
  the same.
 2015-04-02 17:52:54 -05:00
Edoardo Prezioso
7c7c3fb54e - Make the 'crashout' CCMD available in non-win32. 2015-04-02 20:14:33 +02:00
Edoardo Prezioso
a88f515364 - Import GAMENAMELOWERCASE macro from Zandronum. 
This will greatly help reducing the code delta between ZDoom and the child ports.
 2015-04-02 13:27:52 +02:00
Edoardo Prezioso
e07f64a23a - Increase the SDL crashinfo char buffer to 4 KB. 
This helps the crash catcher when there are numerous wad files, for which it's possible that either the wad list, the map or the position is truncated. A more reliable alternative to this should be allocating the char buffer, but I never heard about a way to do this reliably during signal handling.
 2015-04-02 13:19:48 +02:00
Edoardo Prezioso
6c07d765db - Fixed a wrong linux macro in an ifdef. 2015-04-02 13:18:37 +02:00
Christoph Oelckers
0a16855232 - fixed: The assignment to the 'player' variable in P_DamageMobj occured too late, skipping a few cases. 
- changed monster unblocking logic to include players as well (i.e. a player being stuck inside another actor is allowed to move away from that other actor.)
 2015-04-02 10:05:32 +02:00
MajorCooke
e70aae91e3 - Fixed NODAMAGE not ignoring telefrag damage. 2015-04-01 10:31:47 -05:00
Christoph Oelckers
48e21f6759 - consider MBF sky transfers when checking for skybox precaching. 2015-04-01 12:08:42 +02:00
Christoph Oelckers
bf490d8dcd Merge branch 'master' of https://github.com/rheit/zdoom 2015-04-01 11:59:57 +02:00
Christoph Oelckers
1e9a6e667e - GL code adjustments for reworked precaching. 2015-04-01 11:59:41 +02:00
Christoph Oelckers
60d9f38084 Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	src/v_video.cpp
 2015-04-01 11:59:20 +02:00
Christoph Oelckers
74f4ae86d8 - forgot to save this... 2015-04-01 11:57:10 +02:00
Christoph Oelckers
ad9e4413fa - made the texture precaching code a bit more self-descriptive after finding a discrepancy in handling between ZDoom and GZDoom's versions. 2015-04-01 11:48:47 +02:00
Christoph Oelckers
34aeb428a1 - Removed the check for this flag from P_RadiusAttack because MF7_CAUSEPAIN cannot be used for radius attacks. Their logic is too different from regular attacks. 2015-04-01 10:01:48 +02:00
Christoph Oelckers
d940c6a2ee - fixed: With the recent changes to the damage code, the check for MF5_NODAMAGE was too early. Putting it into AActor::TakeSpecialDamage is also not the best idea because that limits that function's potential. 2015-03-31 23:15:43 +02:00
Christoph Oelckers
6eb4e2a224 Merge branch 'master' of https://github.com/rheit/zdoom 2015-03-31 18:25:31 +02:00
Christoph Oelckers
5febac0994 - removed incorrect multiplication from FraggleScript's PointToDist function. The problem was introduced by replacing a (fixed_t) type cast with FLOATTOFIXED without removing the value range adjustment. 2015-03-31 15:21:15 +02:00
Christoph Oelckers
4d59190446 - redit commit 5f56fb5a16 without altering the line endings throughout thingdef_codeptr.cpp. 
* Changed the behavior of SetActorTeleFog.
- Don't force "null" to resolve to no actor since "none" is already defined as NULL (via FindClass). (This change also applies to the decorate properties.)
- Passing an empty actor name will keep the existing fog since there's otherwise no way set only one fog. Since "none" works to remove the fog, I see no reason not to have this option.
 2015-03-31 09:24:16 +02:00
Braden Obrzut
5f56fb5a16 Changed the behavior of SetActorTeleFog. 
- Don't force "null" to resolve to no actor since "none" is already defined as NULL (via FindClass). (This change also applies to the decorate properties.)
- Passing an empty actor name will keep the existing fog since there's otherwise no way set only one fog. Since "none" works to remove the fog, I see no reason not to have this option.
 2015-03-30 21:54:58 -04:00
Christoph Oelckers
3849cb8623 - added precaching of textures via MAPINFO. 2015-03-29 13:02:45 +02:00
alexey.lysiuk
267054071f Added missing render styles to info console command 2015-03-28 12:13:47 +02:00
Christoph Oelckers
25e5ac7e2a - fixed: CheckForResurrection should check whether the active translation is actually a blood translation before resetting it, not assuming that GenericCrush is a single state with infinite duration. 2015-03-27 18:29:57 +01:00
Christoph Oelckers
15e0f19fdb - fixed another flags mismatch. 2015-03-27 17:16:53 +01:00
Christoph Oelckers
94a04f36e5 - fixed: Dormant monsters should not be telefraggable. 2015-03-27 17:06:56 +01:00
Christoph Oelckers
164d523eca - fixed incorrect flags word access. 2015-03-27 16:58:21 +01:00
Christoph Oelckers
eb78c24140 - small oversight: TakeSpecialDamage must be called if damage is 0 (to do the special death state checks) but it may not be called if damage is already -1, because that means that damage and pain have already been ruled out completely. 2015-03-27 14:37:13 +01:00
Christoph Oelckers
9d5e6d32c7 - review of P_DamageMobj: 
* decided that the pain threshold should always be checked against the actual damage, even if it's down to 0, for consistency. This also restores the original behavior of using actual damage for checking the pain threshold which was altered by the introduction of the ALLOWPAIN and CAUSEPAIN flags.
* removed all newly added exceptions that excluded the player from checks for completely cancelled out damage.
* if anything during damage modification causes negative damage, no pain handling whatsoever will be initiated.
* made sure that TELEFRAG_DAMAGE will not be subjected to damage amount modification by protection items and any other kind of damage modification.
 2015-03-27 13:49:47 +01:00
Christoph Oelckers
ac7abca6f8 - completely removed fakePain check in case DoSpecialDamage returns -1. This signifies a special case that should bypass anything that inflicting pain implies. 2015-03-27 11:55:11 +01:00
Christoph Oelckers
c78b9235a8 - DoSpecialDamage was formerly called for any damage value, removed check for 'damage > 0' to restore original behavior. 2015-03-27 11:50:27 +01:00
Christoph Oelckers
375c0ac736 - cleanup of damage flag handling in P_RailAttack. 2015-03-27 10:10:22 +01:00
Christoph Oelckers
19cea0f626 - fixed: DoCheckSpecies got an actor's species by directly reading the 'species' variable, bypassing initialization in GetSpecies. 
- cleaned up DoCheckSpecies and DoCheckFilter which both contained several redundant checks and renamed DoCheckFilter to DoCheckClass.
 2015-03-27 09:57:33 +01:00
Christoph Oelckers
602f541e31 - use '|', not '+' to combine flags. 
There's probably going to be more of these coming...
 2015-03-27 09:40:47 +01:00
Christoph Oelckers
c78fdae31d - beautification of A_BFGSpray. 
Reordered checks so that only one 'spray != NULL' is needed, removed redundant thingToHit variable and reformatted slightly.
 2015-03-27 09:25:26 +01:00
Christoph Oelckers
66c3c93529 - call TakeSpecialDamage, even if damage is 0, just like it was in older versions. 2015-03-27 09:03:44 +01:00
Randy Heit
5d27bf7742 Add Windows 8+ related bits to the manifest 2015-03-27 00:25:53 -05:00
Randy Heit
3463b87876 Fixed: MUSINFO was not multiplayer-aware 
- Move MUSINFO change request out of FLevelLocals and into player_t. This
  allows the MusicChanger actors to change music for each player
  independantly. This is similar to PrBoom+, which switches depending on
  the displayplayer. The difference being, we don't actually track the
  music other players are listening to. (Which might not be a bad idea to
  implement at some point.)
- Moved a few fields in player_t for better packing.
 2015-03-26 23:19:05 -05:00
Randy Heit
ee9f64427c Add wad name to mapchecksum output 2015-03-26 22:01:57 -05:00
Randy Heit
93c7f4b4b5 Don't accelerate BOOM colormaped player sprites 
- Fixed: Player weapons ignored BOOM colormaps when accelerated.
 2015-03-26 21:46:14 -05:00
Randy Heit
32a55c9229 Revert "- Fixed: A_Die didn't consider missiles for the function." 
This reverts commit 5977cb04d9.

- It breaks at least one mod (Complex Doom) and who knows how many others.
  Considering how long A_Die has been around, a random "fix" like this is
  probably not a good idea. [P.S. Missiles have health and can be damaged
  by P_DamageMob, so it's not like it never did anything on missiles.]
 2015-03-26 20:57:12 -05:00
Christoph Oelckers
29c5071672 Merge branch 'hashing' of https://github.com/Edward850/zdoom 2015-03-26 13:05:42 +01:00
Edward Richardson
2c978bc6f7 Change hashfiles filename string to a cstr 
- It seems some compilers don't like passing FNames to Printf, and this
might as well be a cstr anyway.
 2015-03-26 23:38:09 +13:00
Christoph Oelckers
d206e423b6 Merge branch 'countitems' of https://github.com/edward-san/zdoom 2015-03-25 23:21:14 +01:00
Christoph Oelckers
3d2eaf81db Merge branch 'hashing' of https://github.com/Edward850/zdoom 2015-03-25 23:20:20 +01:00
Edoardo Prezioso
66b090cd44 - Improvements to some of the actor debug CCMDs. 
- 'monster' and 'items' can now filter the list if an argument is passed (like with 'kill');
- added 'countitems', which will show only the 'count items' in the current map, with the same filter parameter as 'monster' and 'items'.
- reorganize the code to reduce the duplication.
 2015-03-25 22:25:00 +01:00
Christoph Oelckers
21314fe867 Merge branch 'causepainfix' of https://github.com/MajorCooke/zdoom 2015-03-25 20:36:09 +01:00
Christoph Oelckers
d1a972ff3d - fixed: The recent ANIMDEFS extension missed adjusting the call to AddSimpleAnim for ANIMATED-defined animations. 2015-03-25 20:34:26 +01:00
MajorCooke
d45d45583b Take PainThresholds into account. 2015-03-25 14:27:12 -05:00
MajorCooke
f161c0c501 - Fixed: Projectile impacts never called P_DamageMobj when damage was 0 without the CAUSEPAIN flag. 2015-03-25 14:19:50 -05:00
Christoph Oelckers
7b6d245444 - added NULL pointer checks to A_CheckStaff. 2015-03-24 09:22:51 +01:00
Braden Obrzut
e29b8b2094 - Fixed: QuakeEx ACS function didn't handle fixed->double conversion. 2015-03-24 00:02:25 -04:00
Braden Obrzut
b958e930cf - Cleared developer warnings with modern (3.0+) versions of CMake. 2015-03-23 23:28:18 -04:00
Braden Obrzut
44f9f2bbd6 - Fixed: Default movedown bind was set to "insert" and not "ins". 2015-03-23 21:51:33 -04:00
Randy Heit
86e1d3ed9a Improve default IWAD search paths for Unix 
- /usr/share/doom and /usr/share/games/doom are better default paths than
  /usr/local/share
 2015-03-23 17:01:49 -05:00
Christoph Oelckers
7dbabb5ee7 - missed a NULL pointer check. 2015-03-21 13:08:08 +01:00
Christoph Oelckers
ffbcda206c - allow oscillating for discretely defined animations as well, not just for ranged ones. 
- add random animations.
 2015-03-21 12:48:37 +01:00
Edward Richardson
bf6cdba0bb Added -hashfiles command 2015-03-17 18:07:50 +13:00
Christoph Oelckers
7701d54b1f - fixed: associated dynamic lights took the sprite/frame info from the actor's current state instead of from the actor's current sprite and frame, which may differ in case some placeholder sprite is used in the state. 2015-03-15 12:24:28 +01:00
Christoph Oelckers
fad3a54100 - fixed positioning for sky textures that are less than 128 pixels tall. 2015-03-15 12:10:22 +01:00