November stuff

* - s_interrupt - allows sounds to be interrupted by the same sound or entity channel
- new dynamic light calculation for vertex lighting, affecting vertex color (no projected dlight textures)
- rgbGen material for allowing calculation for diffuse, specular, emmissive vertex colors by hex values
- rgbMod shader command allowing new vertex color effects
- removed deprecated R_ParseStageSimple, it never worked as intended

* - r_slowness gone. Use llvmpipe, PCem, or a slow computer instead.

* Spring cleaning of old deprecated/broken post-process GLSL experiments
- r_anime broke in 2015
- r_tvMode - well, shaderglass exists now
- r_motionblur - Bad technique, too much memory
- t_pslettize - slow, relies on shader's lookup of a vector table
- r_film - bad on well-lit maps
- r_retroAA - this broke early too. also looked bad. would rather implement FSAA 4x

* test

* Cool console things
- cl_consoleScale : makes the console more 640x480 sized on any higher res. Also affects notify messages, so you can read chat easier
- cl_consoleColor also affects the line at the bottom. Also new default colors
- If consoleShader can't load (which will happen with some mods), it will fallback to a flat-colored console.
- Generic'd the red/blue team names.  We will not be having missionpack clans.

* SDL2: Clicking the red X now does something: you can leave!!!

If it sucks.... hit da bricks!!
real winners quit

* s_xmp_startPattern - makes the tracker song play a different pattern (for use with sub-songs)

* - fixed xmp playback as xmp explicitly requires a length of the module now. Fixes issue #96
- suppress the warning about non-22khz music, as mods are playing at the mixer's rate always, and this warning regards a much earlier (1999) unstable sound mixer.

* - deprecating r_modelshader because the shader got stale, old, buggy, and amd hates it now
- r_shadeMethod will be something else (and not shader-based)

* - r_lightmapColorNorm : Make normalization of bright luxels an option, default is 1 (q3 behavior).
- r_lightmapColorNorm 0 = no normalization, straight clamp, like Nightdive's vision of Quake2
- r_lightmapColorNorm 2 = experiment: normalize, but add some luminance on while maintaining the hue by normalizing again. This tries to restore more range on fully saturated colors
- dropped SHADER_MAX_VERTEXES back to 1000 because raising it causes various unexpected issues, so dialing it down for now
- raise MAX_IMAGE_ANIMATIONS to 16 because I've got a cool water shader using it and 8 is too choppy

* - Crash fix for older (<=2001) mods by trimming the string shared with ui module, so no overflow for them
- jettisoning old proposed mme particle system that was never ever hooked up properly.
- other small warning cleanup

* Some renderer refactor and cleanup
- r_shadeMethod : 0/1 = q3 behavior, 2 = ue1-ish behavior, 3 = mix of 1 and 2, -1 = one uniform color, 150-666 = a lod range to change between the 3
- r_monolightmaps : refactor - goes to the light data instead of the calculations and images
- removed r_greyscale because this is a data-modifying novelty that would complicate support for loading compressed texture formats. This is better off as a post-process shader
- environment mapping refactor, rewrite and cleanup
- removed a lot of deprecated rgbGens
- removed r_texdump (it never worked)
- remove a few leftover broken postprocess things

* - Internal GLSL brightness shader, so gamma control can work without the glsl/brightness_fp.glsl file when r_ext_vertex_shader is 1 and r_alternateBrightness is 2.
- r_skyTess - an attempt to make the complexity of skydomes an option so it could use less polygons. Has no effect on skyboxes

* - More r_dynamiclight options:
  r_dynamiclight 2 = Slightly additive dynamic light projections, modeled after the PS2 port
  r_dynamiclight 3 = disables dynamic light projections but substitutes them with flashblends (ala GLQuake). If r_monolightmaps are enabled, the flashblends are orange. Viewblends are left out as the sudden duration of the dynamic lights when firing would be harmful.
- Because of these changes, Riva 128 and Permedia 2 owners should be allowed to enjoy dynamic lights
- option to use ReactOS's wspiapi.h header (file not included)
- some makefile changes to allow an option for more Win 4 (95/NT4) compatiblity easier. Compiling with WINFOUR disables curl, uses SDL1, and has some additional workarounds to get it working on Windows 95 (winsock2 still required though)

* - fixed a fog modulation regression stemming from a rgbMod case returning and not breaking. whoops
- little warning cleanup wrt flashblend

