06 Sep 2014
This commit is contained in:
g-cont
parent
8088ceac08
commit
3420a5d685
28
change.log
28
change.log
|
|
@ -1,3 +1,31 @@
|
|||
build 2664
|
||||
|
||||
Engine: restore right ordering of arguments of SV_StudioSetupBones export
|
||||
Render: a some cosmetic changes in RenderAPI
|
||||
Client: make levelshots for background demos
|
||||
Client: now cmd 'startdemos' invoke to play demos sequence like as background map
|
||||
Client: increase demo auto-naming from 100 up to 10000
|
||||
Client: fix bug with inverted PITCH of non-local playermodel
|
||||
Client: added FireCustomDecal into EfxAPI (was missed)
|
||||
GameUI: fix some crashes after end the background map (like call of trigger_endsection)
|
||||
Client: eliminate muzzleflash copy from mirror reflection in normal view
|
||||
Render: fix bug with max_texture_units clamping
|
||||
Render: completely remove glScissor calls (just unused)
|
||||
Render: update thirdperson code for mirrors
|
||||
Render: rewrite viewport setup code
|
||||
Render: fix software gamma adjustment bug while flashlight is enabled
|
||||
Render: reset vid_displayfrequency if current value isn't support by user display. Throw warning message
|
||||
Engine: allow new param in gameinfo.txt who called soundclip_dist <radius>. Default is 1000.
|
||||
Sound: new cmd 'playvol' like in GoldSrc
|
||||
Server: fix crash in 'Gunman Chronicles' at map end1.bsp
|
||||
Engine: show more infos with cmd 'mapstats'
|
||||
Network: fix bug with DT_TIMEWINDOW_8
|
||||
Server: fix bug with triggers with 'liquid' textures
|
||||
Server: fix some bugs in PVS calculation on server
|
||||
GameUI: enable auto-refresh of actual multiplayer maps list
|
||||
GameUI: update 3D playermodel preview for 16:9 screen aspect
|
||||
|
||||
|
||||
build 2636
|
||||
|
||||
Engine: added internal loader for deluxemap data (.dlit file that produces VHLT)
|
||||
|
|
|
|||
|
|
@ -1,278 +0,0 @@
|
|||
<html>
|
||||
<body>
|
||||
<pre>
|
||||
<h1>Build Log</h1>
|
||||
<h3>
|
||||
--------------------Configuration: cl_dll - Win32 Debug--------------------
|
||||
</h3>
|
||||
<h3>Command Lines</h3>
|
||||
Creating temporary file "C:\DOCUME~1\ÌÈØÀ\LOCALS~1\Temp\RSPACB.tmp" with contents
|
||||
[
|
||||
/nologo /G5 /MTd /W3 /Gm /GR /GX /ZI /Od /I "..\dlls" /I "..\common" /I "..\pm_shared" /I "..\engine" /I "..\utils\vgui\include" /I "..\game_shared" /D "_DEBUG" /D "_MBCS" /D "WIN32" /D "_WINDOWS" /D "CLIENT_DLL" /D "CLIENT_WEAPONS" /FR"..\temp\cl_dll\!debug/" /Fp"..\temp\cl_dll\!debug/cl_dll.pch" /YX /Fo"..\temp\cl_dll\!debug/" /Fd"..\temp\cl_dll\!debug/" /FD /c
|
||||
"D:\Xash3D\src_main\dlls\crossbow.cpp"
|
||||
"D:\Xash3D\src_main\dlls\crowbar.cpp"
|
||||
"D:\Xash3D\src_main\dlls\egon.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\ev_hldm.cpp"
|
||||
"D:\Xash3D\src_main\dlls\gauss.cpp"
|
||||
"D:\Xash3D\src_main\dlls\handgrenade.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\hl\hl_baseentity.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\hl\hl_events.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\hl\hl_objects.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\hl\hl_weapons.cpp"
|
||||
"D:\Xash3D\src_main\dlls\glock.cpp"
|
||||
"D:\Xash3D\src_main\dlls\hornetgun.cpp"
|
||||
"D:\Xash3D\src_main\dlls\mp5.cpp"
|
||||
"D:\Xash3D\src_main\dlls\python.cpp"
|
||||
"D:\Xash3D\src_main\dlls\rpg.cpp"
|
||||
"D:\Xash3D\src_main\dlls\satchel.cpp"
|
||||
"D:\Xash3D\src_main\dlls\shotgun.cpp"
|
||||
"D:\Xash3D\src_main\dlls\squeakgrenade.cpp"
|
||||
"D:\Xash3D\src_main\dlls\tripmine.cpp"
|
||||
"D:\Xash3D\src_main\game_shared\vgui_scrollbar2.cpp"
|
||||
"D:\Xash3D\src_main\game_shared\vgui_slider2.cpp"
|
||||
"D:\Xash3D\src_main\game_shared\voice_banmgr.cpp"
|
||||
"D:\Xash3D\src_main\game_shared\voice_status.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\ammo.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\ammo_secondary.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\ammohistory.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\battery.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\cdll_int.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\com_weapons.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\death.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\demo.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\entity.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\ev_common.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\events.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\flashlight.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\GameStudioModelRenderer.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\geiger.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\health.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\hud.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\hud_msg.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\hud_redraw.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\hud_servers.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\hud_spectator.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\hud_update.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\in_camera.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\input.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\inputw32.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\menu.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\message.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\parsemsg.cpp"
|
||||
"D:\Xash3D\src_main\pm_shared\pm_debug.c"
|
||||
"D:\Xash3D\src_main\pm_shared\pm_math.c"
|
||||
"D:\Xash3D\src_main\pm_shared\pm_shared.c"
|
||||
"D:\Xash3D\src_main\cl_dll\saytext.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\status_icons.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\statusbar.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\studio_util.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\StudioModelRenderer.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\text_message.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\train.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\tri.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\util.cpp"
|
||||
"D:\Xash3D\src_main\game_shared\vgui_checkbutton2.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\vgui_ClassMenu.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\vgui_ConsolePanel.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\vgui_ControlConfigPanel.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\vgui_CustomObjects.cpp"
|
||||
"D:\Xash3D\src_main\game_shared\vgui_grid.cpp"
|
||||
"D:\Xash3D\src_main\game_shared\vgui_helpers.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\vgui_int.cpp"
|
||||
"D:\Xash3D\src_main\game_shared\vgui_listbox.cpp"
|
||||
"D:\Xash3D\src_main\game_shared\vgui_loadtga.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\vgui_MOTDWindow.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\vgui_SchemeManager.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\vgui_ScorePanel.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\vgui_ServerBrowser.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\vgui_SpectatorPanel.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\vgui_TeamFortressViewport.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\vgui_teammenu.cpp"
|
||||
"D:\Xash3D\src_main\cl_dll\view.cpp"
|
||||
]
|
||||
Creating command line "cl.exe @"C:\DOCUME~1\ÌÈØÀ\LOCALS~1\Temp\RSPACB.tmp""
|
||||
Creating temporary file "C:\DOCUME~1\ÌÈØÀ\LOCALS~1\Temp\RSPACC.tmp" with contents
|
||||
[
|
||||
oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib winmm.lib ../utils/vgui/lib/win32_vc6/vgui.lib wsock32.lib /nologo /subsystem:windows /dll /incremental:yes /pdb:"..\temp\cl_dll\!debug/client.pdb" /debug /machine:I386 /out:"..\temp\cl_dll\!debug/client.dll" /implib:"..\temp\cl_dll\!debug/client.lib"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\crossbow.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\crowbar.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\egon.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\ev_hldm.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\gauss.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\handgrenade.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\hl_baseentity.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\hl_events.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\hl_objects.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\hl_weapons.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\glock.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\hornetgun.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\mp5.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\python.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\rpg.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\satchel.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\shotgun.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\squeakgrenade.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\tripmine.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\vgui_scrollbar2.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\vgui_slider2.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\voice_banmgr.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\voice_status.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\ammo.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\ammo_secondary.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\ammohistory.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\battery.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\cdll_int.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\com_weapons.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\death.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\demo.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\entity.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\ev_common.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\events.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\flashlight.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\GameStudioModelRenderer.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\geiger.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\health.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\hud.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\hud_msg.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\hud_redraw.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\hud_servers.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\hud_spectator.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\hud_update.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\in_camera.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\input.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\inputw32.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\menu.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\message.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\parsemsg.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\pm_debug.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\pm_math.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\pm_shared.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\saytext.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\status_icons.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\statusbar.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\studio_util.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\StudioModelRenderer.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\text_message.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\train.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\tri.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\util.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\vgui_checkbutton2.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\vgui_ClassMenu.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\vgui_ConsolePanel.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\vgui_ControlConfigPanel.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\vgui_CustomObjects.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\vgui_grid.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\vgui_helpers.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\vgui_int.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\vgui_listbox.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\vgui_loadtga.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\vgui_MOTDWindow.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\vgui_SchemeManager.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\vgui_ScorePanel.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\vgui_ServerBrowser.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\vgui_SpectatorPanel.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\vgui_TeamFortressViewport.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\vgui_teammenu.obj"
|
||||
"\Xash3D\src_main\temp\cl_dll\!debug\view.obj"
|
||||
]
|
||||
Creating command line "link.exe @"C:\DOCUME~1\ÌÈØÀ\LOCALS~1\Temp\RSPACC.tmp""
|
||||
Creating temporary file "C:\DOCUME~1\ÌÈØÀ\LOCALS~1\Temp\RSPACD.bat" with contents
|
||||
[
|
||||
@echo off
|
||||
copy \Xash3D\src_main\temp\cl_dll\!debug\client.dll "D:\Xash3D\valve\cl_dlls\client.dll"
|
||||
]
|
||||
Creating command line ""C:\DOCUME~1\ÌÈØÀ\LOCALS~1\Temp\RSPACD.bat""
|
||||
Compiling...
|
||||
crossbow.cpp
|
||||
crowbar.cpp
|
||||
egon.cpp
|
||||
ev_hldm.cpp
|
||||
gauss.cpp
|
||||
handgrenade.cpp
|
||||
hl_baseentity.cpp
|
||||
hl_events.cpp
|
||||
hl_objects.cpp
|
||||
hl_weapons.cpp
|
||||
glock.cpp
|
||||
hornetgun.cpp
|
||||
mp5.cpp
|
||||
python.cpp
|
||||
rpg.cpp
|
||||
satchel.cpp
|
||||
shotgun.cpp
|
||||
squeakgrenade.cpp
|
||||
tripmine.cpp
|
||||
vgui_scrollbar2.cpp
|
||||
vgui_slider2.cpp
|
||||
voice_banmgr.cpp
|
||||
voice_status.cpp
|
||||
ammo.cpp
|
||||
ammo_secondary.cpp
|
||||
ammohistory.cpp
|
||||
battery.cpp
|
||||
cdll_int.cpp
|
||||
com_weapons.cpp
|
||||
death.cpp
|
||||
demo.cpp
|
||||
entity.cpp
|
||||
ev_common.cpp
|
||||
events.cpp
|
||||
flashlight.cpp
|
||||
GameStudioModelRenderer.cpp
|
||||
geiger.cpp
|
||||
health.cpp
|
||||
hud.cpp
|
||||
hud_msg.cpp
|
||||
hud_redraw.cpp
|
||||
hud_servers.cpp
|
||||
hud_spectator.cpp
|
||||
hud_update.cpp
|
||||
in_camera.cpp
|
||||
input.cpp
|
||||
inputw32.cpp
|
||||
menu.cpp
|
||||
message.cpp
|
||||
parsemsg.cpp
|
||||
pm_debug.c
|
||||
pm_math.c
|
||||
pm_shared.c
|
||||
saytext.cpp
|
||||
status_icons.cpp
|
||||
statusbar.cpp
|
||||
studio_util.cpp
|
||||
StudioModelRenderer.cpp
|
||||
text_message.cpp
|
||||
train.cpp
|
||||
tri.cpp
|
||||
util.cpp
|
||||
vgui_checkbutton2.cpp
|
||||
vgui_ClassMenu.cpp
|
||||
vgui_ConsolePanel.cpp
|
||||
vgui_ControlConfigPanel.cpp
|
||||
vgui_CustomObjects.cpp
|
||||
vgui_grid.cpp
|
||||
vgui_helpers.cpp
|
||||
vgui_int.cpp
|
||||
vgui_listbox.cpp
|
||||
vgui_loadtga.cpp
|
||||
vgui_MOTDWindow.cpp
|
||||
vgui_SchemeManager.cpp
|
||||
vgui_ScorePanel.cpp
|
||||
vgui_ServerBrowser.cpp
|
||||
vgui_SpectatorPanel.cpp
|
||||
vgui_TeamFortressViewport.cpp
|
||||
vgui_teammenu.cpp
|
||||
view.cpp
|
||||
Linking...
|
||||
Creating library ..\temp\cl_dll\!debug/client.lib and object ..\temp\cl_dll\!debug/client.exp
|
||||
<h3>Output Window</h3>
|
||||
Performing Custom Build Step on \Xash3D\src_main\temp\cl_dll\!debug\client.dll
|
||||
‘ª®¯¨à®¢ ® ä ©«®¢: 1.
|
||||
|
||||
|
||||
|
||||
<h3>Results</h3>
|
||||
client.dll - 0 error(s), 0 warning(s)
|
||||
</pre>
|
||||
</body>
|
||||
</html>
|
||||
16
dlls/hl.plg
16
dlls/hl.plg
|
|
@ -1,16 +0,0 @@
|
|||
<html>
|
||||
<body>
|
||||
<pre>
|
||||
<h1>Build Log</h1>
|
||||
<h3>
|
||||
--------------------Configuration: hl - Win32 Release--------------------
|
||||
</h3>
|
||||
<h3>Command Lines</h3>
|
||||
|
||||
|
||||
|
||||
<h3>Results</h3>
|
||||
hl.dll - 0 error(s), 0 warning(s)
|
||||
</pre>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -221,7 +221,8 @@ void CL_UpdateEntityFields( cl_entity_t *ent )
|
|||
|
||||
qboolean CL_AddVisibleEntity( cl_entity_t *ent, int entityType )
|
||||
{
|
||||
if( !ent->model ) return false;
|
||||
if( !ent || !ent->model )
|
||||
return false;
|
||||
|
||||
if( entityType == ET_TEMPENTITY )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -616,7 +616,8 @@ void CL_ParseServerData( sizebuf_t *msg )
|
|||
#endif
|
||||
if( !cls.changedemo )
|
||||
UI_SetActiveMenu( cl.background );
|
||||
else Key_SetKeyDest( key_menu );
|
||||
else if( !cls.demoplayback )
|
||||
Key_SetKeyDest( key_menu );
|
||||
|
||||
cl.refdef.viewentity = cl.playernum + 1; // always keep viewent an actual
|
||||
|
||||
|
|
|
|||
|
|
@ -382,7 +382,7 @@ static void CL_DrawSegs( int modelIndex, float frame, int rendermode, const vec3
|
|||
pglVertex3fv( vPoint2 );
|
||||
}
|
||||
|
||||
vLast += vStep; // Advance texture scroll (v axis only)
|
||||
vLast += vStep; // Advance texture scroll (v axis only)
|
||||
noiseIndex += noiseStep;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -845,7 +845,7 @@ void R_DecalShoot( int textureIndex, int entityIndex, int modelIndex, vec3_t pos
|
|||
if( ent && !( flags & FDECAL_LOCAL_SPACE ))
|
||||
{
|
||||
vec3_t pos_l;
|
||||
|
||||
|
||||
// transform decal position in local bmodel space
|
||||
if( !VectorIsNull( ent->angles ))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -330,9 +330,9 @@ void R_SetTextureParameters( void )
|
|||
if( GL_Support( GL_TEXTURE_LODBIAS ))
|
||||
{
|
||||
if( gl_texture_lodbias->value > glConfig.max_texture_lodbias )
|
||||
Cvar_SetFloat( "r_texture_lodbias", glConfig.max_texture_lodbias );
|
||||
Cvar_SetFloat( "gl_texture_lodbias", glConfig.max_texture_lodbias );
|
||||
else if( gl_texture_lodbias->value < -glConfig.max_texture_lodbias )
|
||||
Cvar_SetFloat( "r_texture_lodbias", -glConfig.max_texture_lodbias );
|
||||
Cvar_SetFloat( "gl_texture_lodbias", -glConfig.max_texture_lodbias );
|
||||
}
|
||||
|
||||
gl_texture_lodbias->modified = false;
|
||||
|
|
|
|||
|
|
@ -939,6 +939,7 @@ void R_DrawSpriteModel( cl_entity_t *e )
|
|||
|
||||
if( R_SpriteOccluded( e, origin, &alpha, &scale ))
|
||||
return; // sprite culled
|
||||
|
||||
r_stats.c_sprite_models_drawn++;
|
||||
|
||||
if( psprite->texFormat == SPR_ALPHTEST && e->curstate.rendermode != kRenderTransAdd )
|
||||
|
|
@ -947,7 +948,7 @@ void R_DrawSpriteModel( cl_entity_t *e )
|
|||
pglAlphaFunc( GL_GREATER, 0.0f );
|
||||
}
|
||||
|
||||
if( e->curstate.rendermode == kRenderGlow )
|
||||
if( e->curstate.rendermode == kRenderGlow || e->curstate.rendermode == kRenderWorldGlow )
|
||||
pglDisable( GL_DEPTH_TEST );
|
||||
|
||||
// select properly rendermode
|
||||
|
|
@ -961,6 +962,7 @@ void R_DrawSpriteModel( cl_entity_t *e )
|
|||
break;
|
||||
case kRenderGlow:
|
||||
case kRenderTransAdd:
|
||||
case kRenderWorldGlow:
|
||||
pglDisable( GL_FOG );
|
||||
pglEnable( GL_BLEND );
|
||||
pglBlendFunc( GL_SRC_ALPHA, GL_ONE );
|
||||
|
|
@ -1101,7 +1103,7 @@ void R_DrawSpriteModel( cl_entity_t *e )
|
|||
if( psprite->facecull == SPR_CULL_NONE )
|
||||
GL_Cull( GL_FRONT );
|
||||
|
||||
if( e->curstate.rendermode == kRenderGlow )
|
||||
if( e->curstate.rendermode == kRenderGlow || e->curstate.rendermode == kRenderWorldGlow )
|
||||
pglEnable( GL_DEPTH_TEST );
|
||||
|
||||
if( psprite->texFormat == SPR_ALPHTEST && e->curstate.rendermode != kRenderTransAdd )
|
||||
|
|
|
|||
|
|
@ -136,7 +136,6 @@ vidmode_t vidmode[] =
|
|||
{ "Mode 20: 16x9", 1920, 1080, true },
|
||||
{ "Mode 21: 16x9", 1920, 1200, true },
|
||||
{ "Mode 22: 16x9", 2560, 1600, true },
|
||||
{ NULL, 0, 0, 0 },
|
||||
};
|
||||
|
||||
static dllfunc_t opengl_110funcs[] =
|
||||
|
|
@ -1207,7 +1206,7 @@ rserr_t R_ChangeDisplaySettings( int vid_mode, qboolean fullscreen )
|
|||
}
|
||||
|
||||
cds_result = ChangeDisplaySettings( &dm, CDS_FULLSCREEN );
|
||||
|
||||
|
||||
if( cds_result == DISP_CHANGE_SUCCESSFUL )
|
||||
{
|
||||
glState.fullScreen = true;
|
||||
|
|
|
|||
|
|
@ -48,6 +48,6 @@ int Q_buildnum( void )
|
|||
|
||||
return b;
|
||||
#else
|
||||
return 2664;
|
||||
return 2748;
|
||||
#endif
|
||||
}
|
||||
|
|
@ -840,7 +840,8 @@ void FS_ClearSearchPath( void )
|
|||
{
|
||||
W_Close( search->wad );
|
||||
}
|
||||
Mem_Free( search );
|
||||
|
||||
if( search ) Mem_Free( search );
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -106,6 +106,7 @@ qboolean Host_NewGame( const char *mapName, qboolean loadGame )
|
|||
|
||||
return iRet;
|
||||
}
|
||||
|
||||
/*
|
||||
================
|
||||
Host_EndGame
|
||||
|
|
|
|||
|
|
@ -167,7 +167,7 @@ qboolean Image_LoadMDL( const char *name, const byte *buffer, size_t filesize )
|
|||
if( image.hint == IL_HINT_NO )
|
||||
MsgDev( D_ERROR, "Image_LoadMDL: lump (%s) is corrupted\n", name );
|
||||
return false; // unknown or unsupported mode rejected
|
||||
}
|
||||
}
|
||||
|
||||
image.type = PF_INDEXED_32; // 32-bit palete
|
||||
|
||||
|
|
|
|||
|
|
@ -2527,12 +2527,12 @@ void Mod_CalcPHS( void )
|
|||
// NOTE: first leaf is skipped becuase is a outside leaf. Now all leafs have shift up by 1.
|
||||
// and last leaf (which equal worldmodel->numleafs) has no visdata! Add one extra leaf
|
||||
// to avoid this situation.
|
||||
num = worldmodel->numleafs + 1;
|
||||
num = worldmodel->numleafs;
|
||||
rowwords = (num + 31) >> 5;
|
||||
rowbytes = rowwords * 4;
|
||||
|
||||
// typically PHS reqiured more room because RLE fails on multiple 1 not 0
|
||||
phsdatasize = world.visdatasize * 4; // empirically determined
|
||||
phsdatasize = world.visdatasize * 32; // empirically determined
|
||||
|
||||
// allocate pvs and phs data single array
|
||||
visofs = Mem_Alloc( worldmodel->mempool, num * sizeof( int ));
|
||||
|
|
@ -2612,7 +2612,7 @@ void Mod_CalcPHS( void )
|
|||
|
||||
// apply leaf pointers
|
||||
for( i = 0; i < worldmodel->numleafs; i++ )
|
||||
worldmodel->leafs[i+1].compressed_pas = compressed_pas + visofs[i];
|
||||
worldmodel->leafs[i].compressed_pas = compressed_pas + visofs[i];
|
||||
|
||||
// release uncompressed data
|
||||
Mem_Free( uncompressed_vis );
|
||||
|
|
|
|||
|
|
@ -1237,7 +1237,7 @@ qboolean Delta_ReadField( sizebuf_t *msg, delta_t *pField, void *from, void *to,
|
|||
if( bChanged )
|
||||
{
|
||||
iValue = BF_ReadBitLong( msg, pField->bits, bSigned );
|
||||
flValue = (float)((int)(iValue * 0.01f));
|
||||
flValue = (float)((int)(iValue * 0.01f ));
|
||||
flTime = timebase + flValue;
|
||||
}
|
||||
else
|
||||
|
|
|
|||
|
|
@ -560,9 +560,6 @@ void NET_SendPacket( netsrc_t sock, size_t length, const void *data, netadr_t to
|
|||
}
|
||||
else Host_Error( "NET_SendPacket: bad address type %i\n", to.type );
|
||||
|
||||
if( to.type != NA_BROADCAST && to.type != NA_IP )
|
||||
Host_Error( "NET_SendPacket: bad address type %i\n", to.type );
|
||||
|
||||
NET_NetadrToSockadr( &to, &addr );
|
||||
|
||||
ret = pSendTo( net_socket, data, length, 0, &addr, sizeof( addr ));
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
static const char *uiCreditsDefault[] =
|
||||
{
|
||||
"",
|
||||
"Copyright XashXT Group 2013 (C)",
|
||||
"Copyright XashXT Group 2014 (C)",
|
||||
0
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -624,4 +624,4 @@ void UI_Main_Menu( void )
|
|||
UI_Main_Init();
|
||||
|
||||
UI_PushMenu( &uiMain.menu );
|
||||
}
|
||||
}
|
||||
Reference in New Issue