[nexuiz-commits] r7309 - in branches/nexuiz-2.0: . data data/qcsrc/client data/qcsrc/menu/nexuiz data/qcsrc/server data/scripts misc/mediasource/menuskins/wickedz misc/tools
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Mon Aug 3 14:33:14 EDT 2009
Author: div0
Date: 2009-08-03 14:33:13 -0400 (Mon, 03 Aug 2009)
New Revision: 7309
Added:
branches/nexuiz-2.0/data/effects-high.cfg
branches/nexuiz-2.0/data/effects-low.cfg
branches/nexuiz-2.0/data/effects-med.cfg
branches/nexuiz-2.0/data/effects-normal.cfg
branches/nexuiz-2.0/data/effects-omg.cfg
branches/nexuiz-2.0/data/effects-ultimate.cfg
branches/nexuiz-2.0/data/effects-ultra.cfg
branches/nexuiz-2.0/misc/mediasource/menuskins/wickedz/background_builder/
Removed:
branches/nexuiz-2.0/data/high.cfg
branches/nexuiz-2.0/data/low.cfg
branches/nexuiz-2.0/data/med.cfg
branches/nexuiz-2.0/data/normal.cfg
branches/nexuiz-2.0/data/omg.cfg
branches/nexuiz-2.0/data/ultimate.cfg
branches/nexuiz-2.0/data/ultra.cfg
Modified:
branches/nexuiz-2.0/.patchsets
branches/nexuiz-2.0/data/Makefile
branches/nexuiz-2.0/data/defaultNexuiz.cfg
branches/nexuiz-2.0/data/nexuiz-credits.txt
branches/nexuiz-2.0/data/qcsrc/client/sbar.qc
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_effects.c
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_video.c
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/serverlist.c
branches/nexuiz-2.0/data/qcsrc/server/gamecommand.qc
branches/nexuiz-2.0/data/scripts/shaderlist.txt
branches/nexuiz-2.0/misc/tools/makebuild.sh
Log:
r7296 | div0 | 2009-08-03 09:44:30 -0400 (Mon, 03 Aug 2009) | 3 lines
credits update
tracebug test case update
r7298 | div0 | 2009-08-03 11:36:28 -0400 (Mon, 03 Aug 2009) | 2 lines
only update the bookmark/remove button when really needed
r7299 | div0 | 2009-08-03 12:09:06 -0400 (Mon, 03 Aug 2009) | 1 line
build script: use git for fteqcc
r7300 | div0 | 2009-08-03 12:19:31 -0400 (Mon, 03 Aug 2009) | 2 lines
background builder
r7301 | div0 | 2009-08-03 12:26:28 -0400 (Mon, 03 Aug 2009) | 1 line
add wickedz background building
r7302 | div0 | 2009-08-03 12:44:52 -0400 (Mon, 03 Aug 2009) | 2 lines
effects configs synced to menu again
r7303 | div0 | 2009-08-03 12:45:12 -0400 (Mon, 03 Aug 2009) | 2 lines
oops ;)
r7304 | div0 | 2009-08-03 12:46:40 -0400 (Mon, 03 Aug 2009) | 2 lines
resync shader list
r7305 | div0 | 2009-08-03 12:47:30 -0400 (Mon, 03 Aug 2009) | 2 lines
warmupfix
r7306 | div0 | 2009-08-03 12:52:46 -0400 (Mon, 03 Aug 2009) | 2 lines
minor fixes to client sbar (PLEASE TEST)
r7307 | div0 | 2009-08-03 13:18:20 -0400 (Mon, 03 Aug 2009) | 2 lines
fteqcc...
r7308 | div0 | 2009-08-03 14:27:53 -0400 (Mon, 03 Aug 2009) | 2 lines
use fteqcc -Werror
Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets 2009-08-03 18:27:53 UTC (rev 7308)
+++ branches/nexuiz-2.0/.patchsets 2009-08-03 18:33:13 UTC (rev 7309)
@@ -1,2 +1,2 @@
master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-7294
+revisions_applied = 1-7308
Modified: branches/nexuiz-2.0/data/Makefile
===================================================================
--- branches/nexuiz-2.0/data/Makefile 2009-08-03 18:27:53 UTC (rev 7308)
+++ branches/nexuiz-2.0/data/Makefile 2009-08-03 18:33:13 UTC (rev 7309)
@@ -5,7 +5,7 @@
ZIPEXCLUDE ?= -x\!*.pk3 -xr\!\.svn -x\!qcsrc
DIFF ?= diff
-FTEQCCFLAGS ?= -Wall -Wno-mundane -O3 -Ono-c -Ono-cs -flo
+FTEQCCFLAGS ?= -Werror -Wall -Wno-mundane -O3 -Ono-c -Ono-cs -flo
FTEQCCFLAGS_PROGS ?=
FTEQCCFLAGS_MENU ?=
Modified: branches/nexuiz-2.0/data/defaultNexuiz.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultNexuiz.cfg 2009-08-03 18:27:53 UTC (rev 7308)
+++ branches/nexuiz-2.0/data/defaultNexuiz.cfg 2009-08-03 18:33:13 UTC (rev 7309)
@@ -802,9 +802,9 @@
r_glsl_offsetmapping 0
r_glsl_offsetmapping_reliefmapping 0
r_glsl_offsetmapping_scale 0.02
-// execute normal.cfg to make sure that all effect settings are reset
+// execute effects-normal.cfg to make sure that all effect settings are reset
alias menu_sync "" // will be re-aliased later
-exec normal.cfg
+exec effects-normal.cfg
// misc
fs_empty_files_in_pack_mark_deletions 1 // makes patches able to delete files
Copied: branches/nexuiz-2.0/data/effects-high.cfg (from rev 7308, trunk/data/effects-high.cfg)
===================================================================
--- branches/nexuiz-2.0/data/effects-high.cfg (rev 0)
+++ branches/nexuiz-2.0/data/effects-high.cfg 2009-08-03 18:33:13 UTC (rev 7309)
@@ -0,0 +1,32 @@
+cl_decals 1
+cl_decals_time 4
+cl_nogibs 0
+cl_particles_quality 1
+gl_flashblend 0
+gl_picmip 0
+gl_texture_anisotropy 16
+mod_q3bsp_nolightmaps 0
+r_bloom 1
+r_coronas 1
+r_damageblur 0
+r_drawdecals_drawdistance 500
+r_drawparticles_drawdistance 2000
+r_glsl_deluxemapping 1
+r_glsl_offsetmapping 0
+r_glsl_offsetmapping_reliefmapping 0
+r_hdr 0
+r_motionblur 0
+r_picmipworld 0
+r_shadow_gloss 1
+r_shadow_realtime_dlight 1
+r_shadow_realtime_dlight_shadows 1
+r_shadow_realtime_world 0
+r_shadow_realtime_world_shadows 0
+r_shadow_usenormalmap 1
+r_showsurfaces 0
+r_subdivisions_tolerance 4
+r_water 1
+r_water_resolutionmultiplier 0.5
+vid_samples 1
+
+menu_sync
Copied: branches/nexuiz-2.0/data/effects-low.cfg (from rev 7308, trunk/data/effects-low.cfg)
===================================================================
--- branches/nexuiz-2.0/data/effects-low.cfg (rev 0)
+++ branches/nexuiz-2.0/data/effects-low.cfg 2009-08-03 18:33:13 UTC (rev 7309)
@@ -0,0 +1,32 @@
+cl_decals 1
+cl_decals_time 2
+cl_nogibs 0
+cl_particles_quality 0.20
+gl_flashblend 1
+gl_picmip 2
+gl_texture_anisotropy 1
+mod_q3bsp_nolightmaps 1
+r_bloom 0
+r_coronas 1
+r_damageblur 0
+r_drawdecals_drawdistance 200
+r_drawparticles_drawdistance 500
+r_glsl_deluxemapping 0
+r_glsl_offsetmapping 0
+r_glsl_offsetmapping_reliefmapping 0
+r_hdr 0
+r_motionblur 0
+r_picmipworld 1
+r_shadow_gloss 0
+r_shadow_realtime_dlight 0
+r_shadow_realtime_dlight_shadows 0
+r_shadow_realtime_world 0
+r_shadow_realtime_world_shadows 0
+r_shadow_usenormalmap 0
+r_showsurfaces 0
+r_subdivisions_tolerance 8
+r_water 0
+r_water_resolutionmultiplier 0.5
+vid_samples 1
+
+menu_sync
Copied: branches/nexuiz-2.0/data/effects-med.cfg (from rev 7308, trunk/data/effects-med.cfg)
===================================================================
--- branches/nexuiz-2.0/data/effects-med.cfg (rev 0)
+++ branches/nexuiz-2.0/data/effects-med.cfg 2009-08-03 18:33:13 UTC (rev 7309)
@@ -0,0 +1,32 @@
+cl_decals 1
+cl_decals_time 2
+cl_nogibs 0
+cl_particles_quality 0.5
+gl_flashblend 0
+gl_picmip 2
+gl_texture_anisotropy 1
+mod_q3bsp_nolightmaps 0
+r_bloom 0
+r_coronas 1
+r_damageblur 0
+r_drawdecals_drawdistance 300
+r_drawparticles_drawdistance 1000
+r_glsl_deluxemapping 0
+r_glsl_offsetmapping 0
+r_glsl_offsetmapping_reliefmapping 0
+r_hdr 0
+r_motionblur 0
+r_picmipworld 0
+r_shadow_gloss 0
+r_shadow_realtime_dlight 1
+r_shadow_realtime_dlight_shadows 0
+r_shadow_realtime_world 0
+r_shadow_realtime_world_shadows 0
+r_shadow_usenormalmap 0
+r_showsurfaces 0
+r_subdivisions_tolerance 4
+r_water 0
+r_water_resolutionmultiplier 0.5
+vid_samples 1
+
+menu_sync
Copied: branches/nexuiz-2.0/data/effects-normal.cfg (from rev 7308, trunk/data/effects-normal.cfg)
===================================================================
--- branches/nexuiz-2.0/data/effects-normal.cfg (rev 0)
+++ branches/nexuiz-2.0/data/effects-normal.cfg 2009-08-03 18:33:13 UTC (rev 7309)
@@ -0,0 +1,32 @@
+cl_decals 1
+cl_decals_time 2
+cl_nogibs 0
+cl_particles_quality 0.5
+gl_flashblend 0
+gl_picmip 1
+gl_texture_anisotropy 1
+mod_q3bsp_nolightmaps 0
+r_bloom 0
+r_coronas 1
+r_damageblur 0
+r_drawdecals_drawdistance 300
+r_drawparticles_drawdistance 1000
+r_glsl_deluxemapping 1
+r_glsl_offsetmapping 0
+r_glsl_offsetmapping_reliefmapping 0
+r_hdr 0
+r_motionblur 0
+r_picmipworld 0
+r_shadow_gloss 1
+r_shadow_realtime_dlight 1
+r_shadow_realtime_dlight_shadows 0
+r_shadow_realtime_world 0
+r_shadow_realtime_world_shadows 0
+r_shadow_usenormalmap 1
+r_showsurfaces 0
+r_subdivisions_tolerance 4
+r_water 0
+r_water_resolutionmultiplier 0.5
+vid_samples 1
+
+menu_sync
Copied: branches/nexuiz-2.0/data/effects-omg.cfg (from rev 7308, trunk/data/effects-omg.cfg)
===================================================================
--- branches/nexuiz-2.0/data/effects-omg.cfg (rev 0)
+++ branches/nexuiz-2.0/data/effects-omg.cfg 2009-08-03 18:33:13 UTC (rev 7309)
@@ -0,0 +1,32 @@
+cl_decals 0
+cl_decals_time 2
+cl_nogibs 0
+cl_particles_quality 0.20
+gl_flashblend 1
+gl_picmip 1337
+gl_texture_anisotropy 1
+mod_q3bsp_nolightmaps 1
+r_bloom 0
+r_coronas 1
+r_damageblur 0
+r_drawdecals_drawdistance 100
+r_drawparticles_drawdistance 250
+r_glsl_deluxemapping 0
+r_glsl_offsetmapping 0
+r_glsl_offsetmapping_reliefmapping 0
+r_hdr 0
+r_motionblur 0
+r_picmipworld 1
+r_shadow_gloss 0
+r_shadow_realtime_dlight 0
+r_shadow_realtime_dlight_shadows 0
+r_shadow_realtime_world 0
+r_shadow_realtime_world_shadows 0
+r_shadow_usenormalmap 0
+r_showsurfaces 3
+r_subdivisions_tolerance 16
+r_water 0
+r_water_resolutionmultiplier 0.5
+vid_samples 1
+
+menu_sync
Copied: branches/nexuiz-2.0/data/effects-ultimate.cfg (from rev 7308, trunk/data/effects-ultimate.cfg)
===================================================================
--- branches/nexuiz-2.0/data/effects-ultimate.cfg (rev 0)
+++ branches/nexuiz-2.0/data/effects-ultimate.cfg 2009-08-03 18:33:13 UTC (rev 7309)
@@ -0,0 +1,32 @@
+cl_decals 1
+cl_decals_time 10
+cl_nogibs 0
+cl_particles_quality 1
+gl_flashblend 0
+gl_picmip 0
+gl_texture_anisotropy 16
+mod_q3bsp_nolightmaps 0
+r_bloom 1
+r_coronas 1
+r_damageblur 0.4
+r_drawdecals_drawdistance 500
+r_drawparticles_drawdistance 2000
+r_glsl_deluxemapping 1
+r_glsl_offsetmapping 1
+r_glsl_offsetmapping_reliefmapping 1
+r_hdr 0
+r_motionblur 0.7
+r_picmipworld 0
+r_shadow_gloss 1
+r_shadow_realtime_dlight 1
+r_shadow_realtime_dlight_shadows 1
+r_shadow_realtime_world 1
+r_shadow_realtime_world_shadows 1
+r_shadow_usenormalmap 1
+r_showsurfaces 0
+r_subdivisions_tolerance 2
+r_water 1
+r_water_resolutionmultiplier 1
+vid_samples 4
+
+menu_sync
Copied: branches/nexuiz-2.0/data/effects-ultra.cfg (from rev 7308, trunk/data/effects-ultra.cfg)
===================================================================
--- branches/nexuiz-2.0/data/effects-ultra.cfg (rev 0)
+++ branches/nexuiz-2.0/data/effects-ultra.cfg 2009-08-03 18:33:13 UTC (rev 7309)
@@ -0,0 +1,32 @@
+cl_decals 1
+cl_decals_time 10
+cl_nogibs 0
+cl_particles_quality 1
+gl_flashblend 0
+gl_picmip 0
+gl_texture_anisotropy 16
+mod_q3bsp_nolightmaps 0
+r_bloom 1
+r_coronas 1
+r_damageblur 0
+r_drawdecals_drawdistance 500
+r_drawparticles_drawdistance 2000
+r_glsl_deluxemapping 1
+r_glsl_offsetmapping 0
+r_glsl_offsetmapping_reliefmapping 0
+r_hdr 0
+r_motionblur 0
+r_picmipworld 0
+r_shadow_gloss 1
+r_shadow_realtime_dlight 1
+r_shadow_realtime_dlight_shadows 1
+r_shadow_realtime_world 1
+r_shadow_realtime_world_shadows 1
+r_shadow_usenormalmap 1
+r_showsurfaces 0
+r_subdivisions_tolerance 3
+r_water 1
+r_water_resolutionmultiplier 0.5
+vid_samples 4
+
+menu_sync
Deleted: branches/nexuiz-2.0/data/high.cfg
===================================================================
--- branches/nexuiz-2.0/data/high.cfg 2009-08-03 18:27:53 UTC (rev 7308)
+++ branches/nexuiz-2.0/data/high.cfg 2009-08-03 18:33:13 UTC (rev 7309)
@@ -1,31 +0,0 @@
-cl_decals 1
-cl_decals_time 4
-cl_nogibs 0
-cl_particles_quality 1
-gl_picmip 0
-gl_flashblend 0
-r_picmipworld 0
-gl_texture_anisotropy 16
-mod_q3bsp_nolightmaps 0
-r_bloom 1
-r_coronas 1
-r_glsl_deluxemapping 1
-r_glsl_offsetmapping 0
-r_glsl_offsetmapping_reliefmapping 0
-r_hdr 0
-r_shadow_usenormalmap 1
-r_shadow_gloss 1
-r_shadow_realtime_dlight 1
-r_shadow_realtime_dlight_shadows 1
-r_shadow_realtime_world 0
-r_shadow_realtime_world_shadows 0
-r_depthfirst 1
-r_showsurfaces 0
-r_water 1
-r_water_resolutionmultiplier 0.5
-r_drawparticles_drawdistance 2000
-r_drawdecals_drawdistance 500
-r_subdivisions_tolerance 4
-vid_samples 1
-
-menu_sync
Deleted: branches/nexuiz-2.0/data/low.cfg
===================================================================
--- branches/nexuiz-2.0/data/low.cfg 2009-08-03 18:27:53 UTC (rev 7308)
+++ branches/nexuiz-2.0/data/low.cfg 2009-08-03 18:33:13 UTC (rev 7309)
@@ -1,31 +0,0 @@
-cl_decals 1
-cl_decals_time 2
-cl_nogibs 0
-cl_particles_quality 0.20
-gl_flashblend 1
-gl_picmip 2
-r_picmipworld 1
-gl_texture_anisotropy 1
-mod_q3bsp_nolightmaps 1
-r_bloom 0
-r_coronas 1
-r_glsl_deluxemapping 0
-r_glsl_offsetmapping 0
-r_glsl_offsetmapping_reliefmapping 0
-r_hdr 0
-r_shadow_usenormalmap 0
-r_shadow_gloss 0
-r_shadow_realtime_dlight 0
-r_shadow_realtime_dlight_shadows 0
-r_shadow_realtime_world 0
-r_shadow_realtime_world_shadows 0
-r_depthfirst 0
-r_showsurfaces 0
-r_water 0
-r_water_resolutionmultiplier 0.5
-r_drawparticles_drawdistance 500
-r_drawdecals_drawdistance 200
-r_subdivisions_tolerance 8
-vid_samples 1
-
-menu_sync
Deleted: branches/nexuiz-2.0/data/med.cfg
===================================================================
--- branches/nexuiz-2.0/data/med.cfg 2009-08-03 18:27:53 UTC (rev 7308)
+++ branches/nexuiz-2.0/data/med.cfg 2009-08-03 18:33:13 UTC (rev 7309)
@@ -1,31 +0,0 @@
-cl_decals 1
-cl_decals_time 2
-cl_nogibs 0
-cl_particles_quality 0.5
-gl_picmip 2
-gl_flashblend 0
-r_picmipworld 0
-gl_texture_anisotropy 1
-mod_q3bsp_nolightmaps 0
-r_bloom 0
-r_coronas 1
-r_glsl_deluxemapping 0
-r_glsl_offsetmapping 0
-r_glsl_offsetmapping_reliefmapping 0
-r_hdr 0
-r_shadow_usenormalmap 0
-r_shadow_gloss 0
-r_shadow_realtime_dlight 1
-r_shadow_realtime_dlight_shadows 0
-r_shadow_realtime_world 0
-r_shadow_realtime_world_shadows 0
-r_depthfirst 0
-r_showsurfaces 0
-r_water 0
-r_water_resolutionmultiplier 0.5
-r_drawparticles_drawdistance 1000
-r_drawdecals_drawdistance 300
-r_subdivisions_tolerance 4
-vid_samples 1
-
-menu_sync
Modified: branches/nexuiz-2.0/data/nexuiz-credits.txt
===================================================================
--- branches/nexuiz-2.0/data/nexuiz-credits.txt 2009-08-03 18:27:53 UTC (rev 7308)
+++ branches/nexuiz-2.0/data/nexuiz-credits.txt 2009-08-03 18:33:13 UTC (rev 7309)
@@ -22,25 +22,28 @@
Andreas "Black" Kirsch
*Programmer
-Stephan "esteel" Stahl
-*Programmer
+Michael "Tenshihan" Quinn
+*Sound FX and Player-Voices
+Paul "Strahlemann" Evers
+*Level Designer
+
Peter "Morphed" Pielak
*Artist
-Paul "Strahlemann" Evers
-*Level Designer
+Samual Lenks
+*Programmer
-Wolfgang "Blub\0" Bumiller
+Saulo "mand1nga" Gil
*Programmer
+Stephan "esteel" Stahl
+*Programmer
+
Tyler "-z-" Mulligan
*Web Developer and Interaction Designer
-Michael "Tenshihan" Quinn
-*Sound FX and Player-Voices
-
-Saulo "mand1nga" Gil
+Wolfgang "Blub\0" Bumiller
*Programmer
Deleted: branches/nexuiz-2.0/data/normal.cfg
===================================================================
--- branches/nexuiz-2.0/data/normal.cfg 2009-08-03 18:27:53 UTC (rev 7308)
+++ branches/nexuiz-2.0/data/normal.cfg 2009-08-03 18:33:13 UTC (rev 7309)
@@ -1,31 +0,0 @@
-cl_decals 1
-cl_decals_time 2
-cl_nogibs 0
-cl_particles_quality 0.5
-gl_picmip 1
-gl_flashblend 0
-r_picmipworld 0
-gl_texture_anisotropy 1
-mod_q3bsp_nolightmaps 0
-r_bloom 0
-r_coronas 1
-r_glsl_deluxemapping 1
-r_glsl_offsetmapping 0
-r_glsl_offsetmapping_reliefmapping 0
-r_hdr 0
-r_shadow_usenormalmap 1
-r_shadow_gloss 1
-r_shadow_realtime_dlight 1
-r_shadow_realtime_dlight_shadows 0
-r_shadow_realtime_world 0
-r_shadow_realtime_world_shadows 0
-r_depthfirst 1
-r_showsurfaces 0
-r_water 0
-r_water_resolutionmultiplier 0.5
-r_drawparticles_drawdistance 1000
-r_drawdecals_drawdistance 300
-r_subdivisions_tolerance 4
-vid_samples 1
-
-menu_sync
Deleted: branches/nexuiz-2.0/data/omg.cfg
===================================================================
--- branches/nexuiz-2.0/data/omg.cfg 2009-08-03 18:27:53 UTC (rev 7308)
+++ branches/nexuiz-2.0/data/omg.cfg 2009-08-03 18:33:13 UTC (rev 7309)
@@ -1,31 +0,0 @@
-cl_decals 0
-cl_decals_time 2
-cl_nogibs 0
-cl_particles_quality 0.20
-gl_flashblend 1
-gl_picmip 1337
-r_picmipworld 1
-gl_texture_anisotropy 1
-mod_q3bsp_nolightmaps 1
-r_bloom 0
-r_coronas 1
-r_glsl_deluxemapping 0
-r_glsl_offsetmapping 0
-r_glsl_offsetmapping_reliefmapping 0
-r_hdr 0
-r_shadow_usenormalmap 0
-r_shadow_gloss 0
-r_shadow_realtime_dlight 0
-r_shadow_realtime_dlight_shadows 0
-r_shadow_realtime_world 0
-r_shadow_realtime_world_shadows 0
-r_depthfirst 0
-r_showsurfaces 1
-r_water 0
-r_water_resolutionmultiplier 0.5
-r_drawparticles_drawdistance 250
-r_drawdecals_drawdistance 100
-r_subdivisions_tolerance 16
-vid_samples 1
-
-menu_sync
Modified: branches/nexuiz-2.0/data/qcsrc/client/sbar.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/sbar.qc 2009-08-03 18:27:53 UTC (rev 7308)
+++ branches/nexuiz-2.0/data/qcsrc/client/sbar.qc 2009-08-03 18:33:13 UTC (rev 7309)
@@ -417,9 +417,6 @@
}
}
-#define MIN_NAMELEN 24
-#define MAX_NAMELEN 24
-
string Sbar_DefaultColumnLayout()
{
return strcat( // fteqcc sucks
@@ -511,7 +508,6 @@
sbar_field[sbar_num_fields] = SP_KDRATIO;
} else if(str == "name" || str == "nick") {
sbar_field[sbar_num_fields] = SP_NAME;
- sbar_size[sbar_num_fields] = MIN_NAMELEN; // minimum size? any use?
have_name = 1;
} else if(str == "|") {
sbar_field[sbar_num_fields] = SP_SEPARATOR;
@@ -564,7 +560,6 @@
}
sbar_title[0] = strzone("name");
sbar_field[0] = SP_NAME;
- sbar_size[0] = MIN_NAMELEN; // minimum size? any use?
++sbar_num_fields;
print("fixed missing field 'name'\n");
@@ -593,7 +588,6 @@
++sbar_num_fields;
print("fixed missing field '|'\n");
}
-
if(!have_secondary)
{
strunzone(sbar_title[sbar_num_fields]);
@@ -603,7 +597,6 @@
++sbar_num_fields;
print("fixed missing field '", scores_label[ps_secondary], "'\n");
}
-
if(!have_primary)
{
strunzone(sbar_title[sbar_num_fields]);
@@ -737,22 +730,10 @@
string Sbar_FixScoreboardColumnWidth(float i, string str)
{
- float field, maxsize, j, f;
+ float field, f;
vector sz;
field = sbar_field[i];
- if(field == SP_NAME) // name gets all remaining space
- {
- maxsize = (xmax - xmin) / sbar_fontsize_x;
- for(j = 0; j < sbar_num_fields; ++j) if(j != i) if(sbar_field[j] != SP_SEPARATOR)
- maxsize -= sbar_size[j] + 1;
- maxsize += 1;
- str = textShortenToWidth(str, maxsize, stringwidth_colors);
- sbar_fixscoreboardcolumnwidth_len = stringwidth(str, TRUE);
- }
- else
- sbar_fixscoreboardcolumnwidth_len = stringwidth(str, FALSE);
-
sbar_fixscoreboardcolumnwidth_iconlen = 0;
if(sbar_field_icon0 != "")
@@ -781,11 +762,30 @@
sbar_fixscoreboardcolumnwidth_iconlen *= sbar_fontsize_y / sbar_fontsize_x; // fix icon aspect
- if(sbar_fixscoreboardcolumnwidth_iconlen != 0 && sbar_fixscoreboardcolumnwidth_len != 0)
+ if(sbar_fixscoreboardcolumnwidth_iconlen != 0)
sbar_fixscoreboardcolumnwidth_marginlen = stringwidth(" ", FALSE);
else
sbar_fixscoreboardcolumnwidth_marginlen = 0;
+ if(field == SP_NAME) // name gets all remaining space
+ {
+ float size, j;
+ size = sbwidth / sbar_fontsize_x;
+ for(j = 0; j < sbar_num_fields; ++j)
+ if(j != i)
+ if (sbar_field[i] != SP_SEPARATOR)
+ size -= sbar_size[j] + 1;
+ size += 1;
+ sbar_size[i] = size;
+
+ if (sbar_fixscoreboardcolumnwidth_iconlen != 0)
+ size -= sbar_fixscoreboardcolumnwidth_marginlen + sbar_fixscoreboardcolumnwidth_iconlen;
+ str = textShortenToWidth(str, size, stringwidth_colors);
+ sbar_fixscoreboardcolumnwidth_len = stringwidth(str, TRUE);
+ }
+ else
+ sbar_fixscoreboardcolumnwidth_len = stringwidth(str, FALSE);
+
f = sbar_fixscoreboardcolumnwidth_len + sbar_fixscoreboardcolumnwidth_marginlen + sbar_fixscoreboardcolumnwidth_iconlen;
if(sbar_size[i] < f)
sbar_size[i] = f;
@@ -871,7 +871,7 @@
tmp_x = sbar_fontsize_x*sbar_fixscoreboardcolumnwidth_len; // left or right aligned? let's put it right...
drawcolorcodedstring(pos - tmp, str, sbar_fontsize, 1, DRAWFLAG_NORMAL);
} else {
- tmp_x = sbar_fontsize_x*sbar_fixscoreboardcolumnwidth_len; //strlen(str);
+ tmp_x = sbar_fontsize_x*sbar_fixscoreboardcolumnwidth_len;
drawstring(pos - tmp, str, sbar_fontsize, sbar_field_rgb, 1, DRAWFLAG_NORMAL);
}
@@ -896,7 +896,7 @@
vector Sbar_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_size)
{
- float body_table_height, i, pos_x_save;
+ float body_table_height, i;
vector tmp, column_dim;
entity pl;
@@ -905,7 +905,6 @@
pos -= '1 1 0';
tmp_x = sbwidth + 2;
-
tmp_y = 1.25 * sbar_fontsize_y;
// rounded header
@@ -936,8 +935,6 @@
pos += '1 1 0';
- pos_x_save = pos_x; // will be restored after the columns headers are printed
-
if (sbar_scoreboard_highlight)
{
column_dim_y = 1.25 * sbar_fontsize_y; // header
@@ -945,7 +942,7 @@
column_dim_y += body_table_height;
}
- // print the strings of the columns headers
+ // print the strings of the columns headers and draw the columns
for(i = 0; i < sbar_num_fields; ++i)
{
if(sbar_field[i] == SP_SEPARATOR)
@@ -962,30 +959,38 @@
if(sbar_field[i] == SP_SEPARATOR)
{
pos_x = xmax;
+ tmp_y = 0;
for(i = sbar_num_fields-1; i > 0; --i)
{
if(sbar_field[i] == SP_SEPARATOR)
break;
+
pos_x -= sbar_size[i]*sbar_fontsize_x;
if (sbar_scoreboard_highlight)
{
- if (i == sbar_num_fields-1)
- column_dim_x = sbar_fontsize_x*sbar_size[i] + sbar_fontsize_x / 2 + 1;
- else
- column_dim_x = sbar_fontsize_x*sbar_size[i] + sbar_fontsize_x;
if (!mod(i,2))
+ {
+ if (i == sbar_num_fields-1)
+ column_dim_x = sbar_fontsize_x*sbar_size[i] + sbar_fontsize_x / 2 + 1;
+ else
+ column_dim_x = sbar_fontsize_x*sbar_size[i] + sbar_fontsize_x;
drawfill(pos - '0 1 0' - sbar_fontsize_x / 2 * '1 0 0', column_dim, '0 0 0', sbar_scoreboard_alpha_bg * 0.2, DRAWFLAG_NORMAL);
+ }
}
- drawstring(pos, sbar_title[i], sbar_fontsize, rgb, 1, DRAWFLAG_NORMAL);
+
+ tmp_x = stringwidth(sbar_title[i], FALSE);
+ tmp_x = (sbar_size[i] - tmp_x) * sbar_fontsize_x;
+ drawstring(pos + tmp, sbar_title[i], sbar_fontsize, rgb, 1, DRAWFLAG_NORMAL);
pos_x -= sbar_fontsize_x;
}
}
-
- pos_x = pos_x_save;
+
+ pos_x = xmin;
pos_y += 1.25 * sbar_fontsize_y; // skip the header
pos_y += sbar_border_thickness;
+ // fill the table and draw the rows
i = 0;
if (teamplay)
for(pl = players.sort_next; pl; pl = pl.sort_next)
@@ -1006,8 +1011,8 @@
++i;
}
- pos_y += 1.25 * sbar_fontsize_y;
- pos_y += 1.25 * sbar_fontsize_y; // add an empty row
+ pos_y += 1.25 * sbar_fontsize_y; // move to the end of the table
+ pos_y += 1.25 * sbar_fontsize_y; // move empty row (out of the table)
return pos;
}
@@ -1438,7 +1443,7 @@
else
timer_color = '1 0 0'; //red
- if (cvar("sbar_increment_maptime") || timelimit == 0) {
+ if (cvar("sbar_increment_maptime") || timelimit == 0 || warmup_stage) {
if (time < getstatf(STAT_GAMESTARTTIME)) {
//while restart is still active, show 00:00
minutes = seconds = 0;
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_effects.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_effects.c 2009-08-03 18:27:53 UTC (rev 7308)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_effects.c 2009-08-03 18:33:13 UTC (rev 7309)
@@ -46,6 +46,13 @@
e.addValue(e, "Insane", "1");
e.configureNexuizTextSliderValues(e);
me.TR(me);
+ me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Antialiasing:"));
+ me.TD(me, 1, 2, e = makeNexuizTextSlider("vid_samples"));
+ e.addValue(e, "Disabled", "1");
+ e.addValue(e, "2x", "2");
+ e.addValue(e, "4x", "4");
+ e.configureNexuizTextSliderValues(e);
+ me.TR(me);
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Texture quality:"));
me.TD(me, 1, 2, e = makeNexuizTextSlider("gl_picmip"));
if(cvar("developer"))
@@ -61,10 +68,15 @@
me.TD(me, 1, 2.8, e = makeNexuizCheckBox(1, "r_picmipworld", "Reduce model texture quality only"));
setDependent(e, "gl_picmip", 0.5, -0.5);
me.TR(me);
- me.TD(me, 1, 3, e = makeNexuizCheckBox(1, "mod_q3bsp_nolightmaps", "Use lightmaps"));
-
+ me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Anisotropy:"));
+ me.TD(me, 1, 2, e = makeNexuizTextSlider("gl_texture_anisotropy"));
+ e.addValue(e, "Disabled", "1");
+ e.addValue(e, "2x", "2");
+ e.addValue(e, "4x", "4");
+ e.addValue(e, "8x", "8");
+ e.addValue(e, "16x", "16");
+ e.configureNexuizTextSliderValues(e);
me.TR(me);
-
me.TR(me);
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Particle quality:"));
me.TD(me, 1, 2, e = makeNexuizSlider(0.1, 1.0, 0.05, "cl_particles_quality"));
@@ -85,10 +97,8 @@
setDependent(e, "cl_decals", 1, 1);
me.TD(me, 1, 2, e = makeNexuizSlider(1, 20, 1, "cl_decals_time"));
setDependent(e, "cl_decals", 1, 1);
-
me.TR(me);
- me.TR(me);
- me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_gentle", "Disable gore effects"));
+ me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_gentle", "Disable gore effects")); // TODO move this away, this is user preference, and preset .cfg files do not change this
me.TR(me);
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Gibs:"));
@@ -101,26 +111,32 @@
me.TR(me);
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Damage kick:"));
- me.TD(me, 1, 2, e = makeNexuizSlider(0, 0.5, 0.05, "v_kicktime"));
+ me.TD(me, 1, 2, e = makeNexuizSlider(0, 0.5, 0.05, "v_kicktime")); // TODO move this away, this is user preference, and preset .cfg files do not change this
me.gotoRC(me, 2, 3.5); me.setFirstColumn(me, me.currentColumn);
- me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Anisotropy:"));
- me.TD(me, 1, 2, e = makeNexuizTextSlider("gl_texture_anisotropy"));
- e.addValue(e, "1x", "1");
- e.addValue(e, "2x", "2");
- e.addValue(e, "4x", "4");
- e.addValue(e, "8x", "8");
- e.addValue(e, "16x", "16");
+ me.TD(me, 1, 2, e = makeNexuizCheckBox(1, "mod_q3bsp_nolightmaps", "Use lightmaps"));
+ me.TD(me, 1, 1.9, e = makeNexuizCheckBox(0, "r_glsl_deluxemapping", "Deluxe mapping"));
+ setDependentAND(e, "r_glsl", 1, 1, "mod_q3bsp_nolightmaps", 0, 0);
+ me.TD(me, 1, 0.7, e = makeNexuizCheckBox(0, "r_shadow_gloss", "Gloss"));
+ setDependentAND3(e, "r_glsl", 1, 1, "r_glsl_deluxemapping", 1, 2, "mod_q3bsp_nolightmaps", 0, 0);
+ me.TR(me);
+ me.TD(me, 1, 1.5, e = makeNexuizCheckBox(0, "r_glsl_offsetmapping", "Offset mapping"));
+ setDependent(e, "r_glsl", 1, 1);
+ me.TD(me, 1, 1.9, e = makeNexuizCheckBox(0, "r_glsl_offsetmapping_reliefmapping", "Relief mapping"));
+ setDependentAND(e, "r_glsl", 1, 1, "r_glsl_offsetmapping", 1, 1);
+ me.TR(me);
+ me.TD(me, 1, 1, e = makeNexuizCheckBox(0, "r_water", "Reflections:"));
+ setDependent(e, "r_glsl", 1, 1);
+ me.TD(me, 1, 2, e = makeNexuizTextSlider("r_water_resolutionmultiplier"));
+ e.addValue(e, "Blurred", "0.25");
+ e.addValue(e, "Good", "0.5");
+ e.addValue(e, "Sharp", "1");
e.configureNexuizTextSliderValues(e);
+ setDependentAND(e, "r_glsl", 1, 1, "r_water", 1, 1);
me.TR(me);
- me.TD(me, 1, 1.5, e = makeNexuizCheckBox(0, "r_glsl_deluxemapping", "Deluxe mapping"));
- setDependentAND(e, "r_glsl", 1, 1, "mod_q3bsp_nolightmaps", 0, 0);
- me.TD(me, 1, 1.5, e = makeNexuizCheckBox(0, "r_shadow_gloss", "Gloss"));
- setDependentAND3(e, "r_glsl", 1, 1, "r_glsl_deluxemapping", 1, 2, "mod_q3bsp_nolightmaps", 0, 0);
-
+ if(cvar("developer"))
+ me.TD(me, 1, 3, e = makeNexuizCheckBoxEx(3, 0, "r_showsurfaces", "Show surfaces"));
me.TR(me);
-
- me.TR(me);
me.TD(me, 1, 3, e = makeNexuizRadioButton(1, string_null, string_null, "No dynamic lighting"));
me.TR(me);
me.TD(me, 1, 3, e = makeNexuizRadioButton(1, "gl_flashblend", string_null, "Flash blend approximation"));
@@ -136,38 +152,25 @@
me.TDempty(me, 0.2);
me.TD(me, 1, 2.8, e = makeNexuizCheckBox(0, "r_shadow_usenormalmap", "Use normal maps"));
setDependentOR(e, "r_shadow_realtime_dlight", 1, 1, "r_shadow_realtime_world", 1, 1);
-
me.TR(me);
- if(cvar("developer"))
- me.TD(me, 1, 3, e = makeNexuizCheckBoxEx(3, 0, "r_showsurfaces", "Show surfaces"));
-
+ me.TD(me, 1, 1, e = makeNexuizCheckBox(0, "r_coronas", "Coronas"));
+ me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "r_coronas_occlusionquery", "Use occlusion queries")); // TODO move this away, this is user preference, and preset .cfg files do not change this
me.TR(me);
- me.TD(me, 1, 1.5, e = makeNexuizCheckBox(0, "r_glsl_offsetmapping", "Offset mapping"));
- setDependent(e, "r_glsl", 1, 1);
- me.TD(me, 1, 1.5, e = makeNexuizCheckBox(0, "r_glsl_offsetmapping_reliefmapping", "Relief mapping"));
- setDependentAND(e, "r_glsl", 1, 1, "r_glsl_offsetmapping", 1, 1);
-
+ me.TD(me, 1, 1, e = makeNexuizCheckBox(0, "r_bloom", "Bloom"));
+ setDependent(e, "r_hdr", 0, 0);
+ me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "r_hdr", "High Dynamic Range (HDR)"));
me.TR(me);
- me.TD(me, 1, 1, e = makeNexuizCheckBox(0, "r_water", "Reflections:"));
- setDependent(e, "r_glsl", 1, 1);
- me.TD(me, 1, 2, e = makeNexuizTextSlider("r_water_resolutionmultiplier"));
- e.addValue(e, "Blurred", "0.25");
- e.addValue(e, "Good", "0.5");
- e.addValue(e, "Sharp", "1");
- e.configureNexuizTextSliderValues(e);
- setDependentAND(e, "r_glsl", 1, 1, "r_water", 1, 1);
me.TR(me);
-
+ me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Motion blur:"));
+ me.TD(me, 1, 2, e = makeNexuizSlider(0, 1, 0.1, "r_motionblur"));
me.TR(me);
- me.TD(me, 1, 1, e = makeNexuizCheckBox(0, "r_coronas", "Coronas"));
- me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "r_coronas_occlusionquery", "Use occlusion queries"));
- me.TR(me);
- me.TD(me, 1, 1, e = makeNexuizCheckBox(0, "r_bloom", "Bloom"));
- setDependent(e, "r_hdr", 0, 0);
- me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "r_hdr", "High Dynamic Range (HDR)"));
-
+ me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Damage blur:"));
+ setDependent(e, "r_motionblur", 0, 1);
+ me.TD(me, 1, 2, e = makeNexuizSlider(0, 1, 0.1, "r_damageblur"));
+ setDependent(e, "r_motionblur", 0, 1);
+
me.gotoRC(me, me.rows - 1, 0);
- me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "r_restart", COMMANDBUTTON_APPLY));
+ me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "vid_restart", COMMANDBUTTON_APPLY));
}
#endif
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_video.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_video.c 2009-08-03 18:27:53 UTC (rev 7308)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_video.c 2009-08-03 18:33:13 UTC (rev 7309)
@@ -94,9 +94,6 @@
me.TD(me, 1, 2, e = makeNexuizSlider(0.5, 2.0, 0.05, "r_hdr_scenebrightness"));
me.TR(me);
me.TR(me);
- me.TD(me, 1, 3, e = makeNexuizCheckBoxEx(4, 1, "vid_samples", "Use 4x multisampling"));
- me.TR(me);
- me.TR(me);
me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "v_flipped", "Left handed mode"));
me.TR(me);
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/serverlist.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/serverlist.c 2009-08-03 18:27:53 UTC (rev 7308)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/serverlist.c 2009-08-03 18:33:13 UTC (rev 7309)
@@ -46,6 +46,8 @@
ATTRIB(NexuizServerList, currentSortField, float, -1)
ATTRIB(NexuizServerList, lastClickedServer, float, -1)
ATTRIB(NexuizServerList, lastClickedTime, float, 0)
+
+ ATTRIB(NexuizServerList, ipAddressBoxFocused, float, -1)
ENDCLASS(NexuizServerList)
entity makeNexuizServerList();
void ServerList_Connect_Click(entity btn, entity me);
@@ -298,10 +300,17 @@
me.ipAddressBox.cursorPos = strlen(me.selectedServer);
}
- if(IsFavorite(me.ipAddressBox.text))
- me.favoriteButton.setText(me.favoriteButton, "Remove");
- else
- me.favoriteButton.setText(me.favoriteButton, "Bookmark");
+ if(me.ipAddressBoxFocused != me.ipAddressBox.focused)
+ {
+ me.ipAddressBoxFocused = me.ipAddressBox.focused;
+ if(me.ipAddressBoxFocused)
+ {
+ if(IsFavorite(me.ipAddressBox.text))
+ me.favoriteButton.setText(me.favoriteButton, "Remove");
+ else
+ me.favoriteButton.setText(me.favoriteButton, "Bookmark");
+ }
+ }
drawListBox(me);
}
@@ -475,7 +484,10 @@
string ipstr;
ipstr = netaddress_resolve(me.ipAddressBox.text, 26000);
if(ipstr != "")
+ {
ToggleFavorite(me.ipAddressBox.text);
+ me.ipAddressBoxFocused = -1;
+ }
}
void ServerList_Info_Click(entity btn, entity me)
{
@@ -576,7 +588,10 @@
{
i = me.selectedItem;
if(i < me.nItems)
+ {
ToggleFavorite(me.selectedServer);
+ me.ipAddressBoxFocused = -1;
+ }
}
else if(keyDownListBox(me, scan, ascii, shift))
return 1;
Modified: branches/nexuiz-2.0/data/qcsrc/server/gamecommand.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/gamecommand.qc 2009-08-03 18:27:53 UTC (rev 7308)
+++ branches/nexuiz-2.0/data/qcsrc/server/gamecommand.qc 2009-08-03 18:33:13 UTC (rev 7309)
@@ -875,7 +875,8 @@
print("TEST CASE. If this returns the runaway loop counter error, possibly everything is oaky.\n");
for(;;)
{
- vector org, delta, start, end, p;
+ vector org, delta, start, end, p, pos;
+ float safe, unsafe;
org = world.mins;
delta = world.maxs - world.mins;
@@ -902,11 +903,36 @@
tracebox(start, PL_MIN, PL_MAX, end, MOVE_NOMONSTERS, world);
tracebox(p, PL_MIN, PL_MAX, p, MOVE_NOMONSTERS, world);
+ // how much do we need to back off?
+ safe = 1;
+ unsafe = 0;
+ for(;;)
+ {
+ pos = p * (1 - (safe + unsafe) * 0.5) + start * ((safe + unsafe) * 0.5);
+ tracebox(pos, PL_MIN, PL_MAX, pos, MOVE_NOMONSTERS, world);
+ if(trace_startsolid)
+ {
+ if((safe + unsafe) * 0.5 == unsafe)
+ break;
+ unsafe = (safe + unsafe) * 0.5;
+ }
+ else
+ {
+ if((safe + unsafe) * 0.5 == safe)
+ break;
+ safe = (safe + unsafe) * 0.5;
+ }
+ }
+
+ print("safe distance to back off: ", ftos(safe * vlen(p - start)), "qu\n");
+ print("unsafe distance to back off: ", ftos(unsafe * vlen(p - start)), "qu\n");
+
tracebox(p, PL_MIN + '0.1 0.1 0.1', PL_MAX - '0.1 0.1 0.1', p, MOVE_NOMONSTERS, world);
if(trace_startsolid)
- error(strcat("trace_endpos much in solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(trace_endpos), "\n"));
+ print("trace_endpos much in solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(trace_endpos), "\n");
else
- error(strcat("trace_endpos just in solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(trace_endpos), "\n"));
+ print("trace_endpos just in solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(trace_endpos), "\n");
+ break;
}
}
}
Modified: branches/nexuiz-2.0/data/scripts/shaderlist.txt
===================================================================
--- branches/nexuiz-2.0/data/scripts/shaderlist.txt 2009-08-03 18:27:53 UTC (rev 7308)
+++ branches/nexuiz-2.0/data/scripts/shaderlist.txt 2009-08-03 18:33:13 UTC (rev 7309)
@@ -1,4 +1,5 @@
accident
+aggressor
blacksky
cel
common
@@ -55,10 +56,12 @@
swamp
teamfx
terrain_alphafade
+terrain_dotproduct2projected
terrain_dotproduct2
-terrain_dotproduct2projected
test3
toxic
+trak4
+trak5
tree
tuba
turrets
Deleted: branches/nexuiz-2.0/data/ultimate.cfg
===================================================================
--- branches/nexuiz-2.0/data/ultimate.cfg 2009-08-03 18:27:53 UTC (rev 7308)
+++ branches/nexuiz-2.0/data/ultimate.cfg 2009-08-03 18:33:13 UTC (rev 7309)
@@ -1,31 +0,0 @@
-cl_decals 1
-cl_decals_time 10
-cl_nogibs 0
-cl_particles_quality 1
-gl_picmip 0
-gl_flashblend 0
-r_picmipworld 0
-gl_texture_anisotropy 16
-mod_q3bsp_nolightmaps 0
-r_bloom 1
-r_coronas 1
-r_glsl_deluxemapping 1
-r_glsl_offsetmapping 1
-r_glsl_offsetmapping_reliefmapping 1
-r_hdr 0
-r_shadow_usenormalmap 1
-r_shadow_gloss 1
-r_shadow_realtime_dlight 1
-r_shadow_realtime_dlight_shadows 1
-r_shadow_realtime_world 1
-r_shadow_realtime_world_shadows 1
-r_depthfirst 2
-r_showsurfaces 0
-r_water 1
-r_water_resolutionmultiplier 1
-r_drawparticles_drawdistance 2000
-r_drawdecals_drawdistance 500
-r_subdivisions_tolerance 2
-vid_samples 4
-
-menu_sync
Deleted: branches/nexuiz-2.0/data/ultra.cfg
===================================================================
--- branches/nexuiz-2.0/data/ultra.cfg 2009-08-03 18:27:53 UTC (rev 7308)
+++ branches/nexuiz-2.0/data/ultra.cfg 2009-08-03 18:33:13 UTC (rev 7309)
@@ -1,31 +0,0 @@
-cl_decals 1
-cl_decals_time 10
-cl_nogibs 0
-cl_particles_quality 1
-gl_picmip 0
-gl_flashblend 0
-r_picmipworld 0
-gl_texture_anisotropy 16
-mod_q3bsp_nolightmaps 0
-r_bloom 1
-r_coronas 1
-r_glsl_deluxemapping 1
-r_glsl_offsetmapping 0
-r_glsl_offsetmapping_reliefmapping 0
-r_hdr 0
-r_shadow_usenormalmap 1
-r_shadow_gloss 1
-r_shadow_realtime_dlight 1
-r_shadow_realtime_dlight_shadows 1
-r_shadow_realtime_world 1
-r_shadow_realtime_world_shadows 1
-r_depthfirst 1
-r_showsurfaces 0
-r_water 1
-r_water_resolutionmultiplier 0.5
-r_drawparticles_drawdistance 2000
-r_drawdecals_drawdistance 500
-r_subdivisions_tolerance 3
-vid_samples 4
-
-menu_sync
Copied: branches/nexuiz-2.0/misc/mediasource/menuskins/wickedz/background_builder (from rev 7308, trunk/misc/mediasource/menuskins/wickedz/background_builder)
Modified: branches/nexuiz-2.0/misc/tools/makebuild.sh
===================================================================
--- branches/nexuiz-2.0/misc/tools/makebuild.sh 2009-08-03 18:27:53 UTC (rev 7308)
+++ branches/nexuiz-2.0/misc/tools/makebuild.sh 2009-08-03 18:33:13 UTC (rev 7309)
@@ -10,7 +10,7 @@
base=`pwd`
# customizable specific stuff
-netradiant_release=1.5.0-svn358
+netradiant_release=1.5.0-svn389
basepk3=$base/data20090403.pk3 # 2.5
hotbasepk3= # hotfix
nexdir=$base/nexuiz
@@ -45,7 +45,7 @@
case "$version" in
'')
- version=2-svntest-$date
+ version=2.5s
versiontag=test
defaultcfg=
ext=
@@ -109,7 +109,8 @@
build()
{
- buildon nexmacbuild nexuiz-osx fteqcc-osx /tmp/Darkplaces.build 'CC="gcc -g -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"' strip
+# buildon nexmacbuild nexuiz-osx fteqcc-osx /tmp/Darkplaces.build 'CC="gcc -g -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"' strip
+ buildon nexmacbuild nexuiz-osx fteqcc-osx /tmp/Darkplaces.build 'CC="gcc -g -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"' strip
buildon eos.thruhere.net nexuiz-linux-686 fteqcc-linux-686 /tmp/Darkplaces.build 'CC="gcc -g" DP_MODPLUG_STATIC_LIBDIR=/home/divverent/modplug-i386/lib' strip
buildon alientrap.org nexuiz-linux-x86_64 fteqcc-linux-x86_64 /tmp/Darkplaces.build 'CC="gcc -g -Wl,--hash-style=sysv" DP_MODPLUG_STATIC_LIBDIR=/home/divverent/modplug-x86_64/lib' strip
buildon alientrap.org nexuiz fteqcc.exe /tmp/Darkplaces.build 'DP_MAKE_TARGET=mingw CC="/chroot/debian-etch/usr/bin/i586-mingw32msvc-gcc -g -DSUPPORTDIRECTX -I/home/divverent/dxheaders" WINDRES=/chroot/debian-etch/usr/bin/i586-mingw32msvc-windres SDL_CONFIG=/home/divverent/sdl-win32/SDL-1.2.13/bin/sdl-config' /chroot/debian-etch/usr/bin/i586-mingw32msvc-strip
@@ -161,12 +162,14 @@
mkdir "$tmpdir/fteqcc"
# prepare fteqcc build
-svn export "$fteqccdir" "$tmpdir/fteqcc/source"
-svn info "$fteqccdir" > "$tmpdir/fteqcc/source/fteqcc-base-revision.txt"
-fteqccrev=$((`grep "Last Changed Rev:" "$tmpdir/fteqcc/source/fteqcc-base-revision.txt" | cut -d : -f 2`))
+cd "$fteqccdir"
+git checkout-index -a -f --prefix="$tmpdir/fteqcc/source/"
+git log -1 > "$tmpdir/fteqcc/source/fteqcc-base-revision.txt"
+fteqccrev=`git show --pretty=%ct-%H | head -n 1`
echo "fteqcc rev $fteqccrev"
# build all executables
+cd "$dpdir"
rm -f *.exe nexuiz-* *-withdebug* *.o
make clean
build
@@ -240,7 +243,13 @@
fi
echo >> defaultNexuiz.cfg
echo "$defaultcfg" >> defaultNexuiz.cfg
+
+cd "$nexdir/misc/mediasource/menuskins/wickedz/background_builder"
+sh append.sh "$version" "$tmpdir/data/gfx/menu/wickedz/"
+cd "$tmpdir/data"
+
mk7z ../data.pk3 .
+
cd "$tmpdir/havoc"
mk7z ../havoc.pk3 .
More information about the nexuiz-commits
mailing list