Skip to content

Commit ae5a00f

Browse files
committed
Restore original dragon's fury. Update ValveSoftware#1380
1 parent 411e455 commit ae5a00f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+38
-8749
lines changed

game/quiver/info_changelog.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ Quiver Private Alpha 1.1.0 (WIP):
6969
- Bots can now use go-karts.
7070
- Bots can now use the Shortstop's shove.
7171
- Fixed a bug where bots continuously eat sandviches in spawn.
72-
- Restored the Dragon's Fury to it's original Jungle Inferno version.
72+
- Restored the Dragon's Fury to its original Jungle Inferno version.
73+
- The Dragon's Fury now deals 25% more damage against armor.
7374
- Added the following Source SDK Pull Requests:
7475
- #1437: MvM: Fix Explosive Headshot working on invulnerable target
7576
- #1440: Treat being in background map as not in-game

game/quiver/info_highlights.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ Unlockable weapon balance changes:
8484
- Fixed Ullapool Caber explosions not counting as melee kills.
8585
- Fixed Ullapool Caber not using mini-crits when charging.
8686
- Restored the Dragon's Fury to its original Jungle Inferno version.
87+
- The Dragon's Fury now deals 25% more damage against armor.
8788

8889
MvM Changes:
8990
- Added armor-related upgrades to MvM (max armor, pierces damage resistances, and armor resistance).

game/quiver/scripts/items/items_game.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61839,6 +61839,7 @@
6183961839
"dragons fury positive properties" "1"
6184061840
"dragons fury negative properties" "1"
6184161841
"extinguish restores health" "20"
61842+
"armor damage increased on target" "1.25"
6184261843
}
6184361844
"visuals"
6184461845
{

src/game/client/vgui_avatarimage.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,7 @@ void CAvatarImage::OnHTTPRequestCompleted(HTTPRequestCompleted_t* pInfo, bool bI
204204

205205
s_animatedAvatarCache.RemoveAt(i);
206206
// temp change until the PR is fixed.
207-
#ifndef BDSBASE_LEGACY_MAINMENU
208207
delete pAvatar;
209-
#endif
210208
i--; // avoid skipping the next element
211209
}
212210
}

src/game/shared/tf/tf_projectile_dragons_fury.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,13 +330,15 @@ class CTFProjectile_BallOfFire : public CTFProjectile_Rocket
330330
if ( pTFPlayer->m_Shared.IsInvulnerable() )
331331
return;
332332

333+
#if !defined(QUIVER_DLL)
333334
// Trace forward and see if we would touch a hitbox if we kept going
334335
CTraceFilterCollisionArrows filterHitBox( this, GetOwnerEntity() );
335336
trace_t trForward;
336337
UTIL_TraceLine( GetAbsOrigin(), GetAbsOrigin() + GetAbsVelocity() * gpGlobals->frametime * 1.5f, ( MASK_SHOT & ~( CONTENTS_HITBOX ) ), this, COLLISION_GROUP_PLAYER, &trForward );
337338
bool bHitBBox = trForward.DidHit() && trForward.m_pEnt && trForward.m_pEnt == pTFPlayer;
338339
//NDebugOverlay::Line( GetAbsOrigin(), GetAbsOrigin() + GetAbsVelocity() * gpGlobals->frametime, 255.f, 0.f, 0.f, false, 2.5f );
339340
//NDebugOverlay::Cross3D( trForward.endpos, 32.f, 0.f, 255.f, 0.f, false, 2.5f );
341+
#endif
340342

341343
#if defined(QUIVER_DLL)
342344
bBonusDamage = (pTFPlayer->m_Shared.InCond(TF_COND_BURNING));

src/lib/common/linux64/libgiflib.a

-1.38 KB
Binary file not shown.
-576 Bytes
Binary file not shown.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
1. Ensure you have the prerequisites installed:
2+
- [CMake](https://cmake.org/) (version 3.15 or higher is required)
3+
- Windows:
4+
- Generator: Visual Studio 17 2022
5+
- Windows SDK: Windows 10.0.19044 (Targeted)
6+
- C compiler: MSVC 19.44.35211.0
7+
- Linux:
8+
- Generator: GNU Make 4.4.1
9+
- C compiler: GNU GCC 14.2.0
10+
2. In a terminal, navigate to `giflib-5.2.2/build` and run `cmake ..`
11+
3. Build the library:
12+
- Windows:
13+
1. Open the generated Visual Studio solution
14+
2. Switch configuration to Release
15+
3. Rebuild all
16+
- Linux:
17+
1. Run `make` in the terminal

src/thirdparty/giflib-5.2.2/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ FILE( GLOB LIB_SOURCES
1111
gif_err.c
1212
gif_font.c
1313
gif_hash.c
14-
openbsd-reallocarray.c
1514
)
1615

1716
add_library( giflib ${LIB_SOURCES} )

src/thirdparty/giflib-5.2.2/Makefile

Lines changed: 0 additions & 219 deletions
This file was deleted.

0 commit comments

Comments
 (0)