zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-12-26 20:31:21 +00:00
Code Issues Projects Releases Packages Wiki Activity
7287 commits 86 branches 139 tags 124 MiB
Commit graph

7287 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christoph Oelckers
ae78aeaacb - if this buffer is freed, the pointer referring to it must also be deleted. 2015-02-08 11:48:41 +01:00
Christoph Oelckers
45117b2603 Merge branch 'codesanity' of https://github.com/ZzZombo/zdoom 
Conflicts:
	src/info.h
 2015-02-08 11:47:49 +01:00
ZzZombo
0be3341031 - Missed some unused variables. 2015-02-08 18:04:11 +08:00
alexey.lysiuk
bd93ce63a9 Added menu option to customize ammo display in alternative HUD 2015-02-08 11:08:52 +02:00
alexey.lysiuk
003817f415 Added customization of ammo display in alternative HUD 
Added hud_showammo CVAR with three states:
* If value is 0, show ammo for current weapon only
* If value is 1, show ammo for available weapons
* If value is greater than 1, show ammo for all weapons
Default value is 2, so initial ammo display behavior isn't changed
 2015-02-08 11:08:02 +02:00
ZzZombo
c4b742ebf0 - Part 2 of the sanity crusade. 2015-02-08 17:03:49 +08:00
Christoph Oelckers
4959932df7 Merge branch 'changemap2-fix' of https://github.com/Edward850/zdoom 2015-02-08 09:07:12 +01:00
Christoph Oelckers
0688247ee1 Merge branch 'NewChaseDir-opt' of https://github.com/Edward850/zdoom 2015-02-08 09:06:53 +01:00
ZzZombo
2c06987f67 - Fixed the sanity commit. 2015-02-08 14:35:45 +08:00
Christoph Oelckers
3a504da675 - forgot to save this before committing. 2015-02-07 19:04:43 +01:00
Christoph Oelckers
7c567979d9 Merge branch 'transferspriteframe' of https://github.com/MajorCooke/zdoom 2015-02-07 17:13:21 +01:00
MajorCooke
b37a98689a - Added SXF_TRANSFERSPRITEFRAME. Now it's possible to make starting frames that start with "####" "#" 0 in Spawn. 
- Fixed a compile warning with FAF_NODISTFACTOR.
 2015-02-07 10:04:33 -06:00
Christoph Oelckers
7789975b6c - reverted a few of Zzombo's changes. 2015-02-07 17:02:46 +01:00
Christoph Oelckers
4e2763e5fa Merge branch 'master' of https://github.com/ZzZombo/zdoom-modified 2015-02-07 16:45:44 +01:00
Christoph Oelckers
5d75df4869 Merge branch 'polydoor_swing_overshoot_fix' of https://github.com/edward-san/zdoom 2015-02-07 16:44:38 +01:00
Christoph Oelckers
c4f932022c - added 'listsoundchannels' CCMD for debugging. 2015-02-07 16:44:24 +01:00
ZzZombo
322742d4b1 - Fixed various instances of unused variables, accessing arrays out of bounds, initialization of non-primitive members in constructor's body, dead code, passing parameters by value instead of reference, usage of uninitialized variables, as reported by cppcheck. 2015-02-07 23:35:23 +08:00
Christoph Oelckers
ec58178695 - replace all \0 characters in Dehacked patches with spaces. 
This is needed to make some old and broken patches in some WolfenDoom mods load.
 2015-02-07 15:27:31 +01:00
Edoardo Prezioso
60b735dc60 Remove redundant code in polydoor swing code. 
'Perpetual' check does not make sense for poly doors.
 2015-02-07 15:03:16 +01:00
Christoph Oelckers
2d4299608c Merge branch 'Inventory.Transfer-flag' of https://github.com/Edward850/zdoom 2015-02-07 13:12:15 +01:00
Christoph Oelckers
6801d0faec Merge branch 'pause' of https://github.com/Edward850/zdoom 2015-02-07 13:03:33 +01:00
Christoph Oelckers
c54a4fe06b Merge branch 'ext_skin_check' of https://github.com/alexey-lysiuk/gzdoom 2015-02-07 13:02:19 +01:00
Christoph Oelckers
5a52c4007d Merge branch 'faceaddons' of https://github.com/MajorCooke/zdoom 2015-02-07 13:01:31 +01:00
Christoph Oelckers
cb4ef09b69 Merge branch 'mirrorfix' of https://github.com/MajorCooke/zdoom 2015-02-07 12:59:53 +01:00
Edward Richardson
291861bf52 Removed debug output 2015-02-05 23:53:34 +13:00
Edward Richardson
5164b78c31 Camera paths would hold indeterminate of the level 2015-02-05 22:44:51 +13:00
Edward Richardson
cbb066f1fb Keep gameticker running to let the thread sleep 2015-02-05 22:43:42 +13:00
Edward Richardson
1e0a1466a3 Moved and rearranged transfer task 
- Some inventory pickup conditions weren't properly covered
 2015-02-05 20:13:54 +13:00
Edward Richardson
de4097cc7b Added INVENTORY.TRANSFER 
- INVENTORY.TRANSFER allows transferring all owned inventory to a new
owner on pickup.
 2015-02-05 14:52:52 +13:00
Braden Obrzut
8e1b1aa201 - Defer SDL subsystem initialization since it seems to cause conflicts with GUI toolkits on some systems. 2015-02-02 19:36:08 -05:00
Chris Robinson
90ed80abe5 Merge remote-tracking branch 'zdoom/master' into openal 2015-02-01 22:48:40 -08:00
Randy Heit
dc6b45804d Don't lose the cursor when scrolling up in option menus 
- Fixed: If the menu cursor was on the topmost-displayed item, pressing up
  would not scroll the view up. The check for scrolling only tested if the
  newly selected item was the topmost one, since the menu code had
  assumed the only time the cursor would be on the topmost visible line
  was when it was the very first line of the menu. Using PgDn breaks this
  assumption.
 2015-01-31 20:10:18 -06:00
alexey.lysiuk
cce5066bea Improved check for skins and maps in the same WAD 
The corresponding warning is shown for Doom I mods too. Good example of it is Hyena TC: http://www.doomworld.com/idgames/index.php?file=levels/doom/Ports/megawads/hyena.zip
Reduced chance of false positive for the mentioned warning
 2015-01-31 13:14:30 +02:00
MajorCooke
53fd57d6b7 - Added ang_offset and pitch_offset to A_Face, along with 4 new flags: 
- ang_offset: the extra angle to apply to the actor after calculating the maximum turn.
- pitch_offset: Just like ang_offset, with pitch instead.
- FAF_BOTTOM: Aim straight for the actor's z coordinate, not with +32 units.
- FAF_MIDDLE: Aims for the direct middle of the actor.
- FAF_TOP: Aims for the very top of the actor.
- FAF_NODISTFACTOR: Use the raw pitch offset without calculating it into the distance of the aimed actor.
 2015-01-30 16:48:24 -06:00
MajorCooke
6bb0849984 - Fixed: MIRRORREFLECT was broken after my last patch to fix the always 0 angle issue. Also simplified the speed change -- it's the same thing without having to recalculate the angle into it. 
- Also ensure that the check for AIMREFLECT happens no matter what.
 2015-01-30 16:34:24 -06:00
Randy Heit
775e33ede7 Merge branch 'master' into scripting 
Conflicts:
	src/actor.h
	src/g_doom/a_archvile.cpp
	src/g_shared/a_morph.cpp
	src/p_enemy.h
	src/p_local.h
	src/p_mobj.cpp
	src/sc_man_tokens.h
	src/thingdef/thingdef_codeptr.cpp
	src/thingdef/thingdef_exp.h
	src/thingdef/thingdef_expression.cpp
	src/thingdef/thingdef_states.cpp
	wadsrc/static/actors/actor.txt
 2015-01-29 20:53:08 -06:00
Randy Heit
b69edbbec1 Redo commit a4c07a9 
- Line endings are inconsistant in this file, but at least the commit
  doesn't touch the whole file.
 2015-01-29 19:50:52 -06:00
Randy Heit
d828173ce3 Revert "- fixed: Since A_Give/TaketoChildren/siblings use the same code as A_Give/TakeInventory but do not use the third parameter this must be ignored by the code. This is merely a band-aid fix, because this problem doesn't exist in the same form in the scripting branch." 
This reverts commit a4c07a9ee3.

- This commit touched every line of thingdef_codeptr.cpp, which would make
  merging it into the scripting branch a pain in the ass.
 2015-01-29 19:30:26 -06:00
Braden Obrzut
72506fa6e9 - Fixed: Regression with centered coordinates. 2015-01-26 15:00:36 -05:00
Edoardo Prezioso
78b4cbdf6c - Fixed a very old issue with rotating polydoors. 
This happened when the polydoor was open. If a mobj blocked the poly door, such that the door could not move from its open position, the poly door could rotate a little bit more than needed, making the door partially closing when the door managed to close later.
 2015-01-26 02:20:54 +01:00
Christoph Oelckers
a4c07a9ee3 - fixed: Since A_Give/TaketoChildren/siblings use the same code as A_Give/TakeInventory but do not use the third parameter this must be ignored by the code. This is merely a band-aid fix, because this problem doesn't exist in the same form in the scripting branch. 2015-01-25 20:15:58 +01:00
Edoardo Prezioso
04c6c5ca55 Fix missing 'victim' replace in ALoreShot code. 2015-01-24 14:17:47 +01:00
Christoph Oelckers
92fbe47ade - fixed and cleaned up ALoreShot::DoSpecialDamage. 2015-01-24 14:04:06 +01:00
Edward Richardson
b2fbeb24c4 DEM_CHANGEMAP2 wasn't properly skipped 2015-01-24 16:09:15 +13:00
Christoph Oelckers
d1cca79c31 - Use SpawnHealth() when calling A_ResetHealth. 2015-01-23 20:29:38 +01:00
MajorCooke
301c061ec3 - Added pointer for A_SetRoll. 2015-01-23 10:24:23 -06:00
MajorCooke
19b43d4752 - Added A_ResetHealth(ptr). Defaults to AAPTR_DEFAULT (the action caller). 
- Added pointers to the following functions, all of them set to AAPTR_DEFAULT:
- A_SetAngle
- A_SetPitch
- A_SetScale
- A_SetSpeed
- A_ScaleVelocity
 2015-01-23 09:26:34 -06:00
Christoph Oelckers
7157db89b7 - fixed: A_VileAttack didn't check for MF7_DONTTHRUST. 
This is a fixed version of Major Cookes pull request.
 2015-01-22 14:13:25 +01:00
Christoph Oelckers
73bdd06ceb - removed bogus angle modification from reflection code. 2015-01-22 14:10:55 +01:00
Christoph Oelckers
667c4ba5fc Merge branch 'reflectfixsolo' of https://github.com/MajorCooke/zdoom 2015-01-22 14:01:27 +01:00