Skip to content

Commit a61c8d2

Browse files
authored
Merge branch 'master' into feature/isPlayerCrosshairVisible
2 parents a9f77c4 + 550a152 commit a61c8d2

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Server/mods/deathmatch/logic/CObject.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ CObject::CObject(CElement* pParent, CObjectManager* pObjectManager, bool bIsLowL
3333
m_bIsFrozen = false;
3434
m_bDoubleSided = false;
3535
m_bBreakable = false;
36-
m_bRespawnable = false;
36+
m_bRespawnable = true;
3737

3838
m_bCollisionsEnabled = true;
3939

utils/buildactions/install_cef.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ local CEF_URL_PREFIX = "https://cef-builds.spotifycdn.com/cef_binary_"
99
local CEF_URL_SUFFIX = "_windows32_minimal.tar.bz2"
1010

1111
-- Change here to update CEF version
12-
local CEF_VERSION = "128.4.12+g1d7a1f9+chromium-128.0.6613.138"
13-
local CEF_HASH = "bee2d201d5d259dc3a8f564dfb6fce43212437d5e62e139aa34777e1596d4a1c"
12+
local CEF_VERSION = "129.0.6+ga918aa7+chromium-129.0.6668.29"
13+
local CEF_HASH = "989b267d6c2eed6feed4ef304664763612619f1d4ca7f21d95a524c139870d36"
1414

1515
function make_cef_download_url()
1616
return CEF_URL_PREFIX..http.escapeUrlParam(CEF_VERSION)..CEF_URL_SUFFIX

0 commit comments

Comments
 (0)