* Sun stuff
- r_drawSun is now default 1 (was 0), because...
- sunShader key - allows sky shaders to explicitly define a shader to use for the sun. In addition to that, a flare type number and a size multiplier number can follow for a little more customization. Partially inspired by RTCW's sunshader key, which only dealt with the image (and never finished their lens flare reflections)
- Suns with a portal on screen won't cancel out the sun or its flare
- If no sun flare is specified, don't draw a sun flare at all. should be one less unnecessary depth read
- r_drawSun 2 is the old 'always show sun' behavior
- sun shader now correctly orientated
- drawing the sun uses a quadstamp
- some 'low end video' alternative shader loading that current does not work. May revert
- ifdefing out shademethod LOD for fixing later

* - GetViewPosition builtin for cgame to allow stuff like text drawn over entities
- MDR physics: allows MDR bones to move independently of model by a defined file on bone numbers, their type, etc. (like hair and flags), but broken (currently ifdef'd out)
- ifdef'd out IQM support as that's broken, we aren't using it, and only other whole games are using it
- Removed attempt at r_lowEndVideo

* - Model fog fix
- Suppressing redundant sound warnings to developer print
- Preliminary DDS texture loading
- Dropping renderergl1 and renderergl2 as they're unsupported, redundant, stale code with none of the new improvements, and we don't use modularized renderers. Still having these files in the tree implies we use them and that can bring confusion.

* - Cgame entity glow renderer hookup
- R_ShowImages: Adjust for overbright
- a tribute to Rebecca Heineman and Jennell Jaquays

* RB_UVcolor: casting as gcc 14 hates this line
makefile - because gcc 14 is fussier, i'll do this wrt VMA for now.

Author: leilei-

Makefile

@@ -228,6 +228,14 @@ ifndef USE_LOCAL_HEADERS
 USE_LOCAL_HEADERS=1
 endif
 
+ifndef WINFOUR
+WINFOUR=0
+endif
+
+ifndef USE_REACTOS_WINSOCK_HEADER
+USE_REACTOS_WINSOCK_HEADER=0
+endif
+
 ifndef USE_RENDERER_DLOPEN
 USE_RENDERER_DLOPEN=1
 endif
@@ -244,6 +252,15 @@ ifndef SDL_VERSION
 SDL_VERSION=2
 endif
 
+ifeq ($(WINFOUR),1)
+  BASE_CFLAGS += -DWINFOUR
+  BASE_CFLAGS += -DUSE_REACTOS_WINSOCK_HEADER
+  BASE_CFLAGS += -DUSE_INTERNAL_JPEG
+  SDL_VERSION=1
+  USE_CURL=0
+ # CLIENTBIN=oa95
+endif
+
 #############################################################################
 
 BD=$(BUILD_DIR)/debug-$(PLATFORM)-$(ARCH)
@@ -1141,6 +1158,10 @@ ifeq ($(USE_LOCAL_HEADERS),1)
   BASE_CFLAGS += -DUSE_LOCAL_HEADERS
 endif
 
+ifeq ($(USE_REACTOS_WINSOCK_HEADER),1)
+  BASE_CFLAGS += -DUSE_REACTOS_WINSOCK_HEADER
+endif
+
 ifeq ($(BUILD_STANDALONE),1)
   BASE_CFLAGS += -DSTANDALONE
 endif
@@ -1154,14 +1175,15 @@ endif
 ifeq ($(NO_STRIP),1)
   STRIP_FLAG =
 else
-  STRIP_FLAG = -s
+  STRIP_FLAG = -s 
 endif
 
 BASE_CFLAGS += -DPRODUCT_VERSION=\\\"$(VERSION)\\\"
 BASE_CFLAGS += -Wformat=2 -Wno-format-zero-length -Wformat-security -Wno-format-nonliteral
 BASE_CFLAGS += -Wstrict-aliasing=2 -Wmissing-format-attribute
 BASE_CFLAGS += -Wdisabled-optimization
 BASE_CFLAGS += -Werror-implicit-function-declaration
+BASE_CFLAGS += -Wno-int-conversion
 
 ifeq ($(V),1)
 echo_cmd=@:
@@ -1267,7 +1289,7 @@ endef
 #############################################################################
 
 default: release
-all: debug release
+all: debug release 
 
 debug:
 	@$(MAKE) targets B=$(BD) CFLAGS="$(CFLAGS) $(BASE_CFLAGS) $(DEPEND_CFLAGS)" \
@@ -1757,6 +1779,7 @@ Q3ROAOBJ = \
   $(B)/renderer_oa/tr_image_jpg.o \
   $(B)/renderer_oa/tr_image_bmp.o \
   $(B)/renderer_oa/tr_image_tga.o \
+  $(B)/renderer_oa/tr_image_dds.o \
   $(B)/renderer_oa/tr_image_pcx.o \
   $(B)/renderer_oa/tr_init.o \
   $(B)/renderer_oa/tr_light.o \
@@ -1831,6 +1854,7 @@ Q3RSOFTOBJ = \
   $(B)/renderer_oa/tr_image_jpg.o \
   $(B)/renderer_oa/tr_image_bmp.o \
   $(B)/renderer_oa/tr_image_tga.o \
+  $(B)/renderer_oa/tr_image_dds.o \
   $(B)/renderer_oa/tr_image_pcx.o \
   $(B)/renderer_oa/tr_init.o \
   $(B)/renderer_oa/tr_light.o \
@@ -3020,8 +3044,8 @@ else
 	@$(MAKE) VERSION=$(VERSION) -C $(LOKISETUPDIR) V=$(V)
 endif
 
-dist:
-	git archive --format zip --output $(CLIENTBIN)-$(VERSION).zip HEAD
+# dist:
+#	git archive --format zip --output $(CLIENTBIN)-$(VERSION).zip HEAD
 
 #############################################################################
 # DEPENDENCIES

Makefile.OpenArena

@@ -10,11 +10,13 @@ BUILD_CLIENT=1
 BUILD_SERVER=1
 BUILD_GAME_SO=0
 BUILD_GAME_QVM=0
+USE_GIT=0
 BUILD_BASEGAME=0
 BUILD_MISSIONPACK=0
 BASEGAME=baseoa
 # VERSION=1.36+0.8.8
-VERSION=3.0.0a
+VERSION=TEST
+
 
 # OpenArena doesn't use opus yet
 USE_CODEC_VORBIS=1
@@ -24,13 +26,17 @@ ifndef USE_CODEC_XMP
 USE_CODEC_XMP=1
 endif
 
+USE_CURL=1
+
 # FLTO Test
 
 OPTIMIZE += -flto
 
-# This doesn't work with OpenArena yet
+# Not supported
 BUILD_RENDERER_OPENGL2=0
 # You can disable the renderer libraries and build in the OA renderer by default
+# This is disabled because we have some client builtins used (trace etc) and 
+# we are scaling back some modularization for security and support reasons.
 USE_RENDERER_DLOPEN=0
 
 # Choose version 1 or 2
@@ -58,6 +64,12 @@ CLIENTBIN=openarena
 SERVERBIN=oa_ded
 COPYDIR=/usr/local/games/openarena
 
+# Use the Winsock2 headers from ReactOS, which doesn't give errors in Win9x
+# USE_REACTOS_WINSOCK_HEADER=1
+
+# Enable changes to allow Windows 95 and NT4 to work 
+# (Overrides enabling libraries above that don't work well, and outputs to oa95.exe)
+WINFOUR=0
 
 # DEBUG_CFLAGS=-ggdb -O0
 

code/cgame/cg_public.h

@@ -183,7 +183,8 @@ typedef enum {
 	CG_TESTPRINTINT,
 	CG_TESTPRINTFLOAT,
 	CG_ACOS,
-	CG_R_LFX_PARTICLEEFFECT	// leilei - particle effects
+	CG_R_LFX_PARTICLEEFFECT,	// leilei - particle effects
+	CG_R_VIEWPOSITION		// leilei - view position 
 } cgameImport_t;
 
 

code/cgame/cg_syscalls.asm

@@ -104,3 +104,4 @@ equ	testPrintInt				-110
 equ	testPrintFloat				-111
 equ acos						-112
 equ trap_R_LFX_ParticleEffect				-113
+equ trap_R_GetViewPosition				-114

code/client/cl_cgame.c

@@ -637,7 +637,9 @@ intptr_t CL_CgameSystemCalls( intptr_t *args ) {
 	case CG_R_LFX_PARTICLEEFFECT:
 		re.LFX_ParticleEffect( args[1], VMA(2), VMA(3));
 		return 0;
-
+	case CG_R_VIEWPOSITION:
+		re.GetViewPosition( VMA(1) );
+		return VMA(1);
 	case CG_PC_ADD_GLOBAL_DEFINE:
 		return botlib_export->PC_AddGlobalDefine( VMA(1) );
 	case CG_PC_LOAD_SOURCE:

code/client/snd_dma.c

@@ -267,17 +267,17 @@ static sfx_t *S_FindName( const char *name ) {
 	}
 
 	if (!name[0]) {
-		Com_Printf( S_COLOR_YELLOW "WARNING: Sound name is empty\n" );
+		Com_DPrintf( S_COLOR_YELLOW "WARNING: Sound name is empty\n" );
 		return NULL;
 	}
 
 	if (strlen(name) >= MAX_QPATH) {
-		Com_Printf( S_COLOR_YELLOW "WARNING: Sound name is too long: %s\n", name );
+		Com_DPrintf( S_COLOR_YELLOW "WARNING: Sound name is too long: %s\n", name );
 		return NULL;
 	}
 
 	if (name[0] == '*') {
-		Com_Printf( S_COLOR_YELLOW "WARNING: Tried to load player sound directly: %s\n", name );
+		Com_DPrintf( S_COLOR_YELLOW "WARNING: Tried to load player sound directly: %s\n", name );
 		return NULL;
 	}
 
@@ -371,7 +371,7 @@ sfxHandle_t	S_Base_RegisterSound( const char *name, qboolean compressed ) {
 
 	if ( sfx->soundData ) {
 		if ( sfx->defaultSound ) {
-			Com_Printf( S_COLOR_YELLOW "WARNING: could not find %s - using default\n", sfx->soundName );
+			Com_DPrintf( S_COLOR_YELLOW "WARNING: could not find %s - using default\n", sfx->soundName );
 			return 0;
 		}
 		return sfx - s_knownSfx;
@@ -383,7 +383,7 @@ sfxHandle_t	S_Base_RegisterSound( const char *name, qboolean compressed ) {
   S_memoryLoad(sfx);
 
 	if ( sfx->defaultSound ) {
-		Com_Printf( S_COLOR_YELLOW "WARNING: could not find %s - using default\n", sfx->soundName );
+		Com_DPrintf( S_COLOR_YELLOW "WARNING: could not find %s - using default\n", sfx->soundName );
 		return 0;
 	}
 
@@ -1428,7 +1428,7 @@ static void S_OpenBackgroundStream( const char *filename ) {
 	// Open stream
 	s_backgroundStream = S_CodecOpenStream(filename);
 	if(!s_backgroundStream) {
-		Com_Printf( S_COLOR_YELLOW "WARNING: couldn't open music file %s\n", filename );
+		Com_DPrintf( S_COLOR_YELLOW "WARNING: couldn't open music file %s\n", filename );
 		return;
 	}
 

code/qcommon/net_ip.c

@@ -27,6 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #	include <winsock2.h>
 #	include <ws2tcpip.h>
 #	if WINVER < 0x501
+
 #		ifdef __MINGW32__
 			// wspiapi.h isn't available on MinGW, so if it's
 			// present it's because the end user has added it
@@ -37,6 +38,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #		endif
 #	else
 #		include <ws2spi.h>
+#	endif
+
+			// leilei - addition to fix win9x
+#	ifdef USE_REACTOS_WINSOCK_HEADER
+#		include "../reactos/wspiapi.h"
 #	endif
 
 typedef int socklen_t;

code/qcommon/qcommon.h

@@ -34,6 +34,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 //#define	PRE_RELEASE_DEMO
 
+// leilei - broken things
+
+//#define	BROKEN_MDRPHYS	// MDR physics are not serialized!
+//#define BROKEN_IQM	// crashes (and we don't plan to use the format anyway. IQM users are other games)
+
 //============================================================================
 
 //

code/qcommon/qfiles.h

@@ -300,6 +300,22 @@ typedef struct {
 	int			ofsEnd;				// end of file
 } mdrHeader_t;
 
+#ifdef BROKEN_MDRPHYS
+// leilei - bone deformery
+// 		MDR loading also checks for a text file that can set these properties so the "MDP" code can get to work with them.
+//		and working from the cliententity.
+typedef struct {
+
+		vec3_t ofs[MDR_MAX_BONES];
+		vec3_t wgt[MDR_MAX_BONES];
+		float jiggle[MDR_MAX_BONES];
+	
+} mdrClBoneDeformSet_t;
+
+typedef struct {
+		mdrClBoneDeformSet_t def[4];	// up to 4 can alter bones
+} mdrDeformity_t;
+#endif
 
 /*
 ==============================================================================

code/reactos/readme.md

@@ -0,0 +1,2 @@
+Place ReactOS' wspiapi.h file here.
